From bc10f9b3128f6d6986138914b3b53f5d974a2d09 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 11 Apr 2011 21:49:36 -0400
Subject: [PATCH] Eliminated most session usage.
---
src/com/gitblit/wicket/pages/DiffPage.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/DiffPage.java b/src/com/gitblit/wicket/pages/DiffPage.java
index 05500f8..1912c42 100644
--- a/src/com/gitblit/wicket/pages/DiffPage.java
+++ b/src/com/gitblit/wicket/pages/DiffPage.java
@@ -8,17 +8,18 @@
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
+import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.PathBreadcrumbsPanel;
public class DiffPage extends RepositoryPage {
public DiffPage(PageParameters params) {
- super(params, "diff");
+ super(params);
- final String blobPath = params.getString("f", null);
+ final String blobPath = WicketUtils.getPath(params);
Repository r = getRepository();
- RevCommit commit = JGitUtils.getCommit(r, commitId);
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
String diff;
if (blobPath != null && blobPath.length() > 0) {
// blob diff
@@ -27,20 +28,21 @@
// commit diff
diff = JGitUtils.getCommitDiff(r, commit, true);
}
- r.close();
// diff page links
- add(new Label("historyLink", "history"));
- add(new Label("rawLink", "raw"));
+ add(new Label("historyLink", getString("gb.history")));
+ add(new Label("rawLink", getString("gb.raw")));
add(new Label("headLink", "HEAD"));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));
add(new Label("diffText", diff).setEscapeModelStrings(false));
-
- // footer
- addFooter();
+ }
+
+ @Override
+ protected String getPageName() {
+ return getString("gb.diff");
}
}
--
Gitblit v1.9.1