Changeset 31540 in osm

Timestamp:

2015-09-08T21:49:43+02:00 (9 years ago)

Author:

wiktorn

Message:

Remove org.openstreetmap.gui.jmapviewer.JobDispatcher as it is not use anymore. Addresses: #josm11840

Location:

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

Files:

• JMapViewer.java (modified) (2 diffs)
• JobDispatcher.java (deleted)
• OsmTileLoader.java (modified) (1 diff)
• TileController.java (modified) (3 diffs)
• interfaces/TileLoader.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -103 +103 @@
      */
     public JMapViewer() {
-        this(new MemoryTileCache(), 8);
+        this(new MemoryTileCache());
         new DefaultMapController(this);
     }
@@ -110 +110 @@
      * Creates a new {@link JMapViewer} instance.
      * @param tileCache The cache where to store tiles
-     * @param downloadThreadCount The number of parallel threads for retrieving the tiles
-     */
+     * @depraceted @param downloadThreadCount not used anymore
+     */
+    @Deprecated
     public JMapViewer(TileCache tileCache, int downloadThreadCount) {
-        JobDispatcher.setMaxWorkers(downloadThreadCount);
+        this(tileCache);
+    }
+
+    /**
+     * Creates a new {@link JMapViewer} instance.
+     * @param tileCache The cache where to store tiles
+     *
+     */
+    public JMapViewer(TileCache tileCache) {
         tileSource = new OsmTileSource.Mapnik();
         tileController = new TileController(tileSource, tileCache, this);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/OsmTileLoader.java

@@ -178 +178 @@
         return getClass().getSimpleName();
     }
+
+    @Override
+    public void cancelOutstandingTasks() {
+        // intentionally left empty - OsmTileLoader doesn't maintain queue
+    }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/TileController.java

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer;
 
-import org.openstreetmap.gui.jmapviewer.JobDispatcher.JobThread;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -13 +12 @@
     protected TileSource tileSource;
 
-    protected JobDispatcher jobDispatcher;
-
     public TileController(TileSource source, TileCache tileCache, TileLoaderListener listener) {
         this.tileSource = source;
         this.tileLoader = new OsmTileLoader(listener);
         this.tileCache = tileCache;
-        this.jobDispatcher = JobDispatcher.getInstance();
     }
 
@@ -81 +77 @@
     /**
      * Removes all jobs from the queue that are currently not being processed.
+     *
      */
     public void cancelOutstandingJobs() {
-        jobDispatcher.cancelOutstandingJobs();
+        tileLoader.cancelOutstandingTasks();
     }
 }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileLoader.java

@@ -21 +21 @@
      */
     TileJob createTileLoaderJob(Tile tile);
+
+    /**
+     * cancels all outstanding tasks in the queue. This should rollback the state of the tiles in the queue
+     * to loading = false / loaded = false
+     */
+    void cancelOutstandingTasks();
 }