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

Timestamp:

2010-02-14T16:47:44+01:00 (14 years ago)

Author:

jttt

Message:

Make DataChangedListener deprecated (replaced by DatasetListener), remove remaining listeners

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (6 diffs)

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

@@ -37 +37 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
-import org.openstreetmap.josm.gui.layer.DataChangeListener;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -67 +66 @@
  * @see HistoryBrowser
  */
-public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener, DataChangeListener {
+public class HistoryBrowserModel extends Observable implements LayerChangeListener, DataSetListener {
     //private static Logger logger = Logger.getLogger(HistoryBrowserModel.class.getName());
 
@@ -102 +101 @@
         if (getEditLayer() != null) {
             getEditLayer().data.addDataSetListener(this);
-            getEditLayer().listenerDataChanged.add(this);
         }
         MapView.addLayerChangeListener(this);
@@ -822 +820 @@
 
     public void dataChanged(DataChangedEvent event) {
-        dataChanged(getEditLayer());
-    }
-
-    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
-        // Irrelevant
-    }
-
-    /* ---------------------------------------------------------------------- */
-    /* DataChangeListener                                                     */
-    /* ---------------------------------------------------------------------- */
-    public void dataChanged(OsmDataLayer l) {
-        if (l != getEditLayer()) return;
-        OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType());
+        OsmPrimitive primitive = event.getDataset().getPrimitiveById(history.getId(), history.getType());
         HistoryOsmPrimitive latest;
         if (canShowAsLatest(primitive)) {
@@ -843 +829 @@
         setLatest(latest);
         fireModelChange();
+    }
+
+    public void otherDatasetChange(AbstractDatasetChangedEvent event) {
+        // Irrelevant
     }
 
@@ -861 +851 @@
         OsmDataLayer l = (OsmDataLayer)newLayer;
         l.data.addDataSetListener(this);
-        l.listenerDataChanged.add(this);
         OsmPrimitive primitive = l.data.getPrimitiveById(history.getId(), history.getType());
         HistoryOsmPrimitive latest;