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

Timestamp:

2013-09-23T16:47:50+02:00 (13 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/AutosaveTask.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -89 +89 @@
 
             if (!autosaveDir.exists() && !autosaveDir.mkdirs()) {
-                System.out.println(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
+                Main.warn(tr("Unable to create directory {0}, autosave will be disabled", autosaveDir.getAbsolutePath()));
                 return;
             }
             if (!deletedLayersDir.exists() && !deletedLayersDir.mkdirs()) {
-                System.out.println(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
+                Main.warn(tr("Unable to create directory {0}, autosave will be disabled", deletedLayersDir.getAbsolutePath()));
                 return;
             }
@@ -159 +159 @@
                         Utils.close(ps);
                     } catch (Throwable t) {
-                        System.err.println(t.getMessage());
+                        Main.error(t);
                     }
                     return result;
                 } else {
-                    System.out.println(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
+                    Main.warn(tr("Unable to create file {0}, other filename will be used", result.getAbsolutePath()));
                     if (index > PROP_INDEX_LIMIT.get())
                         throw new IOException("index limit exceeded");
                 }
             } catch (IOException e) {
-                System.err.println(tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()));
+                Main.error(tr("IOError while creating file, autosave will be skipped: {0}", e.getMessage()));
                 return null;
             }
@@ -190 +190 @@
             File oldFile = info.backupFiles.remove();
             if (!oldFile.delete()) {
-                System.out.println(tr("Unable to delete old backup file {0}", oldFile.getAbsolutePath()));
+                Main.warn(tr("Unable to delete old backup file {0}", oldFile.getAbsolutePath()));
             } else {
                 getPidFile(oldFile).delete();
@@ -207 +207 @@
             } catch (Throwable t) {
                 // Don't let exception stop time thread
-                System.err.println("Autosave failed: ");
+                Main.error("Autosave failed:");
+                Main.error(t);
                 t.printStackTrace();
             }
@@ -257 +258 @@
                             }
                         } catch (IOException e) {
-                            System.err.println(tr("Error while creating backup of removed layer: {0}", e.getMessage()));
+                            Main.error(tr("Error while creating backup of removed layer: {0}", e.getMessage()));
                         }
 
@@ -300 +301 @@
                             }
                         } catch (Throwable t) {
-                            System.err.println(t.getClass()+":"+t.getMessage());
+                            Main.error(t);
                         } finally {
                             Utils.close(reader);
                         }
                     } catch (Throwable t) {
-                        System.err.println(t.getClass()+":"+t.getMessage());
+                        Main.error(t);
                     }
                 }
@@ -359 +360 @@
             deletedLayers.remove(backupFile);
             if (!backupFile.delete()) {
-                System.err.println(String.format("Warning: Could not delete old backup file %s", backupFile));
+                Main.warn(String.format("Could not delete old backup file %s", backupFile));
             }
         }
@@ -366 +367 @@
             pidFile.delete();
         } else {
-            System.err.println(String.format("Warning: Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
+            Main.warn(String.format("Could not move autosaved file %s to %s folder", f.getName(), deletedLayersDir.getName()));
             // we cannot move to deleted folder, so just try to delete it directly
             if (!f.delete()) {
-                System.err.println(String.format("Warning: Could not delete backup file %s", f));
+                Main.warn(String.format("Could not delete backup file %s", f));
             } else {
                 pidFile.delete();
@@ -380 +381 @@
             }
             if (!next.delete()) {
-                System.err.println(String.format("Warning: Could not delete archived backup file %s", next));
+                Main.warn(String.format("Could not delete archived backup file %s", next));
             }
         }