Changeset 10345 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/layer

Timestamp:

2016-06-08T23:17:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12937 - Use the new LayerChangeListener (patch by michael2402) - gsoc-core

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/ActivateLayerAction.java

@@ -10 +10 @@
 import javax.swing.AbstractAction;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog.LayerListModel;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeEvent;
+import org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -26 +26 @@
  */
 public final class ActivateLayerAction extends AbstractAction
-implements IEnabledStateUpdating, MapView.LayerChangeListener, MultikeyShortcutAction {
+implements IEnabledStateUpdating, ActiveLayerChangeListener, MultikeyShortcutAction {
     private transient Layer layer;
     private transient Shortcut multikeyShortcut;
@@ -77 +77 @@
     private void execute(Layer layer) {
         // model is going to be updated via LayerChangeListener and PropertyChangeEvents
-        Main.map.mapView.setActiveLayer(layer);
+        model.getLayerManager().setActiveLayer(layer);
         layer.setVisible(true);
     }
 
-    protected boolean isActiveLayer(Layer layer) {
-        if (!Main.isDisplayingMapView())
-            return false;
-        return Main.map.mapView.getActiveLayer() == layer;
+    boolean isActiveLayer(Layer layer) {
+        return model.getLayerManager().getActiveLayer() == layer;
     }
 
@@ -106 +104 @@
 
     @Override
-    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        updateEnabledState();
-    }
-
-    @Override
-    public void layerAdded(Layer newLayer) {
-        updateEnabledState();
-    }
-
-    @Override
-    public void layerRemoved(Layer oldLayer) {
+    public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
         updateEnabledState();
     }
@@ -137 +125 @@
         return null; // Repeating action doesn't make much sense for activating
     }
+
 }