From 01bd346efe98af0f05f23f897c0819d2df8d856c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 16 Apr 2011 16:47:14 -0400
Subject: [PATCH] Replaced three history placeholder labels with real links.
---
src/com/gitblit/wicket/RepositoryPage.java | 69 +++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 27 deletions(-)
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index d3e0589..7378543 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -11,9 +11,13 @@
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import com.gitblit.StoredSettings;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.pages.RepositoriesPage;
import com.gitblit.wicket.panels.PageLinksPanel;
import com.gitblit.wicket.panels.RefsPanel;
@@ -21,23 +25,29 @@
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;
+ private final Logger logger = LoggerFactory.getLogger(RepositoryPage.class);
+
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 = WicketUtils.getRepositoryName(params);
+ objectId = WicketUtils.getObject(params);
Repository r = getRepository();
- add(new PageLinksPanel("pageLinks", r, repositoryName, getPageName()));
+ // 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);
}
@@ -47,7 +57,7 @@
HttpServletRequest req = servletWebRequest.getHttpServletRequest();
req.getServerName();
- Repository r = GitBlitWebApp.get().getRepository(req, repositoryName);
+ Repository r = GitBlit.self().getRepository(req, repositoryName);
if (r == null) {
error("Can not load repository " + repositoryName);
redirectToInterceptPage(new RepositoriesPage());
@@ -60,24 +70,28 @@
}
protected void addRefs(Repository r, RevCommit c) {
- add(new RefsPanel("refsPanel", r, c));
+ add(new RefsPanel("refsPanel", repositoryName, c, JGitUtils.getAllRefs(r)));
}
protected void addFullText(String wicketId, String text, boolean substituteRegex) {
- String html = WicketUtils.breakLines(text);
+ String html = StringUtils.breakLinesForHtml(text);
if (substituteRegex) {
Map<String, String> map = new HashMap<String, String>();
// global regex keys
- for (String key : StoredSettings.getAllKeys("regex.global")) {
- String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, StoredSettings.getString(key, ""));
+ if (GitBlit.self().settings().getBoolean(Keys.regex.global, false)) {
+ for (String key : GitBlit.self().settings().getAllKeys(Keys.regex.global)) {
+ if (!key.equals(Keys.regex.global)) {
+ String subKey = key.substring(key.lastIndexOf('.') + 1);
+ map.put(subKey, GitBlit.self().settings().getString(key, ""));
+ }
+ }
}
// repository-specific regex keys
- List<String> keys = StoredSettings.getAllKeys("regex." + repositoryName.toLowerCase());
+ List<String> keys = GitBlit.self().settings().getAllKeys(Keys.regex._ROOT + "." + repositoryName.toLowerCase());
for (String key : keys) {
String subKey = key.substring(key.lastIndexOf('.') + 1);
- map.put(subKey, StoredSettings.getString(key, ""));
+ map.put(subKey, GitBlit.self().settings().getString(key, ""));
}
for (String key : map.keySet()) {
@@ -92,33 +106,34 @@
}
add(new Label(wicketId, html).setEscapeModelStrings(false));
}
-
+
protected abstract String getPageName();
- protected void addFooter() {
- r.close();
+ @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