Changeset 2017 in josm for trunk/src/org/openstreetmap/josm/tools/Shortcut.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/tools/Shortcut.java (modified) (2 diffs)

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

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.OptionPaneUtil;
 
 import java.awt.event.KeyEvent;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Collection;
+
 import javax.swing.AbstractButton;
-import javax.swing.KeyStroke;
 import javax.swing.JMenu;
 import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -444 +445 @@
     // a lengthy warning message
     private static void displayWarning(Shortcut conflictsWith, Shortcut potentialShortcut, String shortText, String longText) {
-        OptionPaneUtil.showMessageDialog(Main.parent,
+        JOptionPane.showMessageDialog(Main.parent,
                 tr("Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"+
                         "because the shortcut is already taken by the action ''{3}'' ({4}).\n\n",