Changeset 10990 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

Timestamp:

2016-09-10T21:27:19+02:00 (8 years ago)

Author:

wiktorn

Message:

Small refactor of WMS TileSource

• Introduce AbstractWMSTileSource, which will be a base class for WMSEndpointTileSource
• remove getHeaders() from WMSLayer, super method is already good enough

File:

• trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -20 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
+import org.openstreetmap.josm.data.imagery.AbstractWMSTileSource;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -36 +36 @@
  *
  */
-public class WMSLayer extends AbstractCachedTileSourceLayer<TemplatedWMSTileSource> {
+public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSource> {
     private static final String PREFERENCE_PREFIX = "imagery.wms";
     /**
@@ -81 +81 @@
 
     @Override
-    protected TemplatedWMSTileSource getTileSource(ImageryInfo info) {
+    protected AbstractWMSTileSource getTileSource(ImageryInfo info) {
         if (info.getImageryType() == ImageryType.WMS && info.getUrl() != null) {
             TemplatedWMSTileSource.checkUrl(info.getUrl());
-            TemplatedWMSTileSource tileSource = new TemplatedWMSTileSource(info);
+            AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(info);
             info.setAttribution(tileSource);
             return tileSource;
@@ -108 +108 @@
             ImageryLayerInfo.addLayer(new ImageryInfo(info));
         }
-    }
-
-    @Override
-    protected Map<String, String> getHeaders(TemplatedWMSTileSource tileSource) {
-        return tileSource.getHeaders();
     }