Changeset 6248 in josm for trunk/src/org/openstreetmap/josm/io/CacheFiles.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/io/CacheFiles.java (modified) (5 diffs)

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

@@ -14 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -115 +116 @@
             new RandomAccessFile(data, "r").readFully(bytes);
             return bytes;
-        } catch(Exception e) {
-            System.out.println(e.getMessage());
+        } catch (Exception e) {
+            Main.warn(e);
         }
         return null;
@@ -130 +131 @@
         try {
             File f = getPath(ident);
-            if(f.exists()) {
+            if (f.exists()) {
                 f.delete();
             }
             // rws also updates the file meta-data, i.e. last mod time
-            new RandomAccessFile(f, "rws").write(data);
-        } catch(Exception e){
-            System.out.println(e.getMessage());
+            RandomAccessFile raf = new RandomAccessFile(f, "rws");
+            try {
+                raf.write(data);
+            } finally {
+                Utils.close(raf);
+            }
+        } catch (Exception e) {
+            Main.warn(e);
         }
 
@@ -164 +170 @@
             }
             return ImageIO.read(img);
-        } catch(Exception e) {
-            System.out.println(e.getMessage());
+        } catch (Exception e) {
+            Main.warn(e);
         }
         return null;
@@ -176 +182 @@
      */
     public void saveImg(String ident, BufferedImage image) {
-        if(!enabled) return;
+        if (!enabled) return;
         try {
             ImageIO.write(image, "png", getPath(ident, "png"));
-        } catch(Exception e){
-            System.out.println(e.getMessage());
+        } catch (Exception e) {
+            Main.warn(e);
         }