From 66c29a66638066c3c56cdcbd423d5c7874b73a27 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 11 Apr 2011 09:59:56 -0400
Subject: [PATCH] Enforce default paging value.
---
src/com/gitblit/wicket/pages/CommitPage.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index ad1fce0..7de0345 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -5,9 +5,11 @@
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.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.StringResourceModel;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -17,18 +19,15 @@
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
-import com.gitblit.wicket.panels.PathLinksPanel;
public class CommitPage extends RepositoryPage {
public CommitPage(PageParameters params) {
- super(params, "commit");
-
- final String commitId = params.getString("h", "");
+ super(params);
Repository r = getRepository();
- RevCommit c = JGitUtils.getCommit(r, commitId);
+ RevCommit c = JGitUtils.getCommit(r, objectId);
List<String> parents = new ArrayList<String>();
if (c.getParentCount() > 0) {
@@ -40,12 +39,14 @@
// commit page links
if (parents.size() == 0) {
add(new Label("parentLink", "none"));
+ add(new Label("commitdiffLink", getString("gb.commitdiff")));
} else {
add(new LinkPanel("parentLink", null, parents.get(0).substring(0, 8), CommitPage.class, newCommitParameter(parents.get(0))));
+ add(new LinkPanel("commitdiffLink", null, new StringResourceModel("gb.commitdiff", this, null), DiffPage.class, WicketUtils.newObjectParameter(repositoryName, objectId)));
}
- add(new Label("patchLink", "patch"));
+ add(new Label("patchLink", getString("gb.patch")));
- add(new LinkPanel("shortlog", "title", c.getShortMessage(), ShortLogPage.class, newRepositoryParameter()));
+ add(new LinkPanel("shortlog", "title", c.getShortMessage(), LogPage.class, newRepositoryParameter()));
addRefs(r, c);
@@ -76,7 +77,7 @@
addFullText("fullMessage", c.getFullMessage(), true);
// changed paths list
- List<PathModel> paths = JGitUtils.getCommitChangedPaths(r, c);
+ List<PathModel> paths = JGitUtils.getFilesInCommit(r, c);
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {
private static final long serialVersionUID = 1L;
@@ -89,18 +90,20 @@
} else {
item.add(new LinkPanel("pathName", "list", entry.path, BlobPage.class, newPathParameter(entry.path)));
}
- item.add(new PathLinksPanel("pathLinks", repositoryName, entry));
- String clazz = counter % 2 == 0 ? "dark" : "light";
- WicketUtils.setCssClass(item, clazz);
+
+ item.add(new BookmarkablePageLink<Void>("diff", DiffPage.class, newPathParameter(entry.path)));
+ item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, newPathParameter(entry.path)));
+ item.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
+
+ WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(pathsView);
-
- // close repository
- r.close();
-
- // footer
- addFooter();
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.commit");
}
}
--
Gitblit v1.9.1