Changeset 2961 in josm

Timestamp:

10.02.2010 15:23:17 (2 years ago)

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/history/HistoryDataSet.java (modified) (5 diffs)
• data/osm/history/HistoryDataSetListener.java (modified) (1 diff)
• gui/dialogs/HistoryDialog.java (modified) (4 diffs)
• gui/history/HistoryBrowserDialog.java (modified) (2 diffs)

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);
 }

trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.gui.history.HistoryLoadTask;
@@ -71 +72 @@
         build();
         DataSet.selListeners.add(model);
+
+        HelpUtil.setHelpContext(this, HelpUtil.ht("/Dialog/HistoryDialog"));
     }
 
@@ -146 +149 @@
     }
 
+    /* ----------------------------------------------------------------------------- */
+    /* interface HistoryDataSetListener                                              */
+    /* ----------------------------------------------------------------------------- */
     public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
+        model.refresh();
+    }
+
+    public void historyDataSetCleared(HistoryDataSet source) {
         model.refresh();
     }
@@ -317 +327 @@
         protected List<OsmPrimitive> filterPrimitivesWithUnloadedHistory(Collection<OsmPrimitive> primitives) {
             ArrayList<OsmPrimitive> ret = new ArrayList<OsmPrimitive>(primitives.size());
+            HistoryDataSet hds = HistoryDataSet.getInstance();
             for (OsmPrimitive p: primitives) {
-                if (HistoryDataSet.getInstance().getHistory(p.getPrimitiveId()) == null) {
+                if (hds.getHistory(p.getPrimitiveId()) == null) {
+                    // reload if the history is not in the cache yet
+                    ret.add(p);
+                } else if (!p.isNew() && hds.getHistory(p.getPrimitiveId()).getByVersion(p.getUniqueId()) == null) {
+                    // reload if the history object of the selected object is not in the cache
+                    // yet
                     ret.add(p);
                 }

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

@@ -108 +108 @@
     }
 
+    public void unlinkAsListener() {
+        getHistoryBrowser().getModel().unlinkAsListener();
+    }
+
+    /* ---------------------------------------------------------------------------------- */
+    /* interface HistoryDataSetListener                                                   */
+    /* ---------------------------------------------------------------------------------- */
     public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
         if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitmiveId())) {
@@ -114 +121 @@
     }
 
-    public void unlinkAsListener() {
-        getHistoryBrowser().getModel().unlinkAsListener();
+    public void historyDataSetCleared(HistoryDataSet source) {
+        closeAction.run();
     }
+
 
     class CloseAction extends AbstractAction {