changes made after tupshins reconstruction

[org.ibex.core.git] / src / org / xwt / LocalStorage.java

diff --git a/src/org/xwt/LocalStorage.java b/src/org/xwt/LocalStorage.java
index 50451dd..376ccb8 100644 (file)
--- a/src/org/xwt/LocalStorage.java
+++ b/src/org/xwt/LocalStorage.java
@@ -1,4 +1,4 @@
-// Copyright 2003 Adam Megacz, see the COPYING file for licensing [GPL]
+// Copyright 2004 Adam Megacz, see the COPYING file for licensing [GPL]
 package org.xwt;
 
 import java.io.*;
@@ -13,33 +13,33 @@ public class LocalStorage {
 
     static String xwtDirName = System.getProperty("user.home") + java.io.File.separatorChar + ".xwt";
 
-    static File xwtDir = null;
-    static File cacheDir = null;
+    static java.io.File xwtDir = null;
+    static java.io.File cacheDir = null;
 
     static {
         try {
-            xwtDir = new File(xwtDirName);
+            xwtDir = new java.io.File(xwtDirName);
             if (!xwtDir.mkdirs()) xwtDir = null;
+            try {
+                cacheDir = new java.io.File(xwtDirName + java.io.File.separatorChar + "cache");
+                if (!cacheDir.mkdirs()) cacheDir = null;
+            } catch (Exception e) {
+                Log.warn(LocalStorage.class, "unable to create cache directory " +
+                         xwtDirName + java.io.File.separatorChar + "cache");
+            }
         } catch (Exception e) {
-            Log.info(LocalStorage.class, "unable to create xwt directory " + xwtDirName);
-        }
-        try {
-            cacheDir = new File(xwtDirName + java.io.File.separatorChar + "cache");
-            if (!cacheDir.mkdirs()) cacheDir = null;
-        } catch (Exception e) {
-            Log.info(LocalStorage.class, "unable to create cache directory " + xwtDirName + java.io.File.separatorChar + "cache");
+            Log.warn(LocalStorage.class, "unable to create xwt directory " + xwtDirName);
         }
     }
 
-
     // FEATURE: we ought to be able to do stuff like sha1-checking and date checking on cached resources    
     public static class Cache {
 
-        private static void delTree(File f) throws IOException {
+        private static void delTree(java.io.File f) throws IOException {
             if (f.isDirectory()) {
                 String[] s = f.list();
                 for(int i=0; i<s.length; i++)
-                    delTree(new File(f.getPath() + File.separatorChar + s[i]));
+                    delTree(new java.io.File(f.getPath() + java.io.File.separatorChar + s[i]));
             }
             f.delete();
         }
@@ -49,9 +49,9 @@ public class LocalStorage {
             cacheDir.mkdirs();
         }
 
-        public static File getCacheFileForKey(String key) {
+        public static java.io.File getCacheFileForKey(String key) {
             // FEATURE: be smarter here
-            return new File(cacheDir.getPath() + File.separatorChar + new String(Base64.encode(key.getBytes())));
+            return new java.io.File(cacheDir.getPath() + File.separatorChar + new String(Base64.encode(key.getBytes())));
         }
 
     }