From 87cc1ed60735a419a3ea23f20614fc0a3f9bab60 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Apr 2011 17:18:51 -0400
Subject: [PATCH] Settings overhaul. Fixes to authentication. Bind interface feature.
---
src/com/gitblit/wicket/WicketUtils.java | 38 +++++++-------------------------------
1 files changed, 7 insertions(+), 31 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 27992f1..3288498 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -3,7 +3,6 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.List;
import java.util.TimeZone;
import org.apache.wicket.Component;
@@ -12,9 +11,9 @@
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Constants;
+import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.StoredSettings;
-import com.gitblit.utils.Utils;
+import com.gitblit.utils.TimeUtils;
public class WicketUtils {
@@ -28,10 +27,6 @@
public static void setHtmlTitle(Component container, String value) {
container.add(new SimpleAttributeModifier("title", value));
- }
-
- public static String breakLines(String string) {
- return string.replace("\r", "<br/>").replace("\n", "<br/>");
}
public static void setTicketCssClass(Component container, String state) {
@@ -50,14 +45,6 @@
}
}
- public static String flattenStrings(List<String> values) {
- StringBuilder sb = new StringBuilder();
- for (String value : values) {
- sb.append(value).append(" ");
- }
- return sb.toString().trim();
- }
-
public static void setAlternatingBackground(Component c, int i) {
String clazz = i % 2 == 0 ? "dark" : "light";
setCssClass(c, clazz);
@@ -67,17 +54,6 @@
Label label = new Label(wicketId, author);
WicketUtils.setHtmlTitle(label, author);
return label;
- }
-
- public static String trimShortLog(String string) {
- return trimString(string, 60);
- }
-
- public static String trimString(String value, int max) {
- if (value.length() <= max) {
- return value;
- }
- return value.substring(0, max - 3) + "...";
}
public static PageParameters newRepositoryParameter(String repositoryName) {
@@ -122,30 +98,30 @@
}
public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datestampShortFormat, "MM/dd/yy"));
+ DateFormat df = new SimpleDateFormat(GitBlit.self().settings().getString(Keys.web.datestampShortFormat, "MM/dd/yy"));
if (timeZone != null) {
df.setTimeZone(timeZone);
}
String dateString = df.format(date);
- String title = Utils.timeAgo(date);
+ String title = TimeUtils.timeAgo(date);
if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000l) {
String tmp = dateString;
dateString = title;
title = tmp;
}
Label label = new Label(wicketId, dateString);
- WicketUtils.setCssClass(label, Utils.timeAgoCss(date));
+ WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
WicketUtils.setHtmlTitle(label, title);
return label;
}
public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datetimestampLongFormat, "EEEE, MMMM d, yyyy h:mm a z"));
+ DateFormat df = new SimpleDateFormat(GitBlit.self().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy h:mm a z"));
if (timeZone != null) {
df.setTimeZone(timeZone);
}
String dateString = df.format(date);
- String title = Utils.timeAgo(date);
+ String title = TimeUtils.timeAgo(date);
Label label = new Label(wicketId, dateString);
WicketUtils.setHtmlTitle(label, title);
return label;
--
Gitblit v1.9.1