Browse Source

Fix PMD + other standard dialogs.

pull/251/head
Greg Holmes 9 years ago
parent
commit
4de210e284

+ 2
- 3
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.java View File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs;
25 25
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
26 26
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
27 27
 import com.dmdirc.ui.IconManager;
28
-import com.dmdirc.util.validators.ValidationResponse;
28
+import com.dmdirc.util.validators.PermissiveValidator;
29 29
 import com.dmdirc.util.validators.Validator;
30 30
 
31 31
 import com.google.common.util.concurrent.Runnables;
@@ -117,8 +117,7 @@ public class StandardInputDialog extends StandardDialog {
117 117
             final String title, final String message,
118 118
             final Function<String, Boolean> save,
119 119
             final Runnable cancel) {
120
-        this(owner, modal, iconManager, title, message, ValidationResponse::new, save,
121
-                cancel);
120
+        this(owner, modal, iconManager, title, message, new PermissiveValidator<>(), save, cancel);
122 121
     }
123 122
 
124 123
     /**

+ 2
- 0
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/profile/ProfileManagerController.java View File

@@ -136,6 +136,7 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
136 136
                 (String oldName) -> new StandardInputDialog(dialog,
137 137
                         Dialog.ModalityType.DOCUMENT_MODAL, iconManager,
138 138
                         "Profile Manager: Edit Nickname", "Enter new nickname",
139
+                        model.getSelectedProfileEditNicknameValidator(),
139 140
                         (String newName) -> model.editSelectedProfileNickname(oldName, newName))
140 141
                         .display()));
141 142
     }
@@ -145,6 +146,7 @@ public class ProfileManagerController implements ProfilesDialogModelListener {
145 146
         addNickname.addActionListener(
146 147
                 e -> new StandardInputDialog(dialog, Dialog.ModalityType.DOCUMENT_MODAL,
147 148
                         iconManager, "Profile Manager: Add Nickname", "Enter nickname to add",
149
+                        model.getSelectedProfileAddNicknameValidator(),
148 150
                         model::addSelectedProfileNickname).display());
149 151
     }
150 152
 

Loading…
Cancel
Save