Changeset 17975 in josm for trunk/src/org

Timestamp:

2021-07-10T15:25:54+02:00 (4 years ago)

Author:

Don-vip

Message:

fix #21090 - fix #20695 - shutdown precache tileloader only when all tiles have been loaded

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/TMSCachedTileLoader.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -165 +165 @@
     public void shutdown() {
         if (!downloadExecutor.equals(DEFAULT_DOWNLOAD_JOB_DISPATCHER)) {
+            cancelOutstandingTasks();
             downloadExecutor.shutdown();
         }

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

@@ -1829 +1829 @@
     /**
      * Task responsible for precaching imagery along the gpx track
-     *
+     * @since 8526
      */
     public class PrecacheTask implements TileLoaderListener {
@@ -1850 +1850 @@
             if (this.tileLoader instanceof TMSCachedTileLoader) {
                 ((TMSCachedTileLoader) this.tileLoader).setDownloadExecutor(
-                        TMSCachedTileLoader.getNewThreadPoolExecutor("Precache downloader"));
+                        TMSCachedTileLoader.getNewThreadPoolExecutor("precache-downloader-%d"));
             }
             requestedTiles = new ConcurrentSkipListSet<>(
@@ -1874 +1874 @@
             this.totalCount = requestedTiles.size();
             this.progressMonitor.setTicksCount(requestedTiles.size());
-
         }
 
@@ -1897 +1896 @@
          */
         public void cancel() {
-            if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
-                cachedTileLoader.cancelOutstandingTasks();
-                cachedTileLoader.shutdown();
-            }
+            shutdownTmsTileLoader();
         }
 
@@ -1917 +1912 @@
                 Logging.warn("Tile loading failure: " + tile + " - " + tile.getErrorMessage());
             }
+            if (isFinished()) {
+                shutdownTmsTileLoader();
+            }
+        }
+
+        private void shutdownTmsTileLoader() {
             if (tileLoader instanceof TMSCachedTileLoader) {
-                TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
-                cachedTileLoader.cancelOutstandingTasks();
-                cachedTileLoader.shutdown();
-            }
-        }
-
-        /**
-         * Returns tile loader that is used to load the tiles.
-         * @return tile loader that is used to load the tiles
-         */
-        public TileLoader getTileLoader() {
-            return tileLoader;
+                ((TMSCachedTileLoader) tileLoader).shutdown();
+            }
         }
 
@@ -1936 +1927 @@
          */
         public void run() {
-            TileLoader loader = getTileLoader();
             for (Tile t: requestedTiles) {
                 if (!progressMonitor.isCanceled()) {
-                    loader.createTileLoaderJob(t).submit();
-                }
-            }
-
+                    tileLoader.createTileLoaderJob(t).submit();
+                }
+            }
         }
     }
@@ -1993 +1982 @@
         adjustAction.destroy();
         if (tileLoader instanceof TMSCachedTileLoader) {
-            TMSCachedTileLoader cachedTileLoader = (TMSCachedTileLoader) tileLoader;
-            cachedTileLoader.shutdown();
+            ((TMSCachedTileLoader) tileLoader).shutdown();
         }
     }