Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

Timestamp:

30.08.2009 19:07:24 (3 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/gui/ConditionalOptionPaneUtil.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java

@@ -89 +89 @@
             return DIALOG_DISABLED_OPTION;
         MessagePanel pnl = new MessagePanel(preferenceKey, message);
-        int ret = OptionPaneUtil.showOptionDialog(parent, pnl, title, optionType, messageType, options,defaultOption);
+        int ret = JOptionPane.showOptionDialog(parent, pnl, title, optionType, messageType, null,options,defaultOption);
         pnl.remeberDialogShowingEnabled();
         return ret;
@@ -128 +128 @@
             return true;
         MessagePanel pnl = new MessagePanel(preferenceKey, message);
-        boolean ret = OptionPaneUtil.showConfirmationDialog(parent, pnl, title, optionType, messageType, trueOption);
+        int ret = JOptionPane.showConfirmDialog(parent, pnl, title, optionType, messageType);
         pnl.remeberDialogShowingEnabled();
-        return ret;
+        return ret == trueOption;
     }
 
@@ -155 +155 @@
             return;
         MessagePanel pnl = new MessagePanel(preferenceKey, message);
-        OptionPaneUtil.showMessageDialog(parent, pnl, title, messageType);
+        JOptionPane.showMessageDialog(parent, pnl, title, messageType);
         pnl.remeberDialogShowingEnabled();
     }