Changeset 2556 in josm for trunk

Timestamp:

2009-12-01T09:19:01+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #4063: patch by mjulius: Exception in History dialog

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowserModel.java (modified) (1 diff)
• VersionTable.java (modified) (2 diffs)

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

@@ -438 +438 @@
 
         public HistoryOsmPrimitive getPrimitive(int row) {
-            return history.get(row);
+            return isLatest(row) ? latest : history.get(row);
         }
 

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

@@ -67 +67 @@
         public void mouseClicked(MouseEvent e) {
             switch(e.getClickCount()) {
-                case 2: handleDoubleClick(e); break;
+            case 2: handleDoubleClick(e); break;
             }
         }
@@ -91 +91 @@
             row = rowAtPoint(evt.getPoint());
         }
-        HistoryOsmPrimitive primitive = model.getPrimitive(row);
-        popupMenu.prepare(primitive);
-        popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
+        if (!model.isLatest(row)) {
+            HistoryOsmPrimitive primitive = model.getPrimitive(row);
+            popupMenu.prepare(primitive);
+            popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
+        }
     }