From 9b26b74d198aa4efbe4b25f6667b98eb5261e13d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 31 May 2013 20:08:50 -0400 Subject: [PATCH] Refinements to push log display and daily digests --- src/main/java/com/gitblit/wicket/panels/RefsPanel.java | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java index dc852e2..7ea3539 100644 --- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java @@ -28,10 +28,10 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; -import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.Constants; import com.gitblit.models.RefModel; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.CommitPage; @@ -42,10 +42,6 @@ private static final long serialVersionUID = 1L; - private static final String R_CHANGES = "refs/changes/"; - - private static final String R_PULL= "refs/pull/"; - public RefsPanel(String id, final String repositoryName, RevCommit c, Map<ObjectId, List<RefModel>> refs) { this(id, repositoryName, refs.get(c.getId())); @@ -112,17 +108,17 @@ // local head linkClass = LogPage.class; cssClass = "headRef"; - } else if (name.startsWith(R_CHANGES)) { + } else if (name.startsWith(Constants.R_CHANGES)) { // Gerrit change ref - name = name.substring(R_CHANGES.length()); + name = name.substring(Constants.R_CHANGES.length()); cssClass = "otherRef"; - } else if (name.startsWith(R_PULL)) { + } else if (name.startsWith(Constants.R_PULL)) { // Pull Request ref - name = "pull #" + name.substring(R_PULL.length()); + name = "pull #" + name.substring(Constants.R_PULL.length()); if (name.endsWith("/head")) { // strip pull request head from name name = name.substring(0, name.length() - "/head".length()); - } + } cssClass = "pullRef"; } else if (name.startsWith(Constants.R_REMOTES)) { // remote branch -- Gitblit v1.9.1