Changeset 9860 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx

Timestamp:

2016-02-23T20:39:21+01:00 (8 years ago)

Author:

wiktorn

Message:

Tile Source class as a Generic Type to AbstractTileSourceLayer

Provide tile source class as a Generic Type to AbstractTileSourceLayer to reduce
the number of necessary casts.

File:

• trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java

@@ -16 +16 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractMergeAction.LayerListCellRenderer;
@@ -26 +27 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
-import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer.PrecacheTask;
 import org.openstreetmap.josm.gui.progress.ProgressTaskId;
 import org.openstreetmap.josm.gui.progress.ProgressTaskIds;
@@ -53 +53 @@
     static class PrecacheWmsTask extends PleaseWaitRunnable {
 
-        private final AbstractTileSourceLayer layer;
+        private final AbstractTileSourceLayer<? extends AbstractTMSTileSource> layer;
         private final List<LatLon> points;
-        private PrecacheTask precacheTask;
+        private AbstractTileSourceLayer<? extends AbstractTMSTileSource>.PrecacheTask precacheTask;
 
-        protected PrecacheWmsTask(AbstractTileSourceLayer layer, List<LatLon> points) {
+        protected PrecacheWmsTask(AbstractTileSourceLayer<? extends AbstractTMSTileSource> layer, List<LatLon> points) {
             super(tr("Precaching WMS"));
             this.layer = layer;
@@ -65 +65 @@
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
-            precacheTask = layer.new PrecacheTask(progressMonitor);
-            layer.downloadAreaToCache(precacheTask, points, 0, 0);
+            precacheTask = layer.downloadAreaToCache(progressMonitor, points, 0, 0);
             while (!precacheTask.isFinished() && !progressMonitor.isCanceled()) {
                 synchronized (this) {
@@ -106 +105 @@
             points.add(p.getCoor());
         }
-        AbstractTileSourceLayer layer = askedLayer();
+        AbstractTileSourceLayer<? extends AbstractTMSTileSource> layer = askedLayer();
         return layer != null ? new PrecacheWmsTask(layer, points) : null;
     }
@@ -118 +117 @@
     }
 
-    protected AbstractTileSourceLayer askedLayer() {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    protected AbstractTileSourceLayer<? extends AbstractTMSTileSource> askedLayer() {
         if (!Main.isDisplayingMapView()) {
             return null;