From 84c1d5c1527183a4e2830deab5b177d880914f1c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 22 Oct 2011 09:01:20 -0400
Subject: [PATCH] Documentation. Refactoring class names. Re-encapsulate settings.
---
src/com/gitblit/client/EditUserDialog.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/client/EditUserDialog.java b/src/com/gitblit/client/EditUserDialog.java
index 0a1ddd9..988f8fb 100644
--- a/src/com/gitblit/client/EditUserDialog.java
+++ b/src/com/gitblit/client/EditUserDialog.java
@@ -29,7 +29,6 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.swing.ImageIcon;
@@ -48,7 +47,7 @@
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Keys;
import com.gitblit.models.RepositoryModel;
-import com.gitblit.models.SettingModel;
+import com.gitblit.models.ServerSettings;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -58,10 +57,10 @@
private final UserModel user;
- private final Map<String, SettingModel> settings;
+ private final ServerSettings settings;
private boolean isCreate;
-
+
private boolean canceled = true;
private JTextField usernameField;
@@ -78,13 +77,13 @@
private Set<String> usernames;
- public EditUserDialog(Map<String, SettingModel> settings) {
+ public EditUserDialog(ServerSettings settings) {
this(new UserModel(""), settings);
this.isCreate = true;
- setTitle(Translation.get("gb.newUser"));
+ setTitle(Translation.get("gb.newUser"));
}
- public EditUserDialog(UserModel anUser, Map<String, SettingModel> settings) {
+ public EditUserDialog(UserModel anUser, ServerSettings settings) {
super();
this.user = new UserModel("");
this.settings = settings;
@@ -95,7 +94,7 @@
setTitle(Translation.get("gb.edit") + ": " + anUser.username);
setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());
}
-
+
@Override
protected JRootPane createRootPane() {
KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
@@ -203,8 +202,8 @@
}
char[] pw = passwordField.getPassword();
if (pw == null || pw.length < minLength) {
- error(MessageFormat.format(
- "Password is too short. Minimum length is {0} characters.", minLength));
+ error(MessageFormat.format("Password is too short. Minimum length is {0} characters.",
+ minLength));
return false;
}
char[] cpw = confirmPasswordField.getPassword();
--
Gitblit v1.9.1