Changeset 16690 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

Timestamp:

2020-06-21T09:54:52+02:00 (4 years ago)

Author:

simon04

Message:

Extract PresetListEntry class

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java (modified) (4 diffs)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.tagging.presets.items.Optional;
 import org.openstreetmap.josm.gui.tagging.presets.items.PresetLink;
+import org.openstreetmap.josm.gui.tagging.presets.items.PresetListEntry;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles;
 import org.openstreetmap.josm.gui.tagging.presets.items.Roles.Role;
@@ -151 +152 @@
         parser.map("space", Space.class);
         parser.map("key", Key.class);
-        parser.map("list_entry", ComboMultiSelect.PresetListEntry.class);
+        parser.map("list_entry", PresetListEntry.class);
         parser.map("item_separator", ItemSeparator.class);
         parser.mapBoth("chunk", Chunk.class);
@@ -188 +189 @@
         Roles lastrole = null;
         final List<Check> checks = new LinkedList<>();
-        final List<ComboMultiSelect.PresetListEntry> listEntries = new LinkedList<>();
+        final List<PresetListEntry> listEntries = new LinkedList<>();
         final Map<String, List<Object>> byId = new HashMap<>();
         final Deque<String> lastIds = new ArrayDeque<>();
@@ -299 +300 @@
                             all.getLast().data.add((TaggingPresetItem) o);
                         }
-                    } else if (o instanceof ComboMultiSelect.PresetListEntry) {
-                        listEntries.add((ComboMultiSelect.PresetListEntry) o);
+                    } else if (o instanceof PresetListEntry) {
+                        listEntries.add((PresetListEntry) o);
                     } else if (o instanceof CheckGroup) {
                         CheckGroup cg = (CheckGroup) o;