Changeset 31077 in osm for applications/viewer/jmapviewer/src

Timestamp:

2015-04-06T01:40:38+02:00 (10 years ago)

Author:

bastik

Message:

see #josm11216 - Limit size of TMS cache (patch by wiktorn)

Location:

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

Files:

• Demo.java (modified) (2 diffs)
• JMapViewer.java (modified) (1 diff)
• OsmFileCacheTileLoader.java (deleted)
• OsmTileLoader.java (modified) (1 diff)
• TMSFileCacheTileLoader.java (deleted)
• TileController.java (modified) (1 diff)
• interfaces/CachedTileLoader.java (modified) (1 diff)
• interfaces/TileJob.java (modified) (1 diff)

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

@@ -11 +11 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.io.IOException;
 
 import javax.swing.JButton;
@@ -102 +101 @@
         });
         JComboBox<TileLoader> tileLoaderSelector;
-        try {
-            tileLoaderSelector = new JComboBox<>(new TileLoader[] { new OsmFileCacheTileLoader(map()), new OsmTileLoader(map()) });
-        } catch (IOException e) {
-            tileLoaderSelector = new JComboBox<>(new TileLoader[] { new OsmTileLoader(map()) });
-        }
+        tileLoaderSelector = new JComboBox<>(new TileLoader[] { new OsmTileLoader(map()) });
         tileLoaderSelector.addItemListener(new ItemListener() {
             public void itemStateChanged(ItemEvent e) {

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

@@ -986 +986 @@
 
     public void tileLoadingFinished(Tile tile, boolean success) {
+        tile.setLoaded(success);
         repaint();
     }

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

@@ -86 +86 @@
                 return tile;
             }
+
+            @Override
+            public void submit() {
+                run();
+
+            }
         };
     }

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

@@ -46 +46 @@
         }
         if (!tile.isLoaded()) {
-            jobDispatcher.addJob(tileLoader.createTileLoaderJob(tile));
+            tileLoader.createTileLoaderJob(tile).submit();
         }
         return tile;

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

@@ -6 +6 @@
  */
 public interface CachedTileLoader {
-    public void clearCache(TileSource source);
-    public void clearCache(TileSource source, TileClearController controller);
+    public void clearCache();
 }

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

@@ -18 +18 @@
      */
     public Tile getTile();
+
+    /**
+     * submits download job to backend.
+     */
+    void submit();
 }