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

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

@@ -229 +229 @@
                 version = "0.6";
             } else {
-                System.err.println(tr("This version of JOSM is incompatible with the configured server."));
-                System.err.println(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
+                Main.error(tr("This version of JOSM is incompatible with the configured server."));
+                Main.error(tr("It supports protocol version 0.6, while the server says it supports {0} to {1}.",
                         capabilities.get("version", "minimum"), capabilities.get("version", "maximum")));
                 initialized = false; // FIXME gets overridden by next assignment
@@ -256 +256 @@
                 for (Layer l : Main.map.mapView.getLayersOfType(ImageryLayer.class)) {
                     if (((ImageryLayer) l).getInfo().isBlacklisted()) {
-                        System.out.println(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName()));
+                        Main.info(tr("Removed layer {0} because it is not allowed by the configured API.", l.getName()));
                         Main.main.removeLayer(l);
                     }
@@ -548 +548 @@
             } catch (InterruptedException ex) {}
         }
-        System.out.println(tr("OK - trying again."));
+        Main.info(tr("OK - trying again."));
     }
 
@@ -628 +628 @@
 
                 activeConnection.connect();
-                System.out.println(activeConnection.getResponseMessage());
+                Main.info(activeConnection.getResponseMessage());
                 int retCode = activeConnection.getResponseCode();
 
@@ -634 +634 @@
                     if (retries-- > 0) {
                         sleepAndListen(retries, monitor);
-                        System.out.println(tr("Starting retry {0} of {1}.", getMaxRetries() - retries,getMaxRetries()));
+                        Main.info(tr("Starting retry {0} of {1}.", getMaxRetries() - retries,getMaxRetries()));
                         continue;
                     }
@@ -666 +666 @@
                 if (activeConnection.getHeaderField("Error") != null) {
                     errorHeader = activeConnection.getHeaderField("Error");
-                    System.err.println("Error header: " + errorHeader);
+                    Main.error("Error header: " + errorHeader);
                 } else if (retCode != 200 && responseBody.length()>0) {
-                    System.err.println("Error body: " + responseBody);
+                    Main.error("Error body: " + responseBody);
                 }
                 activeConnection.disconnect();