Pārlūkot izejas kodu

oh crap, trunk unbreaking from the last commit, issue 1106

git-svn-id: http://svn.dmdirc.com/trunk@3916 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Gregory Holmes 16 gadus atpakaļ
vecāks
revīzija
2f102fd97c

+ 43
- 0
src/com/dmdirc/config/prefs/validator/URLProtocolValidator.java Parādīt failu

@@ -0,0 +1,43 @@
1
+/*
2
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
3
+ *
4
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ * of this software and associated documentation files (the "Software"), to deal
6
+ * in the Software without restriction, including without limitation the rights
7
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ * copies of the Software, and to permit persons to whom the Software is
9
+ * furnished to do so, subject to the following conditions:
10
+ *
11
+ * The above copyright notice and this permission notice shall be included in
12
+ * all copies or substantial portions of the Software.
13
+ *
14
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
20
+ * SOFTWARE.
21
+ */
22
+
23
+package com.dmdirc.config.prefs.validator;
24
+
25
+import com.dmdirc.config.IdentityManager;
26
+
27
+/**
28
+ * Validates URLProtocols.
29
+ */
30
+public class URLProtocolValidator implements Validator<String> {
31
+
32
+    /** {@inheritDoc} */
33
+    @Override
34
+    public ValidationResponse validate(final String object) {
35
+        if (object == null || object.isEmpty()) {
36
+            return new ValidationResponse("Cannot be empty");
37
+        } else if (IdentityManager.getGlobalConfig().hasOption("protocol", object)) {
38
+            return new ValidationResponse("Cannot already exist");
39
+        } else {
40
+            return new ValidationResponse();
41
+        }
42
+    }
43
+}

+ 3
- 22
src/com/dmdirc/ui/swing/dialogs/prefs/URLConfigPanel.java Parādīt failu

@@ -27,13 +27,12 @@ import com.dmdirc.ui.swing.components.renderers.URIHandlerCellRenderer;
27 27
 import com.dmdirc.Main;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.config.prefs.PreferencesInterface;
30
-import com.dmdirc.config.prefs.validator.ValidationResponse;
30
+import com.dmdirc.config.prefs.validator.URLProtocolValidator;
31 31
 import com.dmdirc.ui.swing.MainFrame;
32 32
 import com.dmdirc.ui.swing.components.PackingTable;
33 33
 import com.dmdirc.ui.swing.components.StandardInputDialog;
34 34
 import com.dmdirc.ui.swing.components.URLProtocolPanel;
35 35
 
36
-import com.dmdirc.config.prefs.validator.Validator;
37 36
 import java.awt.event.ActionEvent;
38 37
 import java.awt.event.ActionListener;
39 38
 import java.net.URI;
@@ -89,6 +88,8 @@ public class URLConfigPanel extends JPanel implements ListSelectionListener,
89 88
      * Instantiates a new URL config panel.
90 89
      */
91 90
     public URLConfigPanel() {
91
+        super();
92
+        
92 93
         initComponents();
93 94
         addListeners();
94 95
         layoutComponents();
@@ -292,24 +293,4 @@ public class URLConfigPanel extends JPanel implements ListSelectionListener,
292 293
         }
293 294
     }
294 295
 
295
-    /**
296
-     * Input dialog validator.
297
-     */
298
-    private static class URLProtocolValidator implements Validator<String> {
299
-
300
-        /** {@inheritDoc} */
301
-        @Override
302
-        public ValidationResponse validate(final String object) {
303
-            if (object == null || object.isEmpty()) {
304
-                return new ValidationResponse("Cannot be empty");
305
-            } else if (IdentityManager.getGlobalConfig().hasOption("protocol",
306
-                        object)) {
307
-                return new ValidationResponse("Cannot already exist");
308
-            } else {
309
-                return new ValidationResponse();
310
-            }
311
-        }
312
-
313
-    }
314
-
315 296
 }

Notiek ielāde…
Atcelt
Saglabāt