Changeset 4866 in osm for applications/editors/josm/plugins/validator/src/org

Timestamp:

2007-10-07T20:55:36+02:00 (17 years ago)

Author:

gabriel

Message:

validator: Show all tests in the pref dialog, even if they're not in the prefs.

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• OSMValidatorPlugin.java (modified) (3 diffs)
• PreferenceEditor.java (modified) (1 diff)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java

@@ -62 +62 @@
         {
                 PreferenceEditor.importOldPreferences();
-        initializeTests( getTests(true, true) );
+        initializeTests( getAllTests() );
         }
         
@@ -119 +119 @@
                 return (OSMValidatorPlugin)Util.getPlugin(OSMValidatorPlugin.class);
         }
-        
+
+        /** Gets a map from simple names to all tests. */
+        public static Map<String, Test> getAllTestsMap() {
+                Map<String, Test> tests = new HashMap<String, Test>();
+                for(Class<Test> testClass : getAllAvailableTests() )
+                {
+                        try {
+                                Test test = testClass.newInstance();
+                                tests.put(testClass.getSimpleName(), test);
+                        }
+                        catch( Exception e)
+                        {
+                                e.printStackTrace();
+                                continue;
+                        }
+                }
+                return tests;
+        }
+
+        /** Gets a collection of all tests. */
+        public static Collection<Test> getAllTests() {
+                return getAllTestsMap().values();
+        }
+
         /**
          * Gets a collection with the available tests
@@ -130 +153 @@
         {
                 Set<Test> tests = new HashSet<Test>();
-                Map<String, Test> enabledTests = new LinkedHashMap<String, Test>();
-                for(Class<Test> testClass : getAllAvailableTests() )
-                {
-                        try {
-                                Test test = testClass.newInstance();
-                                enabledTests.put(testClass.getSimpleName(), test);
-                        }
-                        catch( Exception e)
-                        {
-                                e.printStackTrace();
-                                continue;
-                        }
-                }
+                Map<String, Test> enabledTests = getAllTestsMap();
 
                 Pattern regexp = Pattern.compile("(\\w+)=(true|false),?");

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java

@@ -47 +47 @@
         testPanel.add( new JLabel("On upload"), GBC.eop() );
         
-                allTests = OSMValidatorPlugin.getTests(true, true);
+                allTests = OSMValidatorPlugin.getAllTests();
                 for(Test test: allTests) 
                 {