From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:11:28 -0400
Subject: [PATCH] Trim trailing whitespace and organize imports
---
src/main/java/com/gitblit/wicket/pages/RootPage.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index ec4e9b4..a59e202 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -65,9 +65,9 @@
/**
* Root page is a topbar, navigable page like Repositories, Users, or
* Federation.
- *
+ *
* @author James Moger
- *
+ *
*/
public abstract class RootPage extends BasePage {
@@ -92,6 +92,7 @@
add(new HeaderContributor(new IHeaderContributor() {
private static final long serialVersionUID = 1L;
+ @Override
public void renderHead(IHeaderResponse response) {
StringBuilder buffer = new StringBuilder();
buffer.append("<style type=\"text/css\">\n");
@@ -130,7 +131,7 @@
response.renderString(buffer.toString());
}
}));
-
+
boolean authenticateView = GitBlit.getBoolean(Keys.web.authenticateViewPages, false);
boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true);
boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, true);
@@ -149,7 +150,7 @@
setStatelessHint(true);
}
}
-
+
if (authenticateView || authenticateAdmin) {
if (GitBlitWebSession.get().isLoggedIn()) {
UserMenu userFragment = new UserMenu("userPanel", "userMenuFragment", RootPage.this);
@@ -161,7 +162,7 @@
} else {
add(new Label("userPanel").setVisible(false));
}
-
+
boolean showRegistrations = GitBlit.canFederate()
&& GitBlit.getBoolean(Keys.web.showFederationRegistrations, false);
@@ -187,7 +188,7 @@
addDropDownMenus(pages);
}
}
-
+
NavigationPanel navPanel = new NavigationPanel("navPanel", getRootNavPageClass(), pages);
add(navPanel);
@@ -207,7 +208,7 @@
super.setupPage(repositoryName, pageName);
}
-
+
protected Class<? extends BasePage> getRootNavPageClass() {
return getClass();
}
@@ -232,7 +233,7 @@
params.remove("db");
}
return params;
- }
+ }
}
return null;
}
@@ -269,7 +270,7 @@
}
}
}
-
+
protected List<RepositoryModel> getRepositoryModels() {
if (repositoryModels.isEmpty()) {
final UserModel user = GitBlitWebSession.get().getUser();
@@ -359,11 +360,11 @@
} else {
clonedParams = new PageParameters(params);
}
-
+
if (!clonedParams.containsKey("db")) {
clonedParams.put("db", daysBack);
}
-
+
List<DropDownMenuItem> items = new ArrayList<DropDownMenuItem>();
Set<Integer> choicesSet = new TreeSet<Integer>(GitBlit.getIntegers(Keys.web.activityDurationChoices));
if (choicesSet.isEmpty()) {
@@ -420,7 +421,7 @@
if (!StringUtils.isEmpty(projectName)) {
// try named project
- hasParameter = true;
+ hasParameter = true;
if (projectName.equalsIgnoreCase(GitBlit.getString(Keys.web.repositoryRootGroupName, "main"))) {
// root project/group
for (RepositoryModel model : availableModels) {
@@ -511,14 +512,14 @@
}
models = timeFiltered;
}
-
+
List<RepositoryModel> list = new ArrayList<RepositoryModel>(models);
Collections.sort(list);
return list;
}
-
+
/**
- * Inline login form.
+ * Inline login form.
*/
private class LoginForm extends Fragment {
private static final long serialVersionUID = 1L;
@@ -558,7 +559,7 @@
add(loginForm);
}
}
-
+
/**
* Menu for the authenticated user.
*/
@@ -587,12 +588,12 @@
add(new BookmarkablePageLink<Void>("newRepository",
EditRepositoryPage.class).setVisible(user.canAdmin() || user.canCreate()));
- add(new BookmarkablePageLink<Void>("myProfile",
+ add(new BookmarkablePageLink<Void>("myProfile",
UserPage.class, WicketUtils.newUsernameParameter(user.username)));
- add(new BookmarkablePageLink<Void>("changePassword",
+ add(new BookmarkablePageLink<Void>("changePassword",
ChangePasswordPage.class).setVisible(editCredentials));
-
+
add(new BookmarkablePageLink<Void>("logout",
LogoutPage.class).setVisible(standardLogin));
}
--
Gitblit v1.9.1