From 03232453be7624bc2fc8a942e8c280353606fe8b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Jun 2013 08:30:15 -0400
Subject: [PATCH] Improve readability of Gerrit change ref and added tooltip
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++-
src/main/java/com/gitblit/wicket/panels/RefsPanel.java | 13 ++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index f3c6d71..34ba138 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -496,4 +496,5 @@
gb.active = active
gb.starred = starred
gb.owned = owned
-gb.starredAndOwned = starred & owned
\ No newline at end of file
+gb.starredAndOwned = starred & owned
+gb.reviewPatchset = review {0} patchset {1}
\ No newline at end of file
diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index 7ea3539..e477b65 100644
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.panels;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -33,6 +34,7 @@
import com.gitblit.Constants;
import com.gitblit.models.RefModel;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
@@ -99,6 +101,7 @@
boolean breakLine = false;
Class<? extends WebPage> linkClass = CommitPage.class;
String cssClass = "";
+ String tooltip = "";
if (name.startsWith(Constants.R_HEADS)) {
// local branch
linkClass = LogPage.class;
@@ -111,6 +114,10 @@
} else if (name.startsWith(Constants.R_CHANGES)) {
// Gerrit change ref
name = name.substring(Constants.R_CHANGES.length());
+ // strip leading nn/ from nn/#####nn/ps = #####nn-ps
+ name = name.substring(name.indexOf('/') + 1).replace('/', '-');
+ String [] values = name.split("-");
+ tooltip = MessageFormat.format(getString("gb.reviewPatchset"), values[0], values[1]);
cssClass = "otherRef";
} else if (name.startsWith(Constants.R_PULL)) {
// Pull Request ref
@@ -154,7 +161,11 @@
Component c = new LinkPanel("refName", null, name, linkClass,
WicketUtils.newObjectParameter(repositoryName, objectid));
WicketUtils.setCssClass(c, cssClass);
- WicketUtils.setHtmlTooltip(c, name);
+ if (StringUtils.isEmpty(tooltip)) {
+ WicketUtils.setHtmlTooltip(c, name);
+ } else {
+ WicketUtils.setHtmlTooltip(c, tooltip);
+ }
item.add(c);
Label lb = new Label("lineBreak", "<br/>");
lb.setVisible(breakLine);
--
Gitblit v1.9.1