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

Timestamp:

2011-08-26T21:34:44+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6592 - patch by simon04 - Exception showing history of incomplete objects

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (1 diff)

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

@@ -145 +145 @@
     protected boolean canShowAsLatest(OsmPrimitive primitive) {
         if (primitive == null) return false;
-        if (primitive.isNew()) return false;
+        if (primitive.isNew() || !primitive.isUsable()) return false;
+        
+        //try creating a history primitive. if that fails, the primitive cannot be used.
+        try {
+            HistoryOsmPrimitive.forOsmPrimitive(primitive);
+        } catch (Exception ign) {
+            return false;
+        }
+
         if (history == null) return false;
-        // only show latest of the same version if it is
-        // modified
+        // only show latest of the same version if it is modified
         if (history.getByVersion(primitive.getVersion()) != null)
             return primitive.isModified();