Changeset 29769 in osm for applications/editors/josm/plugins/imagerycache

Timestamp:

2013-07-24T18:01:58+02:00 (12 years ago)

Author:

akks

Message:

[josm_utilsplugin2. josm_commandline, josm_livegps, josm_reverter, josm_opendata, josm_videomapping]:
rearrange menu items and change menu accelerators, add Netbeans projects, fix some syntax warnings

Location:

applications/editors/josm/plugins/imagerycache

Files:

• nbproject/project.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java (modified) (2 diffs)

applications/editors/josm/plugins/imagerycache/nbproject/project.xml

@@ -17 +17 @@
                 </source-folder>
                 <source-folder>
-                    <label>src</label>
-                    <type>java</type>
-                    <location>src</location>
-                    <encoding>UTF-8</encoding>
+                    <label>F:\Java\josm\core\src</label>
+                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
                 <source-folder>
@@ -27 +25 @@
                     <location>F:\Java\josm\core\src</location>
                     <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
-                    <label>F:\Java\josm\core\src</label>
-                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
             </folders>
@@ -54 +48 @@
                 <items>
                     <source-folder style="packages">
-                        <label>src</label>
-                        <location>src</location>
-                    </source-folder>
-                    <source-folder style="packages">
                         <label>F:\Java\josm\core\src</label>
                         <location>F:\Java\josm\core\src</location>
@@ -77 +67 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
-                <package-root>src</package-root>
+                <package-root>F:\Java\josm\core\src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
-            </compilation-unit>
-            <compilation-unit>
-                <package-root>F:\Java\josm\core\src</package-root>
                 <source-level>1.6</source-level>
             </compilation-unit>

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java

@@ -14 +14 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
@@ -24 +26 @@
  * @author Alexei Kasatkin, based on OsmFileCacheTileLoader by @author Jan Peter Stotz, @author Stefan Zeller
  */
-class OsmDBTilesLoader extends OsmTileLoader {
+class OsmDBTilesLoader extends OsmTileLoader implements CachedTileLoader {
     
     
@@ -49 +51 @@
     }
 
+    @Override
+    public void clearCache(TileSource source) {
+        clearCache(source, null);
+    }
+
+    @Override
+    public void clearCache(TileSource source, TileClearController controller) {
+        dao.cleanStorage(source.getName());
+    }
+    
     protected class DatabaseLoadJob implements TileJob {
 

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java

@@ -6 +6 @@
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 
@@ -186 +187 @@
     }
 
+    public void cleanStorage(String name) {
+        Main.info("Cleaning storage: {0}", name);
+        dbs.get(name).close();
+        for (int t=0; t<20; t++) {
+            try {
+                String fname = getDBFileName(name, t);
+                File f = new File(cacheFolder, fname);
+                if (!f.exists() || !f.canWrite()) continue;
+                f.delete();
+            } catch (Exception e) {
+                Main.warn("Can not delete file");
+            }
+        }
+    }
 }