From 155bf78e3377910d29b2c912f58c0f496cb428e8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 14 Apr 2011 19:44:47 -0400
Subject: [PATCH] Generate Keys class from gitblit.properties as part of build process.
---
src/com/gitblit/wicket/WicketUtils.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 65270a2..27992f1 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -12,6 +12,7 @@
import org.apache.wicket.markup.html.basic.Label;
import org.eclipse.jgit.lib.Constants;
+import com.gitblit.Keys;
import com.gitblit.StoredSettings;
import com.gitblit.utils.Utils;
@@ -32,7 +33,7 @@
public static String breakLines(String string) {
return string.replace("\r", "<br/>").replace("\n", "<br/>");
}
-
+
public static void setTicketCssClass(Component container, String state) {
String css = null;
if (state.equals("open")) {
@@ -48,7 +49,7 @@
setCssClass(container, css);
}
}
-
+
public static String flattenStrings(List<String> values) {
StringBuilder sb = new StringBuilder();
for (String value : values) {
@@ -56,12 +57,12 @@
}
return sb.toString().trim();
}
-
+
public static void setAlternatingBackground(Component c, int i) {
String clazz = i % 2 == 0 ? "dark" : "light";
setCssClass(c, clazz);
}
-
+
public static Label createAuthorLabel(String wicketId, String author) {
Label label = new Label(wicketId, author);
WicketUtils.setHtmlTitle(label, author);
@@ -71,14 +72,14 @@
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) {
return new PageParameters("r=" + repositoryName);
}
@@ -96,14 +97,14 @@
}
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path);
}
-
+
public static PageParameters newLogPageParameter(String repositoryName, String objectId, int pageNumber) {
if (pageNumber <= 1) {
return newObjectParameter(repositoryName, objectId);
}
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",page=" + pageNumber);
}
-
+
public static String getRepositoryName(PageParameters params) {
return params.getString("r", "");
}
@@ -121,7 +122,7 @@
}
public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datestampShortFormat", "MM/dd/yy"));
+ DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datestampShortFormat, "MM/dd/yy"));
if (timeZone != null) {
df.setTimeZone(timeZone);
}
@@ -137,9 +138,9 @@
WicketUtils.setHtmlTitle(label, title);
return label;
}
-
+
public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) {
- DateFormat df = new SimpleDateFormat(StoredSettings.getString("datetimestampLongFormat", "EEEE, MMMM d, yyyy h:mm a z"));
+ DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datetimestampLongFormat, "EEEE, MMMM d, yyyy h:mm a z"));
if (timeZone != null) {
df.setTimeZone(timeZone);
}
--
Gitblit v1.9.1