Changeset 32051 in osm for applications/viewer/jmapviewer

Timestamp:

2016-02-07T23:59:37+01:00 (9 years ago)

Author:

bastik

Message:

see #josm12437 - change preference type to MultiMap

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources

Files:

• AbstractTMSTileSource.java (modified) (4 diffs)
• TileSourceInfo.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractTMSTileSource.java

@@ -10 +10 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import org.openstreetmap.gui.jmapviewer.OsmMercator;
@@ -27 +28 @@
     protected String baseUrl;
     protected String id;
-    private final Map<String, List<String>> noTileHeaders;
-    private final Map<String, List<String>> noTileChecksums;
+    private final Map<String, Set<String>> noTileHeaders;
+    private final Map<String, Set<String>> noTileChecksums;
     private final Map<String, String> metadataHeaders;
     protected int tileSize;
@@ -172 +173 @@
     public boolean isNoTileAtZoom(Map<String, List<String>> headers, int statusCode, byte[] content) {
         if (noTileHeaders != null && headers != null) {
-            for (Entry<String, List<String>> searchEntry: noTileHeaders.entrySet()) {
+            for (Entry<String, Set<String>> searchEntry: noTileHeaders.entrySet()) {
                 List<String> headerVals = headers.get(searchEntry.getKey());
                 if (headerVals != null) {
@@ -186 +187 @@
         }
         if (noTileChecksums != null) {
-            for (Entry<String, List<String>> searchEntry: noTileChecksums.entrySet()) {
+            for (Entry<String, Set<String>> searchEntry: noTileChecksums.entrySet()) {
                 MessageDigest md = null;
                 try {

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
-import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
@@ -21 +21 @@
 
     /** headers meaning, that there is no tile at this zoom level */
-    protected Map<String, List<String>> noTileHeaders;
+    protected Map<String, Set<String>> noTileHeaders;
 
     /** checksum of empty tiles */
-    protected Map<String, List<String>> noTileChecksums;
+    protected Map<String, Set<String>> noTileChecksums;
 
     /** minimum zoom level supported by the tile source */
@@ -100 +100 @@
      * @since 32022
      */
-    public Map<String, List<String>> getNoTileHeaders() {
+    public Map<String, Set<String>> getNoTileHeaders() {
         return noTileHeaders;
     }
@@ -109 +109 @@
      * @since 32022
      */
-    public Map<String, List<String>> getNoTileChecksums() {
+    public Map<String, Set<String>> getNoTileChecksums() {
         return noTileChecksums;
     }