Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java

Timestamp:

2013-09-23T16:47:50+02:00 (11 years ago)

Author:

Don-vip

Message:

Rework console output:

• new log level "error"
• Replace nearly all calls to system.out and system.err to Main.(error|warn|info|debug)
• Remove some unnecessary debug output
• Some messages are modified (removal of "Info", "Warning", "Error" from the message itself -> notable i18n impact but limited to console error messages not seen by the majority of users, so that's ok)

File:

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

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

@@ -123 +123 @@
                 layersIndex.load(fis);
             } catch (FileNotFoundException e) {
-                System.out.println("Unable to load layers index for wms cache (file " + layerIndexFile + " not found)");
+                Main.error("Unable to load layers index for wms cache (file " + layerIndexFile + " not found)");
             } catch (IOException e) {
-                System.err.println("Unable to load layers index for wms cache");
+                Main.error("Unable to load layers index for wms cache");
                 e.printStackTrace();
             }
@@ -151 +151 @@
                     layersIndex.store(fos, "");
                 } catch (IOException e) {
-                    System.err.println("Unable to save layer index for wms cache");
+                    Main.error("Unable to save layer index for wms cache");
                     e.printStackTrace();
                 }
@@ -187 +187 @@
             totalFileSize = cacheEntries.getTotalFileSize();
             if (cacheEntries.getTileSize() != tileSize) {
-                System.out.println("Cache created with different tileSize, cache will be discarded");
+                Main.info("Cache created with different tileSize, cache will be discarded");
                 return;
             }
@@ -202 +202 @@
             if (indexFile.exists()) {
                 e.printStackTrace();
-                System.out.println("Unable to load index for wms-cache, new file will be created");
+                Main.info("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");
+                Main.info("Index for wms-cache doesn't exist, new file will be created");
             }
         }
@@ -297 +297 @@
             marshaller.marshal(index, new FileOutputStream(new File(cacheDir, INDEX_FILENAME)));
         } catch (Exception e) {
-            System.err.println("Failed to save wms-cache file");
+            Main.error("Failed to save wms-cache file");
             e.printStackTrace();
         }
@@ -364 +364 @@
                 return loadImage(projectionEntries, entry);
             } catch (IOException e) {
-                System.err.println("Unable to load file from wms cache");
+                Main.error("Unable to load file from wms cache");
                 e.printStackTrace();
                 return null;