Changeset 2652 in josm for trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

Timestamp:

2009-12-18T08:40:15+01:00 (14 years ago)

Author:

jttt

Message:

Added listener for edit layer change (not just active layer)

File:

• trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java

@@ -9 +9 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.event.DataSetListenerAdapter.Listener;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
@@ -26 +23 @@
  *
  */
-public class DatasetEventManager implements LayerChangeListener, Listener {
+public class DatasetEventManager implements MapView.EditLayerChangeListener, Listener {
 
     private static final DatasetEventManager instance = new DatasetEventManager();
@@ -40 +37 @@
 
     public DatasetEventManager() {
-        MapView.addLayerChangeListener(this);
+        MapView.addEditLayerChangeListener(this);
     }
 
@@ -62 +59 @@
     }
 
-    /* --------------------------------------------------------------------------- */
-    /* interface LayerChangeListener                                               */
-    /* --------------------------------------------------------------------------- */
-    public void activeLayerChange(Layer a, Layer b) {
-        if (a != null && a instanceof OsmDataLayer) {
-            ((OsmDataLayer)a).data.removeDataSetListener(myListener);
+    public void editLayerChanged(OsmDataLayer oldLayer, OsmDataLayer newLayer) {
+        if (oldLayer != null) {
+            oldLayer.data.removeDataSetListener(myListener);
         }
-        if (b != null && b instanceof OsmDataLayer) {
-            ((OsmDataLayer)b).data.addDataSetListener(myListener);
-        }
-        if (Main.main.getEditLayer() != null) {
-            processDatasetEvent(new DataChangedEvent(Main.main.getEditLayer().data));
+
+        if (newLayer != null) {
+            newLayer.data.addDataSetListener(myListener);
+            processDatasetEvent(new DataChangedEvent(newLayer.data));
+        } else {
+            processDatasetEvent(new DataChangedEvent(null));
         }
     }
-    public void layerRemoved(Layer a) {/* irrelevant in this context */}
-    public void layerAdded(Layer a) {/* irrelevant in this context */}
 
     public void processDatasetEvent(AbstractDatasetChangedEvent event) {