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

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -308 +308 @@
             } else {
                 if (!suppressWarnings) {
-                    System.err.println(tr("Failed to locate image ''{0}''", name));
+                    Main.error(tr("Failed to locate image ''{0}''", name));
                 }
                 return null;
@@ -613 +613 @@
             }
         } catch (Exception e) {
-            System.err.println(tr("Warning: failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
+            Main.warn(tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
         } finally {
             Utils.close(zipFile);
@@ -671 +671 @@
                         return u;
                 } catch (SecurityException e) {
-                    System.out.println(tr(
-                            "Warning: failed to access directory ''{0}'' for security reasons. Exception was: {1}",
+                    Main.warn(tr(
+                            "Failed to access directory ''{0}'' for security reasons. Exception was: {1}",
                             name, e.toString()));
                 }
@@ -685 +685 @@
                 return u;
         } catch (SecurityException e) {
-            System.out.println(tr(
-                    "Warning: failed to access directory ''{0}'' for security reasons. Exception was: {1}", dir, e
+            Main.warn(tr(
+                    "Failed to access directory ''{0}'' for security reasons. Exception was: {1}", dir, e
                     .toString()));
         }
@@ -736 +736 @@
                 @Override
                 public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-                    System.out.println();
                     if (localName.equalsIgnoreCase("img")) {
                         String val = atts.getValue("src");
@@ -759 +758 @@
             return r.getResult();
         } catch (Exception e) {
-            System.out.println("INFO: parsing " + base + fn + " failed:\n" + e);
+            Main.warn("Parsing " + base + fn + " failed:\n" + e);
             return null;
         }
-        System.out.println("INFO: parsing " + base + fn + " failed: Unexpected content.");
+        Main.warn("Parsing " + base + fn + " failed: Unexpected content.");
         return null;
     }