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

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

@@ -19 +19 @@
 import javax.xml.stream.XMLStreamException;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.DataSource;
@@ -27 +26 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.HttpClient;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 import org.openstreetmap.josm.tools.Utils;
@@ -168 +168 @@
                         break;
                     default:
-                        Main.warn("Unsupported syntax: " + matcher.group(1));
+                        Logging.warn("Unsupported syntax: " + matcher.group(1));
                 }
             } catch (UncheckedParseException ex) {
                 final String msg = tr("Failed to evaluate {0}", matcher.group());
-                Main.warn(ex, msg);
+                Logging.log(Logging.LEVEL_WARN, msg, ex);
                 matcher.appendReplacement(sb, "// " + msg + "\n");
             }
@@ -245 +245 @@
                     reader = readerClass.getDeclaredConstructor().newInstance();
                 } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
-                    Main.error(e);
+                    Logging.error(e);
                 }
             }