From 56c549e384b1a648c77bbd09a2cc77976e8a64de Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 24 May 2011 17:39:55 -0400 Subject: [PATCH] Documentation. --- src/com/gitblit/wicket/pages/CommitPage.java | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java index 0406523..c3c3fa9 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.java +++ b/src/com/gitblit/wicket/pages/CommitPage.java @@ -6,6 +6,7 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; +import org.apache.wicket.markup.html.link.ExternalLink; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.data.DataView; import org.apache.wicket.markup.repeater.data.ListDataProvider; @@ -13,12 +14,17 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.DownloadZipServlet; +import com.gitblit.GitBlit; +import com.gitblit.Keys; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.JGitUtils.SearchType; import com.gitblit.wicket.LinkPanel; import com.gitblit.wicket.RepositoryPage; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.models.PathModel.PathChangeModel; +import com.gitblit.wicket.panels.CommitHeaderPanel; +import com.gitblit.wicket.panels.CommitLegendPanel; public class CommitPage extends RepositoryPage { @@ -26,7 +32,7 @@ super(params); Repository r = getRepository(); - RevCommit c = JGitUtils.getCommit(r, objectId); + RevCommit c = getCommit(); List<String> parents = new ArrayList<String>(); if (c.getParentCount() > 0) { @@ -45,7 +51,7 @@ } add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class, WicketUtils.newObjectParameter(repositoryName, objectId))); - add(new LinkPanel("shortlog", "title", c.getShortMessage(), CommitDiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId))); + add(new CommitHeaderPanel("commitHeader", repositoryName, c)); addRefs(r, c); @@ -54,12 +60,14 @@ add(WicketUtils.createTimestampLabel("commitAuthorDate", c.getAuthorIdent().getWhen(), getTimeZone())); // committer - add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER)); + add(createPersonPanel("commitCommitter", c.getCommitterIdent(), SearchType.COMMITTER)); add(WicketUtils.createTimestampLabel("commitCommitterDate", c.getCommitterIdent().getWhen(), getTimeZone())); add(new Label("commitId", c.getName())); add(new LinkPanel("commitTree", "list", c.getTree().getName(), TreePage.class, newCommitParameter())); + add(new BookmarkablePageLink<Void>("treeLink", TreePage.class, newCommitParameter())); + add(new ExternalLink("zipLink", DownloadZipServlet.asLink(getRequest().getRelativePathPrefixToContextRoot(), repositoryName, objectId, null)).setVisible(GitBlit.self().settings().getBoolean(Keys.web.allowZipDownloads, true))); // Parent Commits ListDataProvider<String> parentsDp = new ListDataProvider<String>(parents); @@ -78,7 +86,8 @@ addFullText("fullMessage", c.getFullMessage(), true); // changed paths list - List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c); + List<PathChangeModel> paths = JGitUtils.getFilesInCommit(r, c); + add(new CommitLegendPanel("commitLegend", paths)); ListDataProvider<PathChangeModel> pathsDp = new ListDataProvider<PathChangeModel>(paths); DataView<PathChangeModel> pathsView = new DataView<PathChangeModel>("changedPath", pathsDp) { private static final long serialVersionUID = 1L; @@ -107,7 +116,7 @@ }; add(pathsView); } - + @Override protected String getPageName() { return getString("gb.commit"); -- Gitblit v1.9.1