From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001
From: Mohamed Ragab <moragab@gmail.com>
Date: Wed, 02 May 2012 11:15:01 -0400
Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command
---
src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
index 974fb9a..f6c0e4f 100644
--- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
+++ b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.panels;
import java.io.Serializable;
@@ -10,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;
@@ -18,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));
@@ -32,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('/');
}
}
@@ -43,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", "/"));
}
}
@@ -56,7 +75,7 @@
add(pathsView);
}
- private class BreadCrumb implements Serializable {
+ private static class BreadCrumb implements Serializable {
private static final long serialVersionUID = 1L;
@@ -68,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