From cebf455f3fd54b72e530942f308097ec54b408cd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 07 Apr 2011 09:46:30 -0400
Subject: [PATCH] Let Wicket manage resources and use markup inheritance.
---
src/com/gitblit/wicket/RepositoryPage.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index 2f2b967..d3e0589 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -15,8 +15,6 @@
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;
@@ -28,7 +26,7 @@
private transient Repository r = null;
- public RepositoryPage(PageParameters params, String pageName) {
+ public RepositoryPage(PageParameters params) {
super(params);
if (!params.containsKey("p")) {
error("Repository not specified!");
@@ -39,8 +37,7 @@
Repository r = getRepository();
- add(new PageHeader("pageHeader", repositoryName, "/ " + pageName));
- add(new PageLinksPanel("pageLinks", r, repositoryName, pageName));
+ add(new PageLinksPanel("pageLinks", r, repositoryName, getPageName()));
setStatelessHint(true);
}
@@ -95,10 +92,12 @@
}
add(new Label(wicketId, html).setEscapeModelStrings(false));
}
+
+ protected abstract String getPageName();
protected void addFooter() {
r.close();
- add(new PageFooter("pageFooter", description));
+ setupPage(repositoryName, "/ " + getPageName());
}
protected PageParameters newRepositoryParameter() {
--
Gitblit v1.9.1