Changeset 4406 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-09-07T23:56:18+02:00 (13 years ago)

Author:

simon04

Message:

fix #6776 - sensible pre-selection of versions in history dialog

Location:

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

Files:

• HistoryBrowser.java (modified) (3 diffs)
• HistoryBrowserModel.java (modified) (1 diff)
• VersionTable.java (modified) (1 diff)

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

@@ -30 +30 @@
     private CoordinateInfoViewer coordinateInfoViewer;
     private JTabbedPane tpViewers;
+    private VersionTable versionTable;
 
     /**
@@ -53 +54 @@
         pnl.setLayout(new BorderLayout());
 
-        VersionTable tbl = new VersionTable(model);
-        pnl.add(embeddInScrollPane(tbl), BorderLayout.CENTER);
+        versionTable = new VersionTable(model);
+        pnl.add(embeddInScrollPane(versionTable), BorderLayout.CENTER);
         return pnl;
     }
@@ -126 +127 @@
     public void populate(History history) {
         model.setHistory(history);
+        versionTable.updateSelection();
 
         tpViewers.removeAll();

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

@@ -174 +174 @@
         this.history = history;
         if (history.getNumVersions() > 0) {
-            current = history.getEarliest();
-            reference = history.getEarliest();
-            setLatest(null);
+            HistoryOsmPrimitive newLatest = null;
             if (getEditLayer() != null) {
                 OsmPrimitive p = getEditLayer().data.getPrimitiveById(history.getId(), history.getType());
                 if (canShowAsLatest(p)) {
-                    HistoryOsmPrimitive latest = new HistoryPrimitiveBuilder().build(p);
-                    setLatest(latest);
+                    newLatest = new HistoryPrimitiveBuilder().build(p);
                 }
             }
+            if (newLatest == null) {
+                current = history.getLatest();
+                int prevIndex = history.getNumVersions() - 2;
+                reference = prevIndex < 0 ? history.getEarliest() : history.get(prevIndex);
+            } else {
+                reference = history.getLatest();
+                current = newLatest;
+            }
+            setLatest(newLatest);
         }
         initTagTableModels();

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

@@ -95 +95 @@
     }
 
+    public void updateSelection() {
+        final int row = getVersionTableModel().getRowCount() - 1;
+        setRowSelectionInterval(row, row);
+    }
+
     class PopupMenuTrigger extends MouseAdapter {
         @Override