From f97bf09263fe8ef7ba4dcf231dfe7b8265b1e0df Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 27 Apr 2011 21:22:12 -0400
Subject: [PATCH] Centralized markdown transforms. Moved config ops to GitBlit.
---
src/com/gitblit/wicket/pages/TreePage.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index a608bdd..56f96d6 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -4,9 +4,12 @@
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
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.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -16,38 +19,35 @@
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.models.PathModel;
+import com.gitblit.wicket.panels.CommitHeaderPanel;
import com.gitblit.wicket.panels.PathBreadcrumbsPanel;
-import com.gitblit.wicket.panels.TreeLinksPanel;
-
public class TreePage extends RepositoryPage {
public TreePage(PageParameters params) {
- super(params, "tree");
+ super(params);
- final String basePath = params.getString("f", null);
+ final String path = WicketUtils.getPath(params);
Repository r = getRepository();
- RevCommit commit = JGitUtils.getCommit(r, commitId);
- List<PathModel> paths = JGitUtils.getFilesInPath(r, basePath, commit);
+ RevCommit commit = JGitUtils.getCommit(r, objectId);
+ List<PathModel> paths = JGitUtils.getFilesInPath(r, path, commit);
// tree page links
- add(new Label("historyLink", "history"));
- add(new Label("headLink", "HEAD"));
+ add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, objectId, path)));
+ add(new BookmarkablePageLink<Void>("headLink", TreePage.class, WicketUtils.newPathParameter(repositoryName, Constants.HEAD, path)));
- add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
+ add(new CommitHeaderPanel("commitHeader", repositoryName, commit));
// breadcrumbs
- if (basePath == null || basePath.trim().length() == 0) {
- add(new Label("breadcrumbs", "").setVisible(false));
- } else {
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));
- paths.add(0, PathModel.getParentPath(basePath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, path, objectId));
+ if (path != null && path.trim().length() > 0) {
+ paths.add(0, PathModel.getParentPath(path, objectId));
}
final ByteFormat byteFormat = new ByteFormat();
-
- // changed paths list
+
+ // changed paths list
ListDataProvider<PathModel> pathsDp = new ListDataProvider<PathModel>(paths);
DataView<PathModel> pathsView = new DataView<PathModel>("changedPath", pathsDp) {
private static final long serialVersionUID = 1L;
@@ -58,32 +58,46 @@
item.add(new Label("pathPermissions", JGitUtils.getPermissionsFromMode(entry.mode)));
if (entry.isParentPath) {
// parent .. path
- item.add(new Label("pathSize", "").setVisible(false));
+ item.add(WicketUtils.newBlankImage("pathIcon"));
+ item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
- item.add(new Label("treeLinks", "").setVisible(false));
+ item.add(new Label("pathLinks", ""));
} else {
if (entry.isTree()) {
// folder/tree link
- item.add(new Label("pathSize", "-"));
- item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
+ 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)));
+
+ // links
+ Fragment links = new Fragment("pathLinks", "treeLinks", this);
+ links.add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ links.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ 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)));
+
+ // links
+ Fragment links = new Fragment("pathLinks", "blobLinks", this);
+ links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, 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>("history", HistoryPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ item.add(links);
}
- item.add(new TreeLinksPanel("treeLinks", repositoryName, entry));
}
- String clazz = counter % 2 == 0 ? "dark" : "light";
- WicketUtils.setCssClass(item, clazz);
+ WicketUtils.setAlternatingBackground(item, counter);
counter++;
}
};
add(pathsView);
+ }
- // close repository
- r.close();
-
- // footer
- addFooter();
+ @Override
+ protected String getPageName() {
+ return getString("gb.tree");
}
}
--
Gitblit v1.9.1