Improve Gerrit change ref rendering (issue-206)

diff --git a/releases.moxie b/releases.moxie
index 5aedcaccc310627c2705fbd14376bf6fca4fd422..c06543533bd9dc09cdd7106cc3f7046d6dba7391 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -26,6 +26,7 @@ r17: {
         - Use standard ServletRequestWrapper instead of custom wrapper (issue 224)\r
 \r
        changes:\r
+        - Improve Gerrit change ref decoration in the refs panel (issue 206)\r
         - Disable Gson's pretty printing which has a huge performance gain\r
         - Properly set application/json content-type on api calls\r
         - Updated Polish translation\r

diff --git a/src/main/java/com/gitblit/client/BranchRenderer.java b/src/main/java/com/gitblit/client/BranchRenderer.java
index 9a303c388a769b83bcec11cd63796914d8e45b08..5f12c42c9395fbd36ebf5b357a6a6558fce8f38b 100644 (file)
--- a/src/main/java/com/gitblit/client/BranchRenderer.java
+++ b/src/main/java/com/gitblit/client/BranchRenderer.java
@@ -37,6 +37,8 @@ public class BranchRenderer extends DefaultTableCellRenderer implements ListCell
        private static final String R_HEADS = "refs/heads/";\r
 \r
        private static final String R_REMOTES = "refs/remotes/";\r
+       \r
+       private static final String R_CHANGES = "refs/changes/";\r
 \r
        public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,\r
                        boolean hasFocus, int row, int column) {\r
@@ -71,6 +73,9 @@ public class BranchRenderer extends DefaultTableCellRenderer implements ListCell
                } else if (name.startsWith(R_REMOTES)) {\r
                        name = name.substring(R_REMOTES.length());\r
                        fg = Color.decode("#6C6CBF");\r
+               } else if (name.startsWith(R_CHANGES)) {\r
+                       name = name.substring(R_CHANGES.length());\r
+                       fg = Color.decode("#B0E0F0");\r
                }\r
                setForeground(fg);\r
                super.setText(name);\r

diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index 3ba22c0b9249cc59e45445e5be44a64671041ac3..c3807ac23ff7c2bef100dd32919cf190591cabf9 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -41,6 +41,8 @@ import com.gitblit.wicket.pages.TagPage;
 public class RefsPanel extends Panel {\r
 \r
        private static final long serialVersionUID = 1L;\r
+       \r
+       private static final String R_CHANGES = "refs/changes/";\r
 \r
        public RefsPanel(String id, final String repositoryName, RevCommit c,\r
                        Map<ObjectId, List<RefModel>> refs) {\r
@@ -108,6 +110,10 @@ public class RefsPanel extends Panel {
                                        // local head\r
                                        linkClass = LogPage.class;\r
                                        cssClass = "headRef";\r
+                               } else if (name.startsWith(R_CHANGES)) {\r
+                                       // Gerrit change ref\r
+                                       name = name.substring(R_CHANGES.length());\r
+                                       cssClass = "otherRef";\r
                                } else if (name.startsWith(Constants.R_REMOTES)) {\r
                                        // remote branch\r
                                        linkClass = LogPage.class;\r