Changeset 4087 in josm for trunk/src/org/openstreetmap/josm/actions/WireframeToggleAction.java

Timestamp:

2011-05-15T23:51:25+02:00 (13 years ago)

Author:

bastiK

Message:

PaintVisitor refactoring, includes hook for external MapRenderers (author: Gubaer)

File:

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

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.ButtonModel;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.data.osm.visitor.paint.WireframeMapRenderer;
 import org.openstreetmap.josm.tools.Shortcut;
 
 public class WireframeToggleAction 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 WireframeToggleAction() {
         super(
@@ -27 +22 @@
                 true /* register shortcut */
         );
-        selected = Main.pref.getBoolean("draw.wireframe", false);
-        notifySelectedState();
+        putValue(SELECTED_KEY, MapRendererFactory.getInstance().isWireframeMapRendererActive());
     }
 
-    public void addButtonModel(ButtonModel model) {
-        if (model != null && !buttonModels.contains(model)) {
-            buttonModels.add(model);
-            model.setSelected(selected);
+    public void toggleSelectedState() {
+        boolean selected = (Boolean)getValue(SELECTED_KEY);
+
+        if (selected){
+            MapRendererFactory.getInstance().activate(WireframeMapRenderer.class);
+        } else {
+            MapRendererFactory.getInstance().activate(StyledMapRenderer.class);
         }
-    }
-
-    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;
-        Main.pref.put("draw.wireframe", selected);
-        notifySelectedState();
         if (Main.map != null) {
             Main.map.mapView.repaint();
         }
     }
+
     public void actionPerformed(ActionEvent e) {
         toggleSelectedState();
@@ -66 +44 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(Main.map != null && Main.main.getEditLayer() != null);
-    }
-
-    public boolean isSelected() {
-        return selected;
+        setEnabled(Main.main.getEditLayer() != null);
     }
 }