Changeset 6220 in josm for trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java

Timestamp:

2013-09-07T15:50:39+02:00 (11 years ago)

Author:

Don-vip

Message:

refactor Toggle actions, use Action.SELECTED_KEY since we have switched to Java 6 long ago, javadoc

File:

• trunk/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java (modified) (3 diffs)

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

@@ -10 +10 @@
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ButtonModel;
 
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetCacheManager;
 import org.openstreetmap.josm.tools.Shortcut;
+
 /**
  * This action toggles the visibility of the {@link ChangesetCacheManager} dialog.
- *
+ * @since 2685
  */
-public class ChangesetManagerToggleAction extends JosmAction {
-    private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
-    //FIXME: replace with property Action.SELECTED_KEY when migrating to
-    // Java 6
-    private boolean selected;
+public class ChangesetManagerToggleAction extends ToggleAction {
     private WindowListener changesetCacheManagerClosedHandler;
 
+    /**
+     * Constructs a new {@code ChangesetManagerToggleAction}.
+     */
     public ChangesetManagerToggleAction() {
-        super(
-                tr("Changeset Manager"),
-                "dialogs/changeset/changesetmanager",
-                tr("Toggle visibility of Changeset Manager window"),
-                Shortcut.registerShortcut("menu:windows:changesetdialog",
-                        tr("Toggle visibility of Changeset Manager window"),
-                        KeyEvent.VK_C, Shortcut.ALT_CTRL),
-                true /* register shortcut */
+        super(tr("Changeset Manager"),
+              "dialogs/changeset/changesetmanager",
+              tr("Toggle visibility of Changeset Manager window"),
+              Shortcut.registerShortcut("menu:windows:changesetdialog",
+                      tr("Toggle visibility of Changeset Manager window"),
+                      KeyEvent.VK_C, Shortcut.ALT_CTRL),
+              true /* register shortcut */
         );
         notifySelectedState();
@@ -43 +38 @@
     }
 
-    public void addButtonModel(ButtonModel model) {
-        if (model != null && !buttonModels.contains(model)) {
-            buttonModels.add(model);
-        }
-    }
-
-    public void removeButtonModel(ButtonModel model) {
-        if (model != null && buttonModels.contains(model)) {
-            buttonModels.remove(model);
-        }
-    }
-
-    protected void notifySelectedState() {
-        for (ButtonModel model: buttonModels) {
-            if (model.isSelected() != selected) {
-                model.setSelected(selected);
-            }
-        }
-    }
-
-    protected void toggleSelectedState() {
-        selected = !selected;
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        toggleSelectedState();
         notifySelectedState();
-        if (selected) {
+        if (isSelected()) {
             ChangesetCacheManager.getInstance().addWindowListener(changesetCacheManagerClosedHandler);
             ChangesetCacheManager.getInstance().setVisible(true);
@@ -75 +51 @@
     }
 
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        toggleSelectedState();
-    }
-
     private class ChangesetCacheManagerClosedHandler extends WindowAdapter {
         @Override
         public void windowClosed(WindowEvent e) {
-            selected = false;
+            setSelected(false);
             notifySelectedState();
             ChangesetCacheManager.getInstance().removeWindowListener(changesetCacheManagerClosedHandler);