Changeset 4812 in josm

Timestamp:

Jan 17, 2012 3:21:50 PM (17 months ago)

Author:

bastiK

Message:

use cache folder for MirroredInputStream as well

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/TagChecker.java (modified) (1 diff)
• io/MirroredInputStream.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -200 +200 @@
         for (String source : sources.split(";")) {
             try {
-                MirroredInputStream s = new MirroredInputStream(source, OsmValidator.getValidatorDir(), -1);
+                MirroredInputStream s = new MirroredInputStream(source);
                 InputStreamReader r;
                 try {

trunk/src/org/openstreetmap/josm/io/MirroredInputStream.java

@@ -24 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -69 +70 @@
                 }
             } else {
-                if(Main.applet) {
+                if (Main.applet) {
                     URLConnection conn = url.openConnection();
                     conn.setConnectTimeout(Main.pref.getInteger("socket.timeout.connect",15)*1000);
@@ -80 +81 @@
             }
         } catch (java.net.MalformedURLException e) {
-            if(name.startsWith("resource://")) {
+            if (name.startsWith("resource://")) {
                 fs = getClass().getResourceAsStream(
                         name.substring("resource:/".length()));
@@ -161 +162 @@
                     }
                 }
-                Main.pref.put(prefKey, null);
+                Main.pref.putCollection(prefKey, null);
             }
         } catch (java.net.MalformedURLException e) {}
@@ -174 +175 @@
         StringBuilder prefKey = new StringBuilder("mirror.");
         if (destDir != null) {
-            String prefDir = Main.pref.getPreferencesDir();
-            if (destDir.startsWith(prefDir)) {
-                destDir = destDir.substring(prefDir.length());
-            }
             prefKey.append(destDir);
             prefKey.append(".");
@@ -198 +195 @@
                         || maxTime <= 0 // arbitrary value <= 0 is deprecated
                 ) {
-                    maxTime = Main.pref.getInteger("mirror.maxtime", 7*24*60*60);
+                    maxTime = Main.pref.getInteger("mirror.maxtime", 7*24*60*60); // one week
                 }
                 age = System.currentTimeMillis() - Long.parseLong(localPathEntry.get(0));
@@ -206 +203 @@
             }
         }
-        if(destDir == null) {
-            destDir = Main.pref.getPreferencesDir();
+        if (destDir == null) {
+            destDir = Main.pref.getCacheDirectory().getPath();
         }
 
@@ -252 +249 @@
             }
         } finally {
-            if (bis != null) {
-                try {
-                    bis.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (bos != null) {
-                try {
-                    bos.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
+            Utils.close(bis);
+            Utils.close(bos);
         }