Changeset 9860 in josm for trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

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/AbstractTileSourceLayer.java (modified) (10 diffs)

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

@@ -95 +95 @@
  * @author Upliner
  * @author Wiktor Niesiobędzki
+ * @param <T> Tile Source class used for this layer
  * @since 3715
  * @since 8526 (copied from TMSLayer)
  */
-public abstract class AbstractTileSourceLayer extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
+public abstract class AbstractTileSourceLayer<T extends AbstractTMSTileSource> extends ImageryLayer implements ImageObserver, TileLoaderListener, ZoomChangeListener {
     private static final String PREFERENCE_PREFIX = "imagery.generic";
 
@@ -151 +152 @@
      */
     protected TileCache tileCache; // initialized together with tileSource
-    protected AbstractTMSTileSource tileSource;
+    protected T tileSource;
     protected TileLoader tileLoader;
 
@@ -173 +174 @@
      * @throws IllegalArgumentException when Imagery is not supported by layer
      */
-    protected abstract AbstractTMSTileSource getTileSource(ImageryInfo info);
-
-    protected Map<String, String> getHeaders(TileSource tileSource) {
+    protected abstract T getTileSource(ImageryInfo info);
+
+    protected Map<String, String> getHeaders(T tileSource) {
         if (tileSource instanceof TemplatedTileSource) {
             return ((TemplatedTileSource) tileSource).getHeaders();
@@ -182 +183 @@
     }
 
-    protected void initTileSource(AbstractTMSTileSource tileSource) {
+    protected void initTileSource(T tileSource) {
         attribution.initialize(tileSource);
 
@@ -1180 +1181 @@
 
     private final TileSet nullTileSet = new TileSet((LatLon) null, (LatLon) null, 0);
+
     private final class TileSet {
         int x0, x1, y0, y1;
@@ -1349 +1351 @@
     }
 
-    private static TileSetInfo getTileSetInfo(TileSet ts) {
+    private static <S extends AbstractTMSTileSource> TileSetInfo getTileSetInfo(AbstractTileSourceLayer<S>.TileSet ts) {
         List<Tile> allTiles = ts.allExistingTiles();
         TileSetInfo result = new TileSetInfo();
@@ -1374 +1376 @@
         private final TileSet[] tileSets;
         private final TileSetInfo[] tileSetInfos;
+
+        @SuppressWarnings("unchecked")
         DeepTileSet(EastNorth topLeft, EastNorth botRight, int minZoom, int maxZoom) {
             this.topLeft = topLeft;
@@ -1379 +1383 @@
             this.minZoom = minZoom;
             this.maxZoom = maxZoom;
-            this.tileSets = new TileSet[maxZoom - minZoom + 1];
+            this.tileSets = new AbstractTileSourceLayer.TileSet[maxZoom - minZoom + 1];
             this.tileSetInfos = new TileSetInfo[maxZoom - minZoom + 1];
         }
@@ -1742 +1746 @@
      * To prevent accidental clear of the queue, new download executor is created with separate queue
      *
-     * @param precacheTask Task responsible for precaching imagery
+     * @param progressMonitor Task responsible for precaching imagery
      * @param points lat/lon coordinates to download
      * @param bufferX how many units in current Coordinate Reference System to cover in X axis in both sides
      * @param bufferY how many units in current Coordinate Reference System to cover in Y axis in both sides
-     */
-    public void downloadAreaToCache(final PrecacheTask precacheTask, List<LatLon> points, double bufferX, double bufferY) {
+     * @return
+     */
+    public AbstractTileSourceLayer<T>.PrecacheTask downloadAreaToCache(final ProgressMonitor progressMonitor, List<LatLon> points, double bufferX, double bufferY) {
+        PrecacheTask precacheTask = new PrecacheTask(progressMonitor);
         final Set<Tile> requestedTiles = new ConcurrentSkipListSet<>(new Comparator<Tile>() {
             @Override
@@ -1780 +1786 @@
             loader.createTileLoaderJob(t).submit();
         }
+        return precacheTask;
     }