Changeset 8863 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation

Timestamp:

2015-10-12T22:58:25+02:00 (10 years ago)

Author:

Don-vip

Message:

major code cleanup/refactoring of tagging presets: slay the monster TaggingPresetItems (60 Kb, 1600 lines) and extract all its internal classes to a new package gui.tagging.presets.items

Location:

trunk/test/unit/org/openstreetmap/josm/data/validation/tests

Files:

• ConditionalKeysTest.groovy (modified) (1 diff)
• OpeningHourTestTest.java (modified) (2 diffs)
• RelationCheckerTest.groovy (modified) (1 diff)
• TagCheckerTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/ConditionalKeysTest.groovy

@@ -3 +3 @@
 
 import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.gui.tagging.TaggingPresets
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 
 class ConditionalKeysTest extends GroovyTestCase {

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.validation.Severity;
-import org.openstreetmap.josm.gui.tagging.TaggingPreset;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItem;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetItem;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
+import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
 
 /**
@@ -213 +213 @@
         for (final TaggingPreset p : presets) {
             for (final TaggingPresetItem i : p.data) {
-                if (i instanceof TaggingPresetItems.KeyedItem &&
-                        Arrays.asList("opening_hours", "service_times", "collection_times").contains(((TaggingPresetItems.KeyedItem) i).key)) {
-                    for (final String v : ((TaggingPresetItems.KeyedItem) i).getValues()) {
-                        values.add(new Tag(((TaggingPresetItems.KeyedItem) i).key, v));
+                if (i instanceof KeyedItem &&
+                        Arrays.asList("opening_hours", "service_times", "collection_times").contains(((KeyedItem) i).key)) {
+                    for (final String v : ((KeyedItem) i).getValues()) {
+                        values.add(new Tag(((KeyedItem) i).key, v));
                     }
                 }

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.groovy

@@ -9 +9 @@
 import org.openstreetmap.josm.data.osm.Way
 import org.openstreetmap.josm.data.validation.TestError
-import org.openstreetmap.josm.gui.tagging.TaggingPresets
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 
 class RelationCheckerTest extends GroovyTestCase {

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.gui.tagging.TaggingPresets;
+import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 
 /**