From 698678268f53067c239a11e928dfd16761a2f9f7 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 08 Apr 2011 17:17:28 -0400 Subject: [PATCH] created panels for logs, tags, and branches. --- src/com/gitblit/wicket/pages/BranchesPage.java | 55 ++----------------------------------------------------- 1 files changed, 2 insertions(+), 53 deletions(-) diff --git a/src/com/gitblit/wicket/pages/BranchesPage.java b/src/com/gitblit/wicket/pages/BranchesPage.java index 30fac1a..f4359d8 100644 --- a/src/com/gitblit/wicket/pages/BranchesPage.java +++ b/src/com/gitblit/wicket/pages/BranchesPage.java @@ -1,23 +1,9 @@ package com.gitblit.wicket.pages; -import java.util.ArrayList; -import java.util.List; - import org.apache.wicket.PageParameters; -import org.apache.wicket.markup.html.basic.Label; -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.Repository; -import com.gitblit.utils.JGitUtils; -import com.gitblit.utils.Utils; -import com.gitblit.wicket.LinkPanel; import com.gitblit.wicket.RepositoryPage; -import com.gitblit.wicket.WicketUtils; -import com.gitblit.wicket.models.RefModel; -import com.gitblit.wicket.panels.BranchLinksPanel; +import com.gitblit.wicket.panels.BranchesPanel; public class BranchesPage extends RepositoryPage { @@ -25,44 +11,7 @@ public BranchesPage(PageParameters params) { super(params); - Repository r = getRepository(); - List<RefModel> branches = new ArrayList<RefModel>(); - branches.addAll(JGitUtils.getLocalBranches(r, -1)); - branches.addAll(JGitUtils.getRemoteBranches(r, -1)); - - // shortlog - add(new LinkPanel("summary", "title", repositoryName, SummaryPage.class, newRepositoryParameter())); - - ListDataProvider<RefModel> branchesDp = new ListDataProvider<RefModel>(branches); - DataView<RefModel> branchView = new DataView<RefModel>("branch", branchesDp) { - private static final long serialVersionUID = 1L; - int counter = 0; - - public void populateItem(final Item<RefModel> item) { - final RefModel entry = item.getModelObject(); - String date; - if (entry.getDate() != null) { - date = Utils.timeAgo(entry.getDate()); - } else { - date = ""; - } - Label branchDateLabel = new Label("branchDate", date); - item.add(branchDateLabel); - WicketUtils.setCssClass(branchDateLabel, Utils.timeAgoCss(entry.getDate())); - - item.add(new LinkPanel("branchName", "list name", entry.getDisplayName(), ShortLogPage.class, newCommitParameter(entry.getName()))); - - boolean remote = entry.getName().startsWith(Constants.R_REMOTES); - item.add(new Label("branchType", remote ? getString("gb.remote"):getString("gb.local"))); - - item.add(new BranchLinksPanel("branchLinks", repositoryName, entry)); - - String clazz = counter % 2 == 0 ? "dark" : "light"; - WicketUtils.setCssClass(item, clazz); - counter++; - } - }; - add(branchView); + add(new BranchesPanel("branchesPanel", repositoryName, getRepository(), -1)); } @Override -- Gitblit v1.9.1