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/RepositoryPage.java | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index 2f2b967..4e84938 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -15,32 +15,33 @@
import com.gitblit.StoredSettings;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.pages.RepositoriesPage;
-import com.gitblit.wicket.panels.PageFooter;
-import com.gitblit.wicket.panels.PageHeader;
import com.gitblit.wicket.panels.PageLinksPanel;
import com.gitblit.wicket.panels.RefsPanel;
public abstract class RepositoryPage extends BasePage {
protected final String repositoryName;
- protected final String commitId;
+ protected final String objectId;
protected String description;
private transient Repository r = null;
- public RepositoryPage(PageParameters params, String pageName) {
+ public RepositoryPage(PageParameters params) {
super(params);
- if (!params.containsKey("p")) {
+ if (!params.containsKey("r")) {
error("Repository not specified!");
redirectToInterceptPage(new RepositoriesPage());
}
- repositoryName = params.getString("p", "");
- commitId = params.getString("h", "");
+ repositoryName = params.getString("r", "");
+ objectId = params.getString("h", "HEAD");
Repository r = getRepository();
- add(new PageHeader("pageHeader", repositoryName, "/ " + pageName));
- add(new PageLinksPanel("pageLinks", r, repositoryName, pageName));
+ // setup the page links and disable this page's link
+ PageLinksPanel pageLinks = new PageLinksPanel("pageLinks", r, repositoryName, getPageName());
+ add(pageLinks);
+ pageLinks.disablePageLink(getPageName());
+
setStatelessHint(true);
}
@@ -96,30 +97,33 @@
add(new Label(wicketId, html).setEscapeModelStrings(false));
}
- protected void addFooter() {
- r.close();
- add(new PageFooter("pageFooter", description));
+ protected abstract String getPageName();
+
+ @Override
+ protected void onBeforeRender() {
+ // dispose of repository object
+ if (r != null) {
+ r.close();
+ r = null;
+ }
+ // setup page header and footer
+ setupPage(repositoryName, "/ " + getPageName());
+ super.onBeforeRender();
}
protected PageParameters newRepositoryParameter() {
- return new PageParameters("p=" + repositoryName);
+ return WicketUtils.newRepositoryParameter(repositoryName);
}
protected PageParameters newCommitParameter() {
- return newCommitParameter(commitId);
+ return WicketUtils.newObjectParameter(repositoryName, objectId);
}
protected PageParameters newCommitParameter(String commitId) {
- if (commitId == null || commitId.trim().length() == 0) {
- return newRepositoryParameter();
- }
- return new PageParameters("p=" + repositoryName + ",h=" + commitId);
+ return WicketUtils.newObjectParameter(repositoryName, commitId);
}
protected PageParameters newPathParameter(String path) {
- if (path == null || path.trim().length() == 0) {
- return newCommitParameter();
- }
- return new PageParameters("p=" + repositoryName + ",h=" + commitId + ",f=" + path);
+ return WicketUtils.newPathParameter(repositoryName, objectId, path);
}
}
--
Gitblit v1.9.1