Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

Timestamp:

2009-08-30T19:07:24+02:00 (15 years ago)

Author:

Gubaer

Message:

removed OptionPaneUtil
cleanup of deprecated Layer API
cleanup of deprecated APIs in OsmPrimitive and Way
cleanup of imports

File:

• trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -21 +21 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.plugins.PluginHandler;
 
@@ -39 +38 @@
             if (e instanceof OutOfMemoryError) {
                 // do not translate the string, as translation may raise an exception
-                OptionPaneUtil.showMessageDialog(Main.parent, "JOSM is out of memory. " +
+                JOptionPane.showMessageDialog(Main.parent, "JOSM is out of memory. " +
                         "Strange things may happen.\nPlease restart JOSM with the -Xmx###M option,\n" +
                         "where ### is the the number of MB assigned to JOSM (e.g. 256).\n" +
@@ -53 +52 @@
 
             Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
-            int answer = OptionPaneUtil.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
+            int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
                     "This is always a coding error. If you are running the latest\n" +
             "version of JOSM, please consider being kind and file a bug report."),
-            tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
+            tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,null,
             options, options[0]);
             if (answer == 1) {
@@ -84 +83 @@
                     p.add(new JScrollPane(info), GBC.eop());
 
-                    OptionPaneUtil.showMessageDialog(Main.parent, p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
+                    JOptionPane.showMessageDialog(Main.parent, p, tr("Warning"), JOptionPane.WARNING_MESSAGE);
                 } catch (Exception e1) {
                     e1.printStackTrace();