From 7847af6e63e7adef6ec8d99a1809e91472d2bc2d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Sep 2013 09:14:22 -0400
Subject: [PATCH] Restore blockpush and localclone hooks to binaries (issue-303)

---
 src/main/java/com/gitblit/wicket/WicketUtils.java |  248 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 168 insertions(+), 80 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index 5492717..aa86686 100644
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -20,7 +20,9 @@
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
@@ -41,6 +43,7 @@
 import org.wicketstuff.googlecharts.IChartData;
 
 import com.gitblit.Constants;
+import com.gitblit.Constants.AccessPermission;
 import com.gitblit.Constants.FederationPullStatus;
 import com.gitblit.GitBlit;
 import com.gitblit.Keys;
@@ -52,34 +55,29 @@
 
 public class WicketUtils {
 
-	public static Component setCssClass(Component container, String value) {
+	public static void setCssClass(Component container, String value) {
 		container.add(new SimpleAttributeModifier("class", value));
-		return container;
 	}
 
-	public static Component setCssStyle(Component container, String value) {
+	public static void setCssStyle(Component container, String value) {
 		container.add(new SimpleAttributeModifier("style", value));
-		return container;
 	}
 
-	public static Component setCssBackground(Component container, String value) {
+	public static void setCssBackground(Component container, String value) {
 		String background = MessageFormat.format("background-color:{0};",
 				StringUtils.getColor(value));
 		container.add(new SimpleAttributeModifier("style", background));
-		return container;
 	}
 
-	public static Component setHtmlTooltip(Component container, String value) {
+	public static void setHtmlTooltip(Component container, String value) {
 		container.add(new SimpleAttributeModifier("title", value));
-		return container;
 	}
 
-	public static Component setInputPlaceholder(Component container, String value) {
+	public static void setInputPlaceholder(Component container, String value) {
 		container.add(new SimpleAttributeModifier("placeholder", value));
-		return container;
 	}
 
-	public static Component setChangeTypeCssClass(Component container, ChangeType type) {
+	public static void setChangeTypeCssClass(Component container, ChangeType type) {
 		switch (type) {
 		case ADD:
 			setCssClass(container, "addition");
@@ -95,10 +93,9 @@
 			setCssClass(container, "modification");
 			break;
 		}
-		return container;
 	}
 
-	public static Component setTicketCssClass(Component container, String state) {
+	public static void setTicketCssClass(Component container, String state) {
 		String css = null;
 		if (state.equals("open")) {
 			css = "label label-important";
@@ -112,13 +109,34 @@
 		if (css != null) {
 			setCssClass(container, css);
 		}
-		return container;
+	}
+	
+	public static void setPermissionClass(Component container, AccessPermission permission) {
+		if (permission == null) {
+			setCssClass(container, "badge");
+			return;
+		}
+		switch (permission) {
+		case REWIND:
+		case DELETE:
+		case CREATE:
+			setCssClass(container, "badge badge-success");
+			break;
+		case PUSH:
+			setCssClass(container, "badge badge-info");
+			break;
+		case CLONE:
+			setCssClass(container, "badge badge-inverse");
+			break;
+		default:
+			setCssClass(container, "badge");
+			break;
+		}	
 	}
 
-	public static Component setAlternatingBackground(Component c, int i) {
+	public static void setAlternatingBackground(Component c, int i) {
 		String clazz = i % 2 == 0 ? "light" : "dark";
 		setCssClass(c, clazz);
-		return c;
 	}
 
 	public static Label createAuthorLabel(String wicketId, String author) {
@@ -174,7 +192,7 @@
 			return newImage(wicketId, "file_excel_16x16.png");
 		} else if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
 			return newImage(wicketId, "file_doc_16x16.png");
-		} else if (filename.endsWith(".ppt")) {
+		} else if (filename.endsWith(".ppt") || filename.endsWith(".pptx")) {
 			return newImage(wicketId, "file_ppt_16x16.png");
 		} else if (filename.endsWith(".zip")) {
 			return newImage(wicketId, "file_zip_16x16.png");
@@ -269,100 +287,170 @@
 	}
 
 	public static PageParameters newTokenParameter(String token) {
-		return new PageParameters("t=" + token);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("t", token);
+		return new PageParameters(parameterMap);
 	}
 
-	public static PageParameters newRegistrationParameter(String url, String name) {
-		return new PageParameters("u=" + url + ",n=" + name);
+	public static PageParameters newRegistrationParameter(String url,
+			String name) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("u", url);
+		parameterMap.put("n", name);
+		return new PageParameters(parameterMap);
 	}
 
 	public static PageParameters newUsernameParameter(String username) {
-		return new PageParameters("user=" + username);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("user", username);
+		return new PageParameters(parameterMap);
 	}
 
 	public static PageParameters newTeamnameParameter(String teamname) {
-		return new PageParameters("team=" + teamname);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("team", teamname);
+		return new PageParameters(parameterMap);
 	}
 
 	public static PageParameters newProjectParameter(String projectName) {
-		return new PageParameters("p=" + projectName);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("p", projectName);
+		return new PageParameters(parameterMap);
 	}
 
 	public static PageParameters newRepositoryParameter(String repositoryName) {
-		return new PageParameters("r=" + repositoryName);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("r", repositoryName);
+		return new PageParameters(parameterMap);
 	}
 
 	public static PageParameters newObjectParameter(String objectId) {
-		return new PageParameters("h=" + objectId);
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("h", objectId);
+		return new PageParameters(parameterMap);
 	}
 
-	public static PageParameters newObjectParameter(String repositoryName, String objectId) {
+	public static PageParameters newObjectParameter(String repositoryName,
+			String objectId) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
 		if (StringUtils.isEmpty(objectId)) {
 			return newRepositoryParameter(repositoryName);
 		}
-		return new PageParameters("r=" + repositoryName + ",h=" + objectId);
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", objectId);
+		return new PageParameters(parameterMap);
 	}
 
-	public static PageParameters newPathParameter(String repositoryName, String objectId,
-			String path) {
+	public static PageParameters newRangeParameter(String repositoryName,
+			String startRange, String endRange) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", startRange + ".." + endRange);
+		return new PageParameters(parameterMap);
+	}
+
+	public static PageParameters newPathParameter(String repositoryName,
+			String objectId, String path) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
 		if (StringUtils.isEmpty(path)) {
 			return newObjectParameter(repositoryName, objectId);
 		}
 		if (StringUtils.isEmpty(objectId)) {
-			return new PageParameters("r=" + repositoryName + ",f=" + path);
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("f", path);
+			return new PageParameters(parameterMap);
 		}
-		return new PageParameters("r=" + repositoryName + ",h=" + objectId + ",f=" + path);
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", objectId);
+		parameterMap.put("f", path);
+		return new PageParameters(parameterMap);
 	}
 
-	public static PageParameters newLogPageParameter(String repositoryName, String objectId,
+	public static PageParameters newLogPageParameter(String repositoryName,
+			String objectId, int pageNumber) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		if (pageNumber <= 1) {
+			return newObjectParameter(repositoryName, objectId);
+		}
+		if (StringUtils.isEmpty(objectId)) {
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("pg", String.valueOf(pageNumber));
+			return new PageParameters(parameterMap);
+		}
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", objectId);
+		parameterMap.put("pg", String.valueOf(pageNumber));
+		return new PageParameters(parameterMap);
+	}
+
+	public static PageParameters newHistoryPageParameter(String repositoryName,
+			String objectId, String path, int pageNumber) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		if (pageNumber <= 1) {
+			return newObjectParameter(repositoryName, objectId);
+		}
+		if (StringUtils.isEmpty(objectId)) {
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("f", path);
+			parameterMap.put("pg", String.valueOf(pageNumber));
+			return new PageParameters(parameterMap);
+		}
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", objectId);
+		parameterMap.put("f", path);
+		parameterMap.put("pg", String.valueOf(pageNumber));
+		return new PageParameters(parameterMap);
+	}
+
+	public static PageParameters newBlobDiffParameter(String repositoryName,
+			String baseCommitId, String commitId, String path) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		if (StringUtils.isEmpty(commitId)) {
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("f", path);
+			parameterMap.put("hb", baseCommitId);
+			return new PageParameters(parameterMap);
+		}
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", commitId);
+		parameterMap.put("f", path);
+		parameterMap.put("hb", baseCommitId);
+		return new PageParameters(parameterMap);
+	}
+
+	public static PageParameters newSearchParameter(String repositoryName,
+			String commitId, String search, Constants.SearchType type) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
+		if (StringUtils.isEmpty(commitId)) {
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("s", search);
+			parameterMap.put("st", type.name());
+			return new PageParameters(parameterMap);
+		}
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", commitId);
+		parameterMap.put("s", search);
+		parameterMap.put("st", type.name());
+		return new PageParameters(parameterMap);
+	}
+
+	public static PageParameters newSearchParameter(String repositoryName,
+			String commitId, String search, Constants.SearchType type,
 			int pageNumber) {
-		if (pageNumber <= 1) {
-			return newObjectParameter(repositoryName, objectId);
-		}
-		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,
-			String path, int pageNumber) {
-		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 + ",pg="
-				+ pageNumber);
-	}
-
-	public static PageParameters newBlobDiffParameter(String repositoryName, String baseCommitId,
-			String commitId, String path) {
+		Map<String, String> parameterMap = new HashMap<String, String>();
 		if (StringUtils.isEmpty(commitId)) {
-			return new PageParameters("r=" + repositoryName + ",f=" + path + ",hb=" + baseCommitId);
+			parameterMap.put("r", repositoryName);
+			parameterMap.put("s", search);
+			parameterMap.put("st", type.name());
+			parameterMap.put("pg", String.valueOf(pageNumber));
+			return new PageParameters(parameterMap);
 		}
-		return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",f=" + path + ",hb="
-				+ baseCommitId);
-	}
-
-	public static PageParameters newSearchParameter(String repositoryName, String commitId,
-			String search, Constants.SearchType type) {
-		if (StringUtils.isEmpty(commitId)) {
-			return new PageParameters("r=" + repositoryName + ",s=" + search + ",st=" + type.name());
-		}
-		return new PageParameters("r=" + repositoryName + ",h=" + commitId + ",s=" + search
-				+ ",st=" + type.name());
-	}
-
-	public static PageParameters newSearchParameter(String repositoryName, String commitId,
-			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() + ",pg=" + pageNumber);
+		parameterMap.put("r", repositoryName);
+		parameterMap.put("h", commitId);
+		parameterMap.put("s", search);
+		parameterMap.put("st", type.name());
+		parameterMap.put("pg", String.valueOf(pageNumber));
+		return new PageParameters(parameterMap);
 	}
 
 	public static String getProjectName(PageParameters params) {
@@ -411,7 +499,7 @@
 	}
 
 	public static int getDaysBack(PageParameters params) {
-		return params.getInt("db", 14);
+		return params.getInt("db", 0);
 	}
 
 	public static String getUsername(PageParameters params) {
@@ -500,9 +588,9 @@
 			dateString = df.format(date);
 		}
 		String title = null;
-		if (TimeUtils.isToday(date)) {
+		if (TimeUtils.isToday(date, timeZone)) {
 			title = timeUtils.today();
-		} else if (TimeUtils.isYesterday(date)) {
+		} else if (TimeUtils.isYesterday(date, timeZone)) {
 				title = timeUtils.yesterday();
 		} else if (date.getTime() <= System.currentTimeMillis()) {
 			// past

--
Gitblit v1.9.1