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/EditUserPage.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
index 93230c2..6838c19 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditUserPage.java
@@ -51,7 +51,7 @@
public class EditUserPage extends RootSubPage {
private final boolean isCreate;
-
+
public EditUserPage() {
// create constructor
super();
@@ -75,12 +75,12 @@
setStatelessHint(false);
setOutputMarkupId(true);
}
-
+
@Override
protected boolean requiresPageMap() {
return true;
}
-
+
@Override
protected Class<? extends BasePage> getRootNavPageClass() {
return UsersPage.class;
@@ -99,13 +99,13 @@
// build list of projects including all repositories wildcards
List<String> repos = getAccessRestrictedRepositoryList(true, userModel);
-
+
List<String> userTeams = new ArrayList<String>();
for (TeamModel team : userModel.teams) {
userTeams.add(team.name);
}
Collections.sort(userTeams);
-
+
final String oldName = userModel.username;
final List<RegistrantAccessPermission> permissions = GitBlit.self().getUserAccessPermissions(userModel);
@@ -115,10 +115,10 @@
Form<UserModel> form = new Form<UserModel>("editForm", model) {
private static final long serialVersionUID = 1L;
-
+
/*
* (non-Javadoc)
- *
+ *
* @see org.apache.wicket.markup.html.form.Form#onSubmit()
*/
@Override
@@ -158,7 +158,7 @@
minLength));
return;
}
-
+
// Optionally store the password MD5 digest.
String type = GitBlit.getString(Keys.realm.passwordStorage, "md5");
if (type.equalsIgnoreCase("md5")) {
@@ -192,7 +192,7 @@
userModel.teams.add(team);
}
- try {
+ try {
GitBlit.self().updateUserModel(oldName, userModel, isCreate);
} catch (GitBlitException e) {
error(e.getMessage());
@@ -210,13 +210,13 @@
}
}
};
-
+
// do not let the browser pre-populate these fields
form.add(new SimpleAttributeModifier("autocomplete", "off"));
-
+
// not all user services support manipulating username and password
boolean editCredentials = GitBlit.self().supportsCredentialChanges(userModel);
-
+
// not all user services support manipulating display name
boolean editDisplayName = GitBlit.self().supportsDisplayNameChanges(userModel);
--
Gitblit v1.9.1