From f1dfc23c493570e5be865664c17e368f46665609 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 17 Apr 2011 16:00:02 -0400
Subject: [PATCH] Implemented diff-to-current.
---
src/com/gitblit/wicket/WicketUtils.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 3bc55f1..0a1c3a0 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -13,6 +13,7 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
public class WicketUtils {
@@ -61,14 +62,14 @@
}
public static PageParameters newObjectParameter(String repositoryName, String objectId) {
- if (objectId == null || objectId.trim().length() == 0) {
+ if (StringUtils.isEmpty(objectId)) {
return newRepositoryParameter(repositoryName);
}
return new PageParameters("r=" + repositoryName + ",h=" + objectId);
}
public static PageParameters newPathParameter(String repositoryName, String objectId, String path) {
- if (path == null || path.trim().length() == 0) {
+ if (StringUtils.isEmpty(path)) {
return newObjectParameter(repositoryName, objectId);
}
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path);
@@ -88,6 +89,11 @@
return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path + ",page=" + pageNumber);
}
+ public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId, String commitId, String path) {
+ return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb=" + baseCommitId);
+ }
+
+
public static String getRepositoryName(PageParameters params) {
return params.getString("r", "");
}
@@ -99,6 +105,10 @@
public static String getPath(PageParameters params) {
return params.getString("f", null);
}
+
+ public static String getBaseObjectId(PageParameters params) {
+ return params.getString("hb", null);
+ }
public static int getPage(PageParameters params) {
return params.getInt("page", 1); // index from 1
--
Gitblit v1.9.1