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

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

@@ -150 +150 @@
             }
         } catch (Exception e) {
-            if(file.getName().endsWith(".zip")) {
-                System.err.println(tr("Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
+            if (file.getName().endsWith(".zip")) {
+                Main.warn(tr("Failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}",
                         file.getName(), e.toString(), extension, namepart));
             }
@@ -257 +257 @@
                 {Long.toString(System.currentTimeMillis()), localFile.toString()}));
             } else {
-                System.out.println(tr("Failed to rename file {0} to {1}.",
+                Main.warn(tr("Failed to rename file {0} to {1}.",
                 destDirFile.getPath(), localFile.getPath()));
             }
         } catch (IOException e) {
             if (age >= maxTime*1000 && age < maxTime*1000*2) {
-                System.out.println(tr("Failed to load {0}, use cached file and retry next time: {1}",
-                url, e));
+                Main.warn(tr("Failed to load {0}, use cached file and retry next time: {1}", url, e));
                 return localFile;
             } else {
@@ -319 +318 @@
                     throw new IOException(msg);
                 }
-                System.out.println(tr("Download redirected to ''{0}''", downloadUrl));
+                Main.info(tr("Download redirected to ''{0}''", downloadUrl));
                 break;
             default: