From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
index d4ce442..f6c0e4f 100644
--- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
+++ b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
@@ -25,7 +25,6 @@
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.TreePage;
@@ -33,9 +32,10 @@
private static final long serialVersionUID = 1L;
- private final String ROOT = "--ROOT--";
+ private static final String ROOT = "--ROOT--";
- public PathBreadcrumbsPanel(String id, final String repositoryName, String pathName, final String objectId) {
+ public PathBreadcrumbsPanel(String id, final String repositoryName, String pathName,
+ final String objectId) {
super(id);
List<BreadCrumb> crumbs = new ArrayList<BreadCrumb>();
crumbs.add(new BreadCrumb("[" + repositoryName + "]", ROOT, false));
@@ -47,8 +47,8 @@
for (int i = 0; i < paths.length; i++) {
String path = paths[i];
sb.append(path);
- crumbs.add(new BreadCrumb(path, sb.toString(), (i == (paths.length - 1))));
- sb.append("/");
+ crumbs.add(new BreadCrumb(path, sb.toString(), i == (paths.length - 1)));
+ sb.append('/');
}
}
@@ -58,12 +58,16 @@
public void populateItem(final Item<BreadCrumb> item) {
final BreadCrumb entry = item.getModelObject();
- String path = entry.getPath();
+ String path = entry.path;
+ if (path.equals(ROOT)) {
+ path = null;
+ }
if (entry.isLeaf) {
item.add(new Label("pathLink", entry.name));
item.add(new Label("pathSeparator", "").setVisible(false));
} else {
- item.add(new LinkPanel("pathLink", null, entry.name, TreePage.class, WicketUtils.newPathParameter(repositoryName, objectId, path)));
+ item.add(new LinkPanel("pathLink", null, entry.name, TreePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, path)));
item.add(new Label("pathSeparator", "/"));
}
}
@@ -71,7 +75,7 @@
add(pathsView);
}
- private class BreadCrumb implements Serializable {
+ private static class BreadCrumb implements Serializable {
private static final long serialVersionUID = 1L;
@@ -83,13 +87,6 @@
this.name = name;
this.path = path;
this.isLeaf = isLeaf;
- }
-
- String getPath() {
- if (path.equals(ROOT)) {
- return null;
- }
- return path;
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1