Changeset 6327 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-10-27T02:15:10+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #9220 - toggle actions not usable via menu items (regression from r6220)

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ChangesetManagerToggleAction.java (modified) (1 diff)
• DialogsToggleAction.java (modified) (1 diff)
• ExpertToggleAction.java (modified) (1 diff)
• FullscreenToggleAction.java (modified) (1 diff)
• ToggleAction.java (modified) (3 diffs)
• ViewportFollowToggleAction.java (modified) (1 diff)
• WireframeToggleAction.java (modified) (1 diff)

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

@@ -40 +40 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         notifySelectedState();
         if (isSelected()) {

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

@@ -38 +38 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         Main.pref.put("draw.dialogspanel", isSelected());
         notifySelectedState();

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

@@ -140 +140 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         Main.pref.put("expert", isSelected());
         notifySelectedState();

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

@@ -52 +52 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         Main.pref.put("draw.fullscreen", isSelected());
         notifySelectedState();

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import java.awt.event.ActionEvent;
 import java.util.ArrayList;
 import java.util.List;
@@ -7 +8 @@
 import javax.swing.ButtonModel;
 import javax.swing.Icon;
+import javax.swing.JCheckBox;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JRadioButton;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JToggleButton;
 
 import org.openstreetmap.josm.tools.Shortcut;
@@ -101 +107 @@
     }
 
-    protected final void toggleSelectedState() {
-        setSelected(!isSelected());
+    /**
+     * Toggles the selcted action state, if needed according to the ActionEvent that trigerred the action.
+     * This method will do nothing if the action event comes from a Swing component supporting the SELECTED_KEY property because the component already set the selected state.
+     * This method needs to be called especially if the action is associated with a keyboard shortcut to ensure correct selected state.
+     * @see <a href="https://weblogs.java.net/blog/zixle/archive/2005/11/changes_to_acti.html">Changes to Actions in 1.6</a>
+     * @see <a href="http://docs.oracle.com/javase/6/docs/api/javax/swing/Action.html">Interface Action</a>
+     */
+    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 
+                           )) {
+            setSelected(!isSelected());
+        }
     }
 }

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

@@ -35 +35 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         Main.map.mapView.viewportFollowing = isSelected();
         notifySelectedState();

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

@@ -42 +42 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
+        toggleSelectedState(e);
         if (isSelected()) {
             MapRendererFactory.getInstance().activate(WireframeMapRenderer.class);