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

Timestamp:

2007-08-13T03:17:03+02:00 (17 years ago)

Author:

frsantos

Message:

Fix retrieval of tests

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java (modified) (3 diffs)

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

@@ -131 +131 @@
         public static Collection<Test> getTests(boolean enabled, boolean enabledBeforeUpload)
         {
+                Set<Test> tests = new HashSet<Test>();
                 Map<String, Test> enabledTests = new LinkedHashMap<String, Test>();
                 for(Class<Test> testClass : getAllAvailableTests() )
@@ -155 +156 @@
                         {
                                 test.enabled = Boolean.valueOf(m.group(2));
+                                if( enabled && test.enabled )
+                                        tests.add(test );
                         }
                         pos = m.end();
@@ -168 +171 @@
                         {
                                 test.testBeforeUpload = Boolean.valueOf(m.group(2));
-                                if( !enabled && test.enabled || !enabledBeforeUpload && test.testBeforeUpload)
-                                        enabledTests.remove(test.getClass().getSimpleName() );
+                                if( enabledBeforeUpload && test.testBeforeUpload)
+                                        tests.add(test );
                         }
                         pos = m.end();
                 }
                 
-                return enabledTests.values();
+                return tests;
         }