Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

Timestamp:

2017-08-22T22:26:32+02:00 (8 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/data/validation/OsmValidator.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
 import org.openstreetmap.josm.gui.preferences.validator.ValidatorPreference;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -143 +144 @@
             allTestsMap.put(testClass.getName(), testClass.getConstructor().newInstance());
         } catch (ReflectiveOperationException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
@@ -189 +190 @@
                     ignoredErrors.addAll(Files.readAllLines(path, StandardCharsets.UTF_8));
                 } catch (final FileNotFoundException e) {
-                    Main.debug(Main.getErrorMessage(e));
+                    Logging.debug(Logging.getErrorMessage(e));
                 } catch (final IOException e) {
-                    Main.error(e);
+                    Logging.error(e);
                 }
             }
@@ -225 +226 @@
             }
         } catch (IOException e) {
-            Main.error(e);
+            Logging.error(e);
         }
     }
@@ -355 +356 @@
     public static synchronized void initializeTests() {
         if (!testsInitialized) {
-            Main.debug("Initializing validator tests");
+            Logging.debug("Initializing validator tests");
             final long startTime = System.currentTimeMillis();
             initializeTests(getTests());
             testsInitialized = true;
-            if (Main.isDebugEnabled()) {
+            if (Logging.isDebugEnabled()) {
                 final long elapsedTime = System.currentTimeMillis() - startTime;
-                Main.debug("Initializing validator tests completed in " + Utils.getDurationString(elapsedTime));
+                Logging.debug("Initializing validator tests completed in {0}", Utils.getDurationString(elapsedTime));
             }
         }
@@ -377 +378 @@
                 }
             } catch (Exception e) { // NOPMD
-                Main.error(e);
+                Logging.error(e);
                 if (!GraphicsEnvironment.isHeadless()) {
                     JOptionPane.showMessageDialog(Main.parent,