Changeset 1820 in josm for trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

Timestamp:

21.07.2009 19:52:53 (3 years ago)

Author:

Gubaer

Message:

JosmAction is now a LayerChangeListener and a SelectionChangeListener
updated all JosmActions
fixed #3018: Make sure tools menu entries (and actions) are deactivated when no layer

File:

• trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (modified) (4 diffs)

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

@@ -15 +15 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -26 +24 @@
  * and when ok is pressed, a new node is created at the specified position.
  */
-public final class AddNodeAction extends JosmAction implements LayerChangeListener {
+public final class AddNodeAction extends JosmAction {
 
     public AddNodeAction() {
@@ -32 +30 @@
                 Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), KeyEvent.VK_D, Shortcut.GROUP_EDIT,
                         Shortcut.SHIFT_DEFAULT), true);
-        Layer.listeners.add(this);
-        refreshEnabled();
-    }
-
-    protected void refreshEnabled() {
-        setEnabled(Main.map != null
-                && Main.map.mapView != null
-                && Main.map.mapView.getEditLayer() != null);
     }
 
@@ -83 +73 @@
     }
 
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        refreshEnabled();
+    @Override
+    protected void updateEnabledState() {
+        setEnabled(getEditLayer() != null);
     }
 
-    public void layerAdded(Layer newLayer) {
-        refreshEnabled();
+}
 
-    }
-
-    public void layerRemoved(Layer oldLayer) {
-        refreshEnabled();
-    }
-}