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

trunk/src/org/openstreetmap/josm/actions/RestartAction.java

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.io.SaveLayersDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -59 +60 @@
             restartJOSM();
         } catch (IOException ex) {
-            Main.error(ex);
+            Logging.error(ex);
         }
     }
@@ -93 +94 @@
             cmd = getCommands();
         }
-        Main.info("Restart "+cmd);
-        if (Main.isDebugEnabled() && Main.pref.getBoolean("restart.debug.simulation")) {
-            Main.debug("Restart cancelled to get debug info");
+        Logging.info("Restart "+cmd);
+        if (Logging.isDebugEnabled() && Main.pref.getBoolean("restart.debug.simulation")) {
+            Logging.debug("Restart cancelled to get debug info");
             return;
         }
@@ -106 +107 @@
                     Runtime.getRuntime().exec(cmd.toArray(new String[cmd.size()]));
                 } catch (IOException e) {
-                    Main.error(e);
+                    Logging.error(e);
                 }
             }
@@ -138 +139 @@
         if (javaCommand.endsWith(".jnlp") && jnlp == null) {
             // see #11751 - jnlp on Linux
-            if (Main.isDebugEnabled()) {
-                Main.debug("Detected jnlp without jnlpx.origFilenameArg property set");
-            }
+            Logging.debug("Detected jnlp without jnlpx.origFilenameArg property set");
             cmd.addAll(Arrays.asList(mainCommand));
         } else {
@@ -181 +180 @@
     private static void addVMArguments(Collection<String> cmd) {
         List<String> arguments = ManagementFactory.getRuntimeMXBean().getInputArguments();
-        if (Main.isDebugEnabled()) {
-            Main.debug("VM arguments: "+arguments);
-        }
+        Logging.debug("VM arguments: {0}", arguments);
         for (String arg : arguments) {
             // When run from jp2launcher.exe, jnlpx.remove is true, while it is not when run from javaws