Changeset 2961 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java (modified) (4 diffs)

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