Changeset 2621 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2009-12-12T17:51:39+01:00 (14 years ago)

Author:

Gubaer

Message:

Moved layer listener management from Layer to MapView
Made sure that listeners also unregister when they register for layer change events.

This will certainly break plugins. Plugin updates will follow later.

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserDialogManager.java (modified) (2 diffs)
• HistoryBrowserModel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.history.History;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
-public class HistoryBrowserDialogManager implements LayerChangeListener {
+public class HistoryBrowserDialogManager implements MapView.LayerChangeListener {
     static private HistoryBrowserDialogManager instance;
     static public HistoryBrowserDialogManager getInstance() {
@@ -27 +27 @@
     protected HistoryBrowserDialogManager() {
         dialogs = new HashMap<Long, HistoryBrowserDialog>();
-        Layer.listeners.add(this);
+        MapView.addLayerChangeListener(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.DataChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 
 /**
@@ -59 +59 @@
  * @see HistoryBrowser
  */
-public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener, DataChangeListener {
+public class HistoryBrowserModel extends Observable implements MapView.LayerChangeListener, DataSetListener, DataChangeListener {
 
     private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName());
@@ -97 +97 @@
             getEditLayer().listenerDataChanged.add(this);
         }
-        Layer.listeners.add(this);
-
+        MapView.addLayerChangeListener(this);
     }
 
@@ -772 +771 @@
             getEditLayer().data.removeDataSetListener(this);
         }
-        Layer.listeners.remove(this);
-
+        MapView.removeLayerChangeListener(this);
     }