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

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -55 +55 @@
 import org.openstreetmap.josm.plugins.ReadLocalPluginInformationTask;
 import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
 import org.w3c.dom.DOMException;
@@ -100 +101 @@
      */
     public static void log(Exception e, String s) {
-        summary.append(s).append(' ').append(Main.getErrorMessage(e)).append('\n');
+        summary.append(s).append(' ').append(Logging.getErrorMessage(e)).append('\n');
     }
 
@@ -206 +207 @@
             case 'q': JOptionPane.showMessageDialog(Main.parent, text, tr("Question"), JOptionPane.QUESTION_MESSAGE); break;
             case 'p': JOptionPane.showMessageDialog(Main.parent, text, tr("Message"), JOptionPane.PLAIN_MESSAGE); break;
-            default: Main.warn("Unsupported messageBox type: " + c);
+            default: Logging.warn("Unsupported messageBox type: " + c);
         }
     }
@@ -281 +282 @@
             root = document.getDocumentElement();
         } catch (SAXException | IOException | ParserConfigurationException ex) {
-            Main.warn(ex, "Error getting preferences to save:");
+            Logging.log(Logging.LEVEL_WARN, "Error getting preferences to save:", ex);
         }
         if (root == null || exportDocument == null)
@@ -310 +311 @@
             ts.transform(new DOMSource(exportDocument), new StreamResult(f.toURI().getPath()));
         } catch (DOMException | TransformerFactoryConfigurationError | TransformerException ex) {
-            Main.warn("Error saving preferences part:");
-            Main.error(ex);
+            Logging.warn("Error saving preferences part:");
+            Logging.error(ex);
         }
     }
@@ -375 +376 @@
                     while (busy) CustomConfigurator.class.wait();
                 } catch (InterruptedException ex) {
-                    Main.warn(ex, "InterruptedException while reading local plugin information");
+                    Logging.log(Logging.LEVEL_WARN, "InterruptedException while reading local plugin information", ex);
                     Thread.currentThread().interrupt();
                 }
@@ -495 +496 @@
             } catch (ScriptException ex) {
                 log("Error: initializing script engine: "+ex.getMessage());
-                Main.error(ex);
+                Logging.error(ex);
             }
         }
@@ -961 +962 @@
 
     private static void showPrefs(Preferences tmpPref) {
-        Main.info("properties: " + tmpPref.settingsMap);
+        Logging.info("properties: " + tmpPref.settingsMap);
     }