Changeset 29944 in osm

Timestamp:

2013-09-23T19:18:42+02:00 (12 years ago)

Author:

akks

Message:

[JOSM_ImageryCache]: correct database cleaning, at last

Location:

applications/editors/josm/plugins/imagerycache

Files:

• build.xml (modified) (1 diff)
• nbproject/project.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java (modified) (1 diff)

applications/editors/josm/plugins/imagerycache/build.xml

@@ -15 +15 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="JOSM/ImageryCache: add optional imagerycache.randomAccessFile parameter for slower but less system-dependent storage"/>
+    <property name="commit.message" value="[JOSM_ImageryCache]: correct database cleaning, at last"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5779"/>

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

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

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

@@ -189 +189 @@
     public void cleanStorage(String name) {
         Main.info("Cleaning storage: {0}", name);
-        dbs.get(name).close();
-        for (int t=0; t<20; t++) {
-            try {
+        Main.info("There were {0} tiles in it", storages.get(name).size());
+        try {
+            dbs.get(name).close();
+            dbs.remove(name);
+            storages.remove(name);
+            for (int t=0; t<20; t++) {
                 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");
+                f = new File(cacheFolder, fname+".p");
+                if (!f.exists() || !f.canWrite()) continue;
+                f.delete();
+                f = new File(cacheFolder, fname+".lock");
+                if (!f.exists() || !f.canWrite()) continue;
+                f.delete();
             }
-        }
+        } catch (Exception e) { Main.warn("Can not delete file, maybe it is locvked by another JOSM instance. This is not a serious error then."); }
     }
 }