From 4ef60d7a963fdadaa69db98df7844314c2ceb693 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 12 Nov 2011 09:01:25 -0500
Subject: [PATCH] Documentation.
---
src/com/gitblit/wicket/WicketUtils.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index a6435d5..37b4447 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -39,13 +39,13 @@
import org.wicketstuff.googlecharts.AbstractChartData;
import org.wicketstuff.googlecharts.IChartData;
+import com.gitblit.Constants;
import com.gitblit.Constants.FederationPullStatus;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
import com.gitblit.models.Metric;
import com.gitblit.utils.HttpUtils;
-import com.gitblit.utils.JGitUtils.SearchType;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
@@ -88,13 +88,13 @@
public static void setTicketCssClass(Component container, String state) {
String css = null;
if (state.equals("open")) {
- css = "bug_open";
+ css = "label important";
} else if (state.equals("hold")) {
- css = "bug_hold";
+ css = "label warning";
} else if (state.equals("resolved")) {
- css = "bug_resolved";
+ css = "label success";
} else if (state.equals("invalid")) {
- css = "bug_invalid";
+ css = "label";
}
if (css != null) {
setCssClass(container, css);
@@ -102,7 +102,7 @@
}
public static void setAlternatingBackground(Component c, int i) {
- String clazz = i % 2 == 0 ? "dark" : "light";
+ String clazz = i % 2 == 0 ? "light" : "dark";
setCssClass(c, clazz);
}
@@ -115,6 +115,7 @@
public static ContextImage getPullStatusImage(String wicketId, FederationPullStatus status) {
String filename = null;
switch (status) {
+ case MIRRORED:
case PULLED:
filename = "bullet_green.png";
break;
@@ -128,6 +129,7 @@
filename = "bullet_white.png";
break;
case PENDING:
+ case NOCHANGE:
default:
filename = "bullet_black.png";
}
@@ -215,9 +217,9 @@
return new ContextRelativeResource(file);
}
- public static String getHostURL(Request request) {
+ public static String getGitblitURL(Request request) {
HttpServletRequest req = ((WebRequest) request).getHttpServletRequest();
- return HttpUtils.getHostURL(req);
+ return HttpUtils.getGitblitURL(req);
}
public static HeaderContributor syndicationDiscoveryLink(final String feedTitle,
@@ -282,9 +284,9 @@
return newObjectParameter(repositoryName, objectId);
}
if (StringUtils.isEmpty(objectId)) {
- return new PageParameters("r=" + repositoryName + ",page=" + pageNumber);
+ return new PageParameters("r=" + repositoryName + ",pg=" + pageNumber);
}
- return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",page=" + pageNumber);
+ return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",pg=" + pageNumber);
}
public static PageParameters newHistoryPageParameter(String repositoryName, String objectId,
@@ -293,10 +295,10 @@
return newObjectParameter(repositoryName, objectId);
}
if (StringUtils.isEmpty(objectId)) {
- return new PageParameters("r=" + repositoryName + ",f=" + path + ",page=" + pageNumber);
+ return new PageParameters("r=" + repositoryName + ",f=" + path + ",pg=" + pageNumber);
}
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path
- + ",page=" + pageNumber);
+ + ",pg=" + pageNumber);
}
public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId,
@@ -309,7 +311,7 @@
}
public static PageParameters newSearchParameter(String repositoryName, String commitId,
- String search, SearchType type) {
+ String search, Constants.SearchType type) {
if (StringUtils.isEmpty(commitId)) {
return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name());
}
@@ -318,13 +320,13 @@
}
public static PageParameters newSearchParameter(String repositoryName, String commitId,
- String search, SearchType type, int pageNumber) {
+ String search, Constants.SearchType type, int pageNumber) {
if (StringUtils.isEmpty(commitId)) {
return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name()
- + ",page=" + pageNumber);
+ + ",pg=" + pageNumber);
}
return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search
- + ",st=" + type.name() + ",page=" + pageNumber);
+ + ",st=" + type.name() + ",pg=" + pageNumber);
}
public static String getRepositoryName(PageParameters params) {
@@ -353,7 +355,7 @@
public static int getPage(PageParameters params) {
// index from 1
- return params.getInt("page", 1);
+ return params.getInt("pg", 1);
}
public static String getUsername(PageParameters params) {
--
Gitblit v1.9.1