From d65f712ea3d8941f4b9145c0630c30c20af80d13 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 11 Nov 2011 17:22:21 -0500
Subject: [PATCH] Documentation. Add javadoc and source jars to the gbapi download.
---
src/com/gitblit/wicket/WicketUtils.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 153 insertions(+), 24 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index aef68ee..37b4447 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -22,21 +22,30 @@
import java.util.List;
import java.util.TimeZone;
+import javax.servlet.http.HttpServletRequest;
+
import org.apache.wicket.Component;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.Request;
+import org.apache.wicket.behavior.HeaderContributor;
import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.markup.html.IHeaderContributor;
+import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.ContextImage;
+import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.resource.ContextRelativeResource;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import org.eclipse.jgit.lib.Constants;
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.JGitUtils.SearchType;
+import com.gitblit.utils.HttpUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
@@ -79,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);
@@ -93,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);
}
@@ -101,6 +110,30 @@
Label label = new Label(wicketId, author);
WicketUtils.setHtmlTooltip(label, author);
return label;
+ }
+
+ public static ContextImage getPullStatusImage(String wicketId, FederationPullStatus status) {
+ String filename = null;
+ switch (status) {
+ case MIRRORED:
+ case PULLED:
+ filename = "bullet_green.png";
+ break;
+ case SKIPPED:
+ filename = "bullet_yellow.png";
+ break;
+ case FAILED:
+ filename = "bullet_red.png";
+ break;
+ case EXCLUDED:
+ filename = "bullet_white.png";
+ break;
+ case PENDING:
+ case NOCHANGE:
+ default:
+ filename = "bullet_black.png";
+ }
+ return WicketUtils.newImage(wicketId, filename, status.name());
}
public static ContextImage getFileImage(String wicketId, String filename) {
@@ -149,6 +182,17 @@
return newImage(wicketId, "file_16x16.png");
}
+ public static ContextImage getRegistrationImage(String wicketId, FederationModel registration,
+ Component c) {
+ if (registration.isResultData()) {
+ return WicketUtils.newImage(wicketId, "information_16x16.png",
+ c.getString("gb.federationResults"));
+ } else {
+ return WicketUtils.newImage(wicketId, "arrow_left.png",
+ c.getString("gb.federationRegistration"));
+ }
+ }
+
public static ContextImage newClearPixel(String wicketId) {
return newImage(wicketId, "pixel.png");
}
@@ -162,7 +206,7 @@
}
public static ContextImage newImage(String wicketId, String file, String tooltip) {
- ContextImage img = new ContextImage(wicketId, "/com/gitblit/wicket/resources/" + file);
+ ContextImage img = new ContextImage(wicketId, file);
if (!StringUtils.isEmpty(tooltip)) {
setHtmlTooltip(img, tooltip);
}
@@ -170,7 +214,38 @@
}
public static ContextRelativeResource getResource(String file) {
- return new ContextRelativeResource("/com/gitblit/wicket/resources/" + file);
+ return new ContextRelativeResource(file);
+ }
+
+ public static String getGitblitURL(Request request) {
+ HttpServletRequest req = ((WebRequest) request).getHttpServletRequest();
+ return HttpUtils.getGitblitURL(req);
+ }
+
+ public static HeaderContributor syndicationDiscoveryLink(final String feedTitle,
+ final String url) {
+ return new HeaderContributor(new IHeaderContributor() {
+ private static final long serialVersionUID = 1L;
+
+ public void renderHead(IHeaderResponse response) {
+ String contentType = "application/rss+xml";
+
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<link rel=\"alternate\" ");
+ buffer.append("type=\"").append(contentType).append("\" ");
+ buffer.append("title=\"").append(feedTitle).append("\" ");
+ buffer.append("href=\"").append(url).append("\" />");
+ response.renderString(buffer.toString());
+ }
+ });
+ }
+
+ public static PageParameters newTokenParameter(String token) {
+ return new PageParameters("t=" + token);
+ }
+
+ public static PageParameters newRegistrationParameter(String url, String name) {
+ return new PageParameters("u=" + url + ",n=" + name);
}
public static PageParameters newUsernameParameter(String username) {
@@ -179,6 +254,10 @@
public static PageParameters newRepositoryParameter(String repositoryName) {
return new PageParameters("r=" + repositoryName);
+ }
+
+ public static PageParameters newObjectParameter(String objectId) {
+ return new PageParameters("h=" + objectId);
}
public static PageParameters newObjectParameter(String repositoryName, String objectId) {
@@ -193,6 +272,9 @@
if (StringUtils.isEmpty(path)) {
return newObjectParameter(repositoryName, objectId);
}
+ if (StringUtils.isEmpty(objectId)) {
+ return new PageParameters("r=" + repositoryName + ",f=" + path);
+ }
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path);
}
@@ -201,7 +283,10 @@
if (pageNumber <= 1) {
return newObjectParameter(repositoryName, objectId);
}
- return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",page=" + pageNumber);
+ if (StringUtils.isEmpty(objectId)) {
+ return new PageParameters("r=" + repositoryName + ",pg=" + pageNumber);
+ }
+ return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",pg=" + pageNumber);
}
public static PageParameters newHistoryPageParameter(String repositoryName, String objectId,
@@ -209,18 +294,24 @@
if (pageNumber <= 1) {
return newObjectParameter(repositoryName, objectId);
}
+ if (StringUtils.isEmpty(objectId)) {
+ 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,
String commitId, String path) {
+ if (StringUtils.isEmpty(commitId)) {
+ return new PageParameters("r=" + repositoryName + ",f=" + path + ",hb=" + baseCommitId);
+ }
return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb="
+ baseCommitId);
}
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());
}
@@ -229,9 +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()
+ + ",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) {
@@ -239,7 +334,7 @@
}
public static String getObject(PageParameters params) {
- return params.getString("h", Constants.HEAD);
+ return params.getString("h", null);
}
public static String getPath(PageParameters params) {
@@ -260,11 +355,23 @@
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) {
return params.getString("user", "");
+ }
+
+ public static String getToken(PageParameters params) {
+ return params.getString("t", "");
+ }
+
+ public static String getUrlParameter(PageParameters params) {
+ return params.getString("u", "");
+ }
+
+ public static String getNameParameter(PageParameters params) {
+ return params.getString("n", "");
}
public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {
@@ -273,8 +380,17 @@
if (timeZone != null) {
df.setTimeZone(timeZone);
}
- String dateString = df.format(date);
- String title = TimeUtils.timeAgo(date);
+ String dateString;
+ if (date.getTime() == 0) {
+ dateString = "--";
+ } else {
+ dateString = df.format(date);
+ }
+ String title = null;
+ if (date.getTime() <= System.currentTimeMillis()) {
+ // past
+ title = TimeUtils.timeAgo(date);
+ }
if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000L) {
String tmp = dateString;
dateString = title;
@@ -282,7 +398,9 @@
}
Label label = new Label(wicketId, dateString);
WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
- WicketUtils.setHtmlTooltip(label, title);
+ if (!StringUtils.isEmpty(title)) {
+ WicketUtils.setHtmlTooltip(label, title);
+ }
return label;
}
@@ -293,13 +411,24 @@
if (timeZone != null) {
df.setTimeZone(timeZone);
}
- String dateString = df.format(date);
- String title = TimeUtils.timeAgo(date);
+ String dateString;
+ if (date.getTime() == 0) {
+ dateString = "--";
+ } else {
+ dateString = df.format(date);
+ }
+ String title = null;
+ if (date.getTime() <= System.currentTimeMillis()) {
+ // past
+ title = TimeUtils.timeAgo(date);
+ }
Label label = new Label(wicketId, dateString);
- WicketUtils.setHtmlTooltip(label, title);
+ if (!StringUtils.isEmpty(title)) {
+ WicketUtils.setHtmlTooltip(label, title);
+ }
return label;
}
-
+
public static IChartData getChartData(Collection<Metric> metrics) {
final double[] commits = new double[metrics.size()];
final double[] tags = new double[metrics.size()];
@@ -334,7 +463,7 @@
}
return max;
}
-
+
public static IChartData getScatterData(Collection<Metric> metrics) {
final double[] y = new double[metrics.size()];
final double[] x = new double[metrics.size()];
--
Gitblit v1.9.1