Changeset 4067 in josm for trunk

Timestamp:

2011-05-02T07:32:20+02:00 (14 years ago)

Author:

jttt

Message:

Better message (no stacktrace) when wms cache index file doesn't exist yet

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

@@ -178 +178 @@
 
     public synchronized void loadIndex() {
+        File indexFile = new File(cacheDir, INDEX_FILENAME);
         try {
             JAXBContext context = JAXBContext.newInstance(
@@ -183 +184 @@
                     WmsCacheType.class.getClassLoader());
             Unmarshaller unmarshaller = context.createUnmarshaller();
-            WmsCacheType cacheEntries = (WmsCacheType)unmarshaller.unmarshal(
-                    new FileInputStream(new File(cacheDir, INDEX_FILENAME)));
+            WmsCacheType cacheEntries = (WmsCacheType)unmarshaller.unmarshal(new FileInputStream(indexFile));
             totalFileSize = cacheEntries.getTotalFileSize();
             if (cacheEntries.getTileSize() != tileSize) {
@@ -201 +201 @@
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            System.out.println("Unable to load index for wms-cache, new file will be created");
+            if (indexFile.exists()) {
+                e.printStackTrace();
+                System.out.println("Unable to load index for wms-cache, new file will be created");
+            } else {
+                System.out.println("Index for wms-cache doesn't exist, new file will be created");
+            }
         }