Changeset 7746 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-11-25T22:14:29+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10684 - fix deprecation warning

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DialogsToggleAction.java (modified) (2 diffs)
• ToggleAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 
-import javax.swing.Icon;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -25 +24 @@
     public DialogsToggleAction() {
         super(tr("Toggle dialogs panel"),
-              (Icon) null, /* no icon */
+              (ImageProvider) null, /* no icon */
               tr("Toggle dialogs panel, maximize mapview"),
               Shortcut.registerShortcut("menu:view:dialogspanel", tr("Toggle dialogs panel"),KeyEvent.VK_TAB, Shortcut.DIRECT),

trunk/src/org/openstreetmap/josm/actions/ToggleAction.java

@@ -7 +7 @@
 
 import javax.swing.ButtonModel;
-import javax.swing.Icon;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
@@ -15 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -40 +40 @@
      * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
      */
-    public ToggleAction(String name, Icon icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
+    public ToggleAction(String name, ImageProvider icon, String tooltip, Shortcut shortcut, boolean registerInToolbar, String toolbarId, boolean installAdapters) {
         super(name, icon, tooltip, shortcut, registerInToolbar, toolbarId, installAdapters);
         // It is required to set the SELECTED_KEY to a non-null value in order to let Swing components update it
@@ -82 +82 @@
         }
     }
-    
+
     /**
      * Adds a button model
@@ -103 +103 @@
         }
     }
-    
+
     protected void notifySelectedState() {
         boolean selected = isSelected();
@@ -121 +121 @@
      */
     protected final void toggleSelectedState(ActionEvent e) {
-        if (e == null || !(e.getSource() instanceof JToggleButton || 
-                           e.getSource() instanceof JCheckBox || 
-                           e.getSource() instanceof JRadioButton || 
-                           e.getSource() instanceof JCheckBoxMenuItem || 
-                           e.getSource() instanceof JRadioButtonMenuItem 
+        if (e == null || !(e.getSource() instanceof JToggleButton ||
+                           e.getSource() instanceof JCheckBox ||
+                           e.getSource() instanceof JRadioButton ||
+                           e.getSource() instanceof JCheckBoxMenuItem ||
+                           e.getSource() instanceof JRadioButtonMenuItem
                            )) {
             setSelected(!isSelected());