Changeset 12620 in josm for trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
- Timestamp:
- 2017-08-22T22:26:32+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
r11535 r12620 55 55 import org.openstreetmap.josm.plugins.ReadLocalPluginInformationTask; 56 56 import org.openstreetmap.josm.tools.LanguageInfo; 57 import org.openstreetmap.josm.tools.Logging; 57 58 import org.openstreetmap.josm.tools.Utils; 58 59 import org.w3c.dom.DOMException; … … 100 101 */ 101 102 public static void log(Exception e, String s) { 102 summary.append(s).append(' ').append( Main.getErrorMessage(e)).append('\n');103 summary.append(s).append(' ').append(Logging.getErrorMessage(e)).append('\n'); 103 104 } 104 105 … … 206 207 case 'q': JOptionPane.showMessageDialog(Main.parent, text, tr("Question"), JOptionPane.QUESTION_MESSAGE); break; 207 208 case 'p': JOptionPane.showMessageDialog(Main.parent, text, tr("Message"), JOptionPane.PLAIN_MESSAGE); break; 208 default: Main.warn("Unsupported messageBox type: " + c);209 default: Logging.warn("Unsupported messageBox type: " + c); 209 210 } 210 211 } … … 281 282 root = document.getDocumentElement(); 282 283 } catch (SAXException | IOException | ParserConfigurationException ex) { 283 Main.warn(ex, "Error getting preferences to save:");284 Logging.log(Logging.LEVEL_WARN, "Error getting preferences to save:", ex); 284 285 } 285 286 if (root == null || exportDocument == null) … … 310 311 ts.transform(new DOMSource(exportDocument), new StreamResult(f.toURI().getPath())); 311 312 } catch (DOMException | TransformerFactoryConfigurationError | TransformerException ex) { 312 Main.warn("Error saving preferences part:");313 Main.error(ex);313 Logging.warn("Error saving preferences part:"); 314 Logging.error(ex); 314 315 } 315 316 } … … 375 376 while (busy) CustomConfigurator.class.wait(); 376 377 } catch (InterruptedException ex) { 377 Main.warn(ex, "InterruptedException while reading local plugin information");378 Logging.log(Logging.LEVEL_WARN, "InterruptedException while reading local plugin information", ex); 378 379 Thread.currentThread().interrupt(); 379 380 } … … 495 496 } catch (ScriptException ex) { 496 497 log("Error: initializing script engine: "+ex.getMessage()); 497 Main.error(ex);498 Logging.error(ex); 498 499 } 499 500 } … … 961 962 962 963 private static void showPrefs(Preferences tmpPref) { 963 Main.info("properties: " + tmpPref.settingsMap);964 Logging.info("properties: " + tmpPref.settingsMap); 964 965 } 965 966
Note:
See TracChangeset
for help on using the changeset viewer.