From d65f712ea3d8941f4b9145c0630c30c20af80d13 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 11 Nov 2011 17:22:21 -0500
Subject: [PATCH] Documentation. Add javadoc and source jars to the gbapi download.
---
src/com/gitblit/wicket/pages/TreePage.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 4fc7119..7fc91ee 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -26,6 +26,7 @@
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -65,10 +66,19 @@
// breadcrumbs
add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
if (path != null && path.trim().length() > 0) {
- paths.add(0, PathModel.getParentPath(path, objectId));
+ // add .. parent path entry
+ String parentPath = null;
+ if (path.lastIndexOf('/') > -1) {
+ parentPath = path.substring(0, path.lastIndexOf('/'));
+ }
+ PathModel model = new PathModel("..", parentPath, 0, FileMode.TREE.getBits(), objectId);
+ model.isParentPath = true;
+ paths.add(0, model);
}
final ByteFormat byteFormat = new ByteFormat();
+
+ final String baseUrl = WicketUtils.getGitblitURL(getRequest());
// changed paths list
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
@@ -84,7 +94,8 @@
item.add(WicketUtils.newBlankImage("pathIcon"));
item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class,
- newPathParameter(entry.path)));
+ WicketUtils
+ .newPathParameter(repositoryName, entry.commitId, entry.path)));
item.add(new Label("pathLinks", ""));
} else {
if (entry.isTree()) {
@@ -92,7 +103,8 @@
item.add(WicketUtils.newImage("pathIcon", "folder_16x16.png"));
item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", "list", entry.name, TreePage.class,
- newPathParameter(entry.path)));
+ WicketUtils.newPathParameter(repositoryName, entry.commitId,
+ entry.path)));
// links
Fragment links = new Fragment("pathLinks", "treeLinks", this);
@@ -102,17 +114,17 @@
links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
entry.path)));
- links.add(new ExternalLink("zip", DownloadZipServlet.asLink(getRequest()
- .getRelativePathPrefixToContextRoot(), repositoryName, objectId,
- entry.path)).setVisible(GitBlit.getBoolean(
- Keys.web.allowZipDownloads, true)));
+ links.add(new ExternalLink("zip", DownloadZipServlet.asLink(baseUrl,
+ repositoryName, objectId, entry.path)).setVisible(GitBlit
+ .getBoolean(Keys.web.allowZipDownloads, true)));
item.add(links);
} else {
// blob link
item.add(WicketUtils.getFileImage("pathIcon", entry.name));
item.add(new Label("pathSize", byteFormat.format(entry.size)));
item.add(new LinkPanel("pathName", "list", entry.name, BlobPage.class,
- newPathParameter(entry.path)));
+ WicketUtils.newPathParameter(repositoryName, entry.commitId,
+ entry.path)));
// links
Fragment links = new Fragment("pathLinks", "blobLinks", this);
@@ -121,8 +133,9 @@
entry.path)));
links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path)));
- links.add(new BookmarkablePageLink<Void>("blame", BlobPage.class)
- .setEnabled(false));
+ links.add(new BookmarkablePageLink<Void>("blame", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, entry.commitId,
+ entry.path)));
links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, entry.commitId,
entry.path)));
--
Gitblit v1.9.1