Changeset 6472 in josm

Timestamp:

2013-12-11T20:56:11+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9417 - Validator tests are initialized trice

File:

• trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -63 +63 @@
 
 /**
- *
- * A OSM data validator
+ * A OSM data validator.
  *
  * @author Francisco R. Santos <frsantos@gmail.com>
@@ -117 +116 @@
         OpeningHourTest.class // 2901 .. 2999
     };
+    
+    private static Map<String, Test> allTestsMap;
+    static {
+        allTestsMap = new HashMap<String, Test>();
+        for (Class<Test> testClass : allAvailableTests) {
+            try {
+                allTestsMap.put(testClass.getSimpleName(), testClass.newInstance());
+            } catch (Exception e) {
+                Main.error(e);
+                continue;
+            }
+        }
+    }
 
     /**
@@ -133 +145 @@
      * @return The directory of the plugin
      */
-    public static String getValidatorDir()
-    {
+    public static String getValidatorDir() {
         return Main.pref.getPreferencesDir() + "validator/";
     }
@@ -202 +213 @@
     }
 
-    /** Gets a map from simple names to all tests. */
+    /** 
+     * Gets a map from simple names to all tests. 
+     * @return A map of all tests, indexed by the simple name of their Java class 
+     */
     public static Map<String, Test> getAllTestsMap() {
-        Map<String, Test> tests = new HashMap<String, Test>();
-        for (Class<Test> testClass : allAvailableTests) {
-            try {
-                Test test = testClass.newInstance();
-                tests.put(testClass.getSimpleName(), test);
-            } catch (Exception e) {
-                e.printStackTrace();
-                continue;
-            }
-        }
-        applyPrefs(tests, false);
-        applyPrefs(tests, true);
-        return tests;
+        applyPrefs(allTestsMap, false);
+        applyPrefs(allTestsMap, true);
+        return new HashMap<String, Test>(allTestsMap);
     }