From 008322bec70a3a20bd00ed2219215a9f42fe0ca5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 08 Jun 2011 20:48:07 -0400
Subject: [PATCH] Blame support finished, requires JGit 1.0.0. Checkstyle. Findbugs.
---
src/com/gitblit/wicket/panels/RefsPanel.java | 92 +++++++++++++++++++++++++++++-----------------
1 files changed, 58 insertions(+), 34 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/RefsPanel.java b/src/com/gitblit/wicket/panels/RefsPanel.java
index b6e4b0b..f25b53b 100644
--- a/src/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/com/gitblit/wicket/panels/RefsPanel.java
@@ -17,6 +17,7 @@
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -29,10 +30,11 @@
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.gitblit.wicket.LinkPanel;
+import com.gitblit.models.RefModel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
+import com.gitblit.wicket.pages.RepositoryPage;
import com.gitblit.wicket.pages.TagPage;
public class RefsPanel extends Panel {
@@ -40,45 +42,67 @@
private static final long serialVersionUID = 1L;
public RefsPanel(String id, final String repositoryName, RevCommit c,
- Map<ObjectId, List<String>> refs) {
- super(id);
- List<String> refNames = refs.get(c.getId());
- if (refNames == null) {
- refNames = new ArrayList<String>();
- }
- Collections.sort(refNames);
- // refNames.remove(Constants.HEAD);
+ Map<ObjectId, List<RefModel>> refs) {
+ this(id, repositoryName, refs.get(c.getId()));
+ }
- ListDataProvider<String> refsDp = new ListDataProvider<String>(refNames);
- DataView<String> refsView = new DataView<String>("ref", refsDp) {
+ public RefsPanel(String id, final String repositoryName, List<RefModel> refs) {
+ super(id);
+ if (refs == null) {
+ refs = new ArrayList<RefModel>();
+ }
+ Collections.sort(refs, new Comparator<RefModel>() {
+ @Override
+ public int compare(RefModel o1, RefModel o2) {
+ return o1.displayName.compareTo(o2.displayName);
+ }
+ });
+
+ ListDataProvider<RefModel> refsDp = new ListDataProvider<RefModel>(refs);
+ DataView<RefModel> refsView = new DataView<RefModel>("ref", refsDp) {
private static final long serialVersionUID = 1L;
- public void populateItem(final Item<String> item) {
- String entry = item.getModelObject();
- Component c = null;
- if (entry.startsWith(Constants.R_HEADS)) {
+ public void populateItem(final Item<RefModel> item) {
+ RefModel entry = item.getModelObject();
+ String name = entry.displayName;
+ String objectid = entry.getReferencedObjectId().getName();
+
+ Class<? extends RepositoryPage> linkClass = CommitPage.class;
+ String cssClass = "";
+ if (name.startsWith(Constants.R_HEADS)) {
+ // local branch
+ linkClass = LogPage.class;
+ name = name.substring(Constants.R_HEADS.length());
+ cssClass = "localBranch";
+ } else if (name.equals(Constants.HEAD)) {
// local head
- c = new LinkPanel("refName", null, entry.substring(Constants.R_HEADS.length()),
- LogPage.class, WicketUtils.newObjectParameter(repositoryName, entry));
- WicketUtils.setCssClass(c, "headRef");
- } else if (entry.startsWith(Constants.R_REMOTES)) {
- // remote head
- c = new LinkPanel("refName", null,
- entry.substring(Constants.R_REMOTES.length()), LogPage.class,
- WicketUtils.newObjectParameter(repositoryName, entry));
- WicketUtils.setCssClass(c, "remoteRef");
- } else if (entry.startsWith(Constants.R_TAGS)) {
+ linkClass = LogPage.class;
+ cssClass = "headRef";
+ } else if (name.startsWith(Constants.R_REMOTES)) {
+ // remote branch
+ linkClass = LogPage.class;
+ name = name.substring(Constants.R_REMOTES.length());
+ cssClass = "remoteBranch";
+ } else if (name.startsWith(Constants.R_TAGS)) {
// tag
- c = new LinkPanel("refName", null, entry.substring(Constants.R_TAGS.length()),
- TagPage.class, WicketUtils.newObjectParameter(repositoryName, entry));
- WicketUtils.setCssClass(c, "tagRef");
- } else {
- // other
- c = new LinkPanel("refName", null, entry, CommitPage.class,
- WicketUtils.newObjectParameter(repositoryName, entry));
- WicketUtils.setCssClass(c, "otherRef");
+ if (entry.isAnnotatedTag()) {
+ linkClass = TagPage.class;
+ objectid = entry.getObjectId().getName();
+ } else {
+ linkClass = CommitPage.class;
+ objectid = entry.getReferencedObjectId().getName();
+ }
+ name = name.substring(Constants.R_TAGS.length());
+ cssClass = "tagRef";
+ } else if (name.startsWith(Constants.R_NOTES)) {
+ linkClass = CommitPage.class;
+ cssClass = "otherRef";
}
- WicketUtils.setHtmlTooltip(c, entry);
+
+ Component c = new LinkPanel("refName", null, name, linkClass,
+ WicketUtils.newObjectParameter(repositoryName, objectid));
+ WicketUtils.setCssClass(c, cssClass);
+ WicketUtils.setHtmlTooltip(c, name);
item.add(c);
}
};
--
Gitblit v1.9.1