Changeset 2961 in josm for trunk/src/org/openstreetmap/josm/data/osm/history

Timestamp:

2010-02-10T15:23:17+01:00 (14 years ago)

Author:

Gubaer

Message:

fixed #4392: exception in version history dialog on re-downloading a changed element

Location:

trunk/src/org/openstreetmap/josm/data/osm/history

Files:

• HistoryDataSet.java (modified) (5 diffs)
• HistoryDataSetListener.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java

@@ -7 +7 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
+import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -17 +21 @@
  *
  */
-public class HistoryDataSet {
+public class HistoryDataSet implements LayerChangeListener{
     //private final static Logger logger = Logger.getLogger(HistoryDataSet.class.getName());
 
@@ -31 +35 @@
         if (historyDataSet == null) {
             historyDataSet = new HistoryDataSet();
+            MapView.addLayerChangeListener(historyDataSet);
         }
         return  historyDataSet;
@@ -57 +62 @@
         for (HistoryDataSetListener l : listeners) {
             l.historyUpdated(this, id);
+        }
+    }
+
+    protected void fireCacheCleared() {
+        for (HistoryDataSetListener l : listeners) {
+            l.historyDataSetCleared(this);
         }
     }
@@ -151 +162 @@
         fireHistoryUpdated(null);
     }
+
+    /* ------------------------------------------------------------------------------ */
+    /* interface LayerChangeListener                                                  */
+    /* ------------------------------------------------------------------------------ */
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {/* irrelevant in this context */}
+    public void layerAdded(Layer newLayer) {/* irrelevant in this context */}
+    public void layerRemoved(Layer oldLayer) {
+        if (Main.map == null || Main.map.mapView == null) return;
+        if (Main.map.mapView.getNumLayers() == 0) {
+            data.clear();
+            fireCacheCleared();
+        }
+    }
 }

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java

@@ -5 +5 @@
 
 public interface HistoryDataSetListener {
+    /**
+     * Fired by a {@see HistoryDataSet} if the cached history of an OSM primitive with
+     * id <code>id</code> is updated
+     * 
+     * @param source the data set firing the event
+     * @param id the id of the updated primitive
+     */
     void historyUpdated(HistoryDataSet source, PrimitiveId id);
+
+    /**
+     * Fired by a {@see HistoryDataSet} if the history cached is cleared.
+     * 
+     * @param source the history data set firing the event
+     */
+    void historyDataSetCleared(HistoryDataSet source);
 }