Changeset 8338 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

Timestamp:

2015-05-07T01:27:41+02:00 (9 years ago)

Author:

Don-vip

Message:

fix squid:S1319 - Declarations should use Java collection interfaces rather than specific implementation classes

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetItems.java

@@ -30 +30 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -81 +83 @@
 
     // cache the parsing of types using a LRU cache (http://java-planet.blogspot.com/2005/08/how-to-set-up-simple-lru-cache-using.html)
-    private static final Map<String,EnumSet<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
+    private static final Map<String,Set<TaggingPresetType>> TYPE_CACHE = new LinkedHashMap<>(16, 1.1f, true);
 
     /**
@@ -167 +169 @@
 
     public static class Role {
-        public EnumSet<TaggingPresetType> types;
+        public Set<TaggingPresetType> types;
         public String key;
         /** The text to display */
@@ -290 +292 @@
 
     public static class Usage {
-        private TreeSet<String> values;
+        private SortedSet<String> values;
         private boolean hadKeys = false;
         private boolean hadEmpty = false;
@@ -1396 +1398 @@
             } else {
                 String s = o.toString();
-                TreeSet<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
+                Set<String> parts = new TreeSet<>(Arrays.asList(s.split(delimiter)));
                 ListModel<PresetListEntry> lm = getModel();
                 int[] intParts = new int[lm.getSize()];
@@ -1429 +1431 @@
     }
 
-    public static EnumSet<TaggingPresetType> getType(String types) throws SAXException {
+    public static Set<TaggingPresetType> getType(String types) throws SAXException {
         if (TYPE_CACHE.containsKey(types))
             return TYPE_CACHE.get(types);
-        EnumSet<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
+        Set<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
         for (String type : Arrays.asList(types.split(","))) {
             try {