Преглед изворни кода

Fix PMD + other standard dialogs.

pull/251/head
Greg Holmes пре 9 година
родитељ
комит
4de210e284

+ 2
- 3
ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/StandardInputDialog.java Прегледај датотеку

25
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
25
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
26
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
26
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
27
 import com.dmdirc.ui.IconManager;
27
 import com.dmdirc.ui.IconManager;
28
-import com.dmdirc.util.validators.ValidationResponse;
28
+import com.dmdirc.util.validators.PermissiveValidator;
29
 import com.dmdirc.util.validators.Validator;
29
 import com.dmdirc.util.validators.Validator;
30
 
30
 
31
 import com.google.common.util.concurrent.Runnables;
31
 import com.google.common.util.concurrent.Runnables;
117
             final String title, final String message,
117
             final String title, final String message,
118
             final Function<String, Boolean> save,
118
             final Function<String, Boolean> save,
119
             final Runnable cancel) {
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 Прегледај датотеку

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

Loading…
Откажи
Сачувај