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

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

@@ -18 +18 @@
 import javax.xml.stream.XMLStreamReader;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -171 +172 @@
                 Bounds copy = new Bounds(bounds);
                 bounds.normalize();
-                System.out.println("Bbox " + copy + " is out of the world, normalized to " + bounds);
+                Main.info("Bbox " + copy + " is out of the world, normalized to " + bounds);
             }
             DataSource src = new DataSource(bounds, origin);
@@ -233 +234 @@
         }
         if (w.isDeleted() && !nodeIds.isEmpty()) {
-            System.out.println(tr("Deleted way {0} contains nodes", w.getUniqueId()));
+            Main.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
             nodeIds = new ArrayList<Long>();
         }
@@ -280 +281 @@
         }
         if (r.isDeleted() && !members.isEmpty()) {
-            System.out.println(tr("Deleted relation {0} contains members", r.getUniqueId()));
+            Main.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
             members = new ArrayList<RelationMemberData>();
         }
@@ -356 +357 @@
     protected void parseUnknown(boolean printWarning) throws XMLStreamException {
         if (printWarning) {
-            System.out.println(tr("Undefined element ''{0}'' found in input stream. Skipping.", parser.getLocalName()));
+            Main.info(tr("Undefined element ''{0}'' found in input stream. Skipping.", parser.getLocalName()));
         }
         while (true) {
@@ -445 +446 @@
                     throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.getUniqueId()), versionString));
                 } else if (version < 0 && current.getUniqueId() <= 0) {
-                    System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
+                    Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
                     version = 0;
                 }
             } else if (ds.getVersion().equals("0.5")) {
                 if (version <= 0 && current.getUniqueId() > 0) {
-                    System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+                    Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
                     version = 1;
                 } else if (version < 0 && current.getUniqueId() <= 0) {
-                    System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
+                    Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
                     version = 0;
                 }
@@ -467 +468 @@
             } else if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
                 // default version in 0.5 files for existing primitives
-                System.out.println(tr("WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
+                Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
                 version= 1;
             } else if (current.getUniqueId() <= 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
@@ -496 +497 @@
                 if (current.getUniqueId() <= 0) {
                     // for a new primitive we just log a warning
-                    System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
                     current.setChangesetId(0);
                 } else {
@@ -506 +507 @@
                 if (current.getUniqueId() <= 0) {
                     // for a new primitive we just log a warning
-                    System.out.println(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
+                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
                     current.setChangesetId(0);
                 } else {