Changeset 8863 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

Timestamp:

2015-10-12T22:58:25+02:00 (9 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/src/org/openstreetmap/josm/gui/tagging/presets

Files:

• . (added)
• TaggingPresetSelector.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSelector.java ) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.tagging;
+package org.openstreetmap.josm.gui.tagging.presets;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -49 +49 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Key;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.KeyedItem;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Role;
-import org.openstreetmap.josm.gui.tagging.TaggingPresetItems.Roles;
+import org.openstreetmap.josm.gui.tagging.presets.items.ComboMultiSelect;
+import org.openstreetmap.josm.gui.tagging.presets.items.Key;
+import org.openstreetmap.josm.gui.tagging.presets.items.KeyedItem;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
+import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -125 +126 @@
      * Computes the match ration of a {@link TaggingPreset} wrt. a searchString.
      */
-    static class PresetClassification implements Comparable<PresetClassification> {
+    public static class PresetClassification implements Comparable<PresetClassification> {
         public final TaggingPreset preset;
         public int classification;
@@ -144 +145 @@
                 if (item instanceof KeyedItem) {
                     tags.add(((KeyedItem) item).key);
-                    if (item instanceof TaggingPresetItems.ComboMultiSelect) {
-                        final TaggingPresetItems.ComboMultiSelect cms = (TaggingPresetItems.ComboMultiSelect) item;
+                    if (item instanceof ComboMultiSelect) {
+                        final ComboMultiSelect cms = (ComboMultiSelect) item;
                         if (Boolean.parseBoolean(cms.values_searchable)) {
                             tags.addAll(cms.getDisplayValues());
@@ -366 +367 @@
      * A collection of {@link PresetClassification}s with the functionality of filtering wrt. searchString.
      */
-    static class PresetClassifications implements Iterable<PresetClassification> {
+    public static class PresetClassifications implements Iterable<PresetClassification> {
 
         private final List<PresetClassification> classifications = new ArrayList<>();