Changeset 9755 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2016-02-08T00:01:48+01:00 (10 years ago)

Author:

bastiK

Message:

add preference type MultiMap (closes #12437)

File:

• trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -23 +23 @@
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
 import org.xml.sax.Attributes;
@@ -99 +100 @@
         private String lang;
         private List<String> projections;
-        private Map<String, List<String>> noTileHeaders;
-        private Map<String, List<String>> noTileChecksums;
+        private MultiMap<String, String> noTileHeaders;
+        private MultiMap<String, String> noTileChecksums;
         private Map<String, String> metadataHeaders;
 
@@ -132 +133 @@
                     skipEntry = false;
                     newState = State.ENTRY;
-                    noTileHeaders = new HashMap<>();
-                    noTileChecksums = new HashMap<>();
+                    noTileHeaders = new MultiMap<>();
+                    noTileChecksums = new MultiMap<>();
                     metadataHeaders = new HashMap<>();
                 }
@@ -196 +197 @@
                     mirrorEntry = new ImageryInfo();
                 } else if ("no-tile-header".equals(qName)) {
-                    String name = atts.getValue("name");
-                    List<String> l;
-                    if (noTileHeaders.containsKey(name)) {
-                        l = noTileHeaders.get(name);
-                    } else {
-                        l = new ArrayList<String>();
-                        noTileHeaders.put(atts.getValue("name"), l);
-                    }
-                    l.add(atts.getValue("value"));
+                    noTileHeaders.put(atts.getValue("name"), atts.getValue("value"));
                     newState = State.NO_TILE;
                 } else if ("no-tile-checksum".equals(qName)) {
                     String type = atts.getValue("type");
-                    List<String> l;
-                    if (noTileChecksums.containsKey(type)) {
-                        l = noTileChecksums.get(type);
-                    } else {
-                        l = new ArrayList<String>();
-                        noTileChecksums.put(type, l);
-                    }
-                    l.add(atts.getValue("value"));
+                    noTileChecksums.put(atts.getValue("type"), atts.getValue("value"));
                     newState = State.NO_TILESUM;
                 } else if ("metadata-header".equals(qName)) {