Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/io/OsmReader.java

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

• trunk/src/org/openstreetmap/josm/io/OsmReader.java (modified) (11 diffs)

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

@@ -21 +21 @@
 import javax.xml.stream.XMLStreamReader;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -43 +42 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
@@ -202 +202 @@
                 Bounds copy = new Bounds(bounds);
                 bounds.normalize();
-                Main.info("Bbox " + copy + " is out of the world, normalized to " + bounds);
+                Logging.info("Bbox " + copy + " is out of the world, normalized to " + bounds);
             }
             DataSource src = new DataSource(bounds, origin);
@@ -225 +225 @@
                 nd.setCoor(ll);
             } catch (NumberFormatException e) {
-                Main.trace(e);
+                Logging.trace(e);
             }
         }
@@ -277 +277 @@
         }
         if (w.isDeleted() && !nodeIds.isEmpty()) {
-            Main.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
+            Logging.info(tr("Deleted way {0} contains nodes", w.getUniqueId()));
             nodeIds = new ArrayList<>();
         }
@@ -327 +327 @@
         }
         if (r.isDeleted() && !members.isEmpty()) {
-            Main.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
+            Logging.info(tr("Deleted relation {0} contains members", r.getUniqueId()));
             members = new ArrayList<>();
         }
@@ -410 +410 @@
         if (printWarning && ("note".equals(element) || "meta".equals(element))) {
             // we know that Overpass API returns those elements
-            Main.debug(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));
+            Logging.debug(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));
         } else if (printWarning) {
-            Main.info(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));
+            Logging.info(tr("Undefined element ''{0}'' found in input stream. Skipping.", element));
         }
         while (true) {
@@ -505 +505 @@
                             Long.toString(current.getUniqueId()), versionString));
                 } else if (version < 0 && current.isNew()) {
-                    Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.",
+                    Logging.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;
@@ -539 +539 @@
                 current.setChangesetId(Integer.parseInt(v));
             } catch (IllegalArgumentException e) {
-                Main.debug(e.getMessage());
+                Logging.debug(e.getMessage());
                 if (current.isNew()) {
                     // for a new primitive we just log a warning
-                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
+                    Logging.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
                             v, current.getUniqueId()));
                     current.setChangesetId(0);
@@ -551 +551 @@
             } catch (IllegalStateException e) {
                 // thrown for positive changeset id on new primitives
-                Main.debug(e);
-                Main.info(e.getMessage());
+                Logging.debug(e);
+                Logging.info(e.getMessage());
                 current.setChangesetId(0);
             }
@@ -558 +558 @@
                 if (current.isNew()) {
                     // for a new primitive we just log a warning
-                    Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
+                    Logging.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.",
                             v, current.getUniqueId()));
                     current.setChangesetId(0);