From 9da97003c7f33a64ae5060f413f9c4c5d26efe78 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 19 May 2011 19:01:45 -0400
Subject: [PATCH] Critical fix for servlet.

---
 src/com/gitblit/wicket/WicketUtils.java |   88 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index c8d605b..f0ccbf4 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -3,12 +3,15 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 import java.util.TimeZone;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.ContextImage;
+import org.apache.wicket.resource.ContextRelativeResource;
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;
 import org.eclipse.jgit.lib.Constants;
 
@@ -28,8 +31,12 @@
 		container.add(new SimpleAttributeModifier("style", value));
 	}
 
-	public static void setHtmlTitle(Component container, String value) {
+	public static void setHtmlTooltip(Component container, String value) {
 		container.add(new SimpleAttributeModifier("title", value));
+	}
+
+	public static void setInputPlaceholder(Component container, String value) {
+		container.add(new SimpleAttributeModifier("placeholder", value));
 	}
 
 	public static void setChangeTypeCssClass(Component container, ChangeType type) {
@@ -73,8 +80,77 @@
 
 	public static Label createAuthorLabel(String wicketId, String author) {
 		Label label = new Label(wicketId, author);
-		WicketUtils.setHtmlTitle(label, author);
+		WicketUtils.setHtmlTooltip(label, author);
 		return label;
+	}
+
+	public static ContextImage getFileImage(String wicketId, String filename) {
+		filename = filename.toLowerCase();
+		if (filename.endsWith(".java")) {
+			return newImage(wicketId, "file_java_16x16.png");
+		} else if (filename.endsWith(".rb")) {
+			return newImage(wicketId, "file_ruby_16x16.png");
+		} else if (filename.endsWith(".php")) {
+			return newImage(wicketId, "file_php_16x16.png");
+		} else if (filename.endsWith(".cs")) {
+			return newImage(wicketId, "file_cs_16x16.png");
+		} else if (filename.endsWith(".cpp")) {
+			return newImage(wicketId, "file_cpp_16x16.png");
+		} else if (filename.endsWith(".c")) {
+			return newImage(wicketId, "file_c_16x16.png");
+		} else if (filename.endsWith(".h")) {
+			return newImage(wicketId, "file_h_16x16.png");
+		} else if (filename.endsWith(".sln")) {
+			return newImage(wicketId, "file_vs_16x16.png");
+		} else if (filename.endsWith(".csv") || filename.endsWith(".xls") || filename.endsWith(".xlsx")) {
+			return newImage(wicketId, "file_excel_16x16.png");
+		} else if (filename.endsWith(".doc") || filename.endsWith(".docx")) {
+			return newImage(wicketId, "file_word_16x16.png");
+		} else if (filename.endsWith(".ppt")) {
+			return newImage(wicketId, "file_ppt_16x16.png");
+		} else if (filename.endsWith(".zip")) {
+			return newImage(wicketId, "file_zip_16x16.png");
+		} else if (filename.endsWith(".pdf")) {
+			return newImage(wicketId, "file_acrobat_16x16.png");
+		} else if (filename.endsWith(".htm") || filename.endsWith(".html")) {
+			return newImage(wicketId, "file_world_16x16.png");
+		} else if (filename.endsWith(".xml")) {
+			return newImage(wicketId, "file_code_16x16.png");
+		} else if (filename.endsWith(".properties")) {
+			return newImage(wicketId, "file_settings_16x16.png");
+		}
+
+		List<String> mdExtensions = GitBlit.self().settings().getStrings(Keys.web.markdownExtensions);
+		for (String ext : mdExtensions) {
+			if (filename.endsWith('.' + ext.toLowerCase())) {
+				return newImage(wicketId, "file_world_16x16.png");
+			}
+		}
+		return newImage(wicketId, "file_16x16.png");
+	}
+
+	public static ContextImage newClearPixel(String wicketId) {
+		return newImage(wicketId, "pixel.png");
+	}
+
+	public static ContextImage newBlankImage(String wicketId) {
+		return newImage(wicketId, "blank.png");
+	}
+
+	public static ContextImage newImage(String wicketId, String file) {
+		return newImage(wicketId, file, null);
+	}
+
+	public static ContextImage newImage(String wicketId, String file, String tooltip) {
+		ContextImage img = new ContextImage(wicketId, "/com/gitblit/wicket/resources/" + file);
+		if (!StringUtils.isEmpty(tooltip)) {
+			setHtmlTooltip(img, tooltip);
+		}
+		return img;
+	}
+
+	public static ContextRelativeResource getResource(String file) {
+		return new ContextRelativeResource("/com/gitblit/wicket/resources/" + file);
 	}
 
 	public static PageParameters newRepositoryParameter(String repositoryName) {
@@ -151,6 +227,10 @@
 	public static int getPage(PageParameters params) {
 		return params.getInt("page", 1); // index from 1
 	}
+	
+	public static String getUsername(PageParameters params) {
+		return params.getString("user", "");
+	}
 
 	public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {
 		DateFormat df = new SimpleDateFormat(GitBlit.self().settings().getString(Keys.web.datestampShortFormat, "MM/dd/yy"));
@@ -166,7 +246,7 @@
 		}
 		Label label = new Label(wicketId, dateString);
 		WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));
-		WicketUtils.setHtmlTitle(label, title);
+		WicketUtils.setHtmlTooltip(label, title);
 		return label;
 	}
 
@@ -178,7 +258,7 @@
 		String dateString = df.format(date);
 		String title = TimeUtils.timeAgo(date);
 		Label label = new Label(wicketId, dateString);
-		WicketUtils.setHtmlTitle(label, title);
+		WicketUtils.setHtmlTooltip(label, title);
 		return label;
 	}
 }

--
Gitblit v1.9.1