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

Timestamp:

2009-10-04T12:07:16+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3650: Double-click on items in history dialog should open history
fixed #3649: History dialog does not show moved nodes
fixed #3383: changeset tags in history dialog (partial fix, there's now a link to the server page for browsing changesets)

File:

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

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

@@ -110 +110 @@
             }
         });
+        historyTable.addMouseListener(new ShowHistoryMouseAdapter());
 
         JScrollPane pane = new JScrollPane(historyTable);
@@ -138 +139 @@
         model.refresh();
     }
-
-    /**
-     * shows the {@see HistoryBrowserDialog} for a given {@see History}
-     *
-     * @param h the history. Must not be null.
-     * @exception IllegalArgumentException thrown, if h is null
-     */
-    protected void showHistory(History h) throws IllegalArgumentException {
-        if (h == null)
-            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "h"));
-        if (HistoryBrowserDialogManager.getInstance().existsDialog(h.getId())) {
-            HistoryBrowserDialogManager.getInstance().show(h.getId());
-        } else {
-            HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
-            HistoryBrowserDialogManager.getInstance().show(h.getId(), dialog);
-        }
-    }
-
 
     /**
@@ -233 +216 @@
             }
             return ret;
+        }
+
+        public OsmPrimitive getPrimitive(int row) {
+            return data.get(row);
         }
     }
@@ -286 +273 @@
     }
 
+    class ShowHistoryMouseAdapter extends MouseAdapter {
+        @Override
+        public void mouseClicked(MouseEvent e) {
+            if (e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) {
+                int row = historyTable.rowAtPoint(e.getPoint());
+                new ShowHistoryAction().showHistory(Collections.singletonList(model.getPrimitive(row)));
+            }
+        }
+    }
+
     /**
      * The action for showing history information of the current history item.
@@ -307 +304 @@
         }
 
-        public void actionPerformed(ActionEvent e) {
-            int [] rows = historyTable.getSelectedRows();
-            if (rows == null || rows.length == 0) return;
-
-            final List<OsmPrimitive> selectedItems = model.getPrimitives(rows);
-            List<OsmPrimitive> toLoad = filterPrimitivesWithUnloadedHistory(selectedItems);
+        /**
+         * shows the {@see HistoryBrowserDialog} for a given {@see History}
+         *
+         * @param h the history. Must not be null.
+         * @exception IllegalArgumentException thrown, if h is null
+         */
+        protected void showHistory(History h) throws IllegalArgumentException {
+            if (h == null)
+                throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "h"));
+            if (HistoryBrowserDialogManager.getInstance().existsDialog(h.getId())) {
+                HistoryBrowserDialogManager.getInstance().show(h.getId());
+            } else {
+                HistoryBrowserDialog dialog = new HistoryBrowserDialog(h);
+                HistoryBrowserDialogManager.getInstance().show(h.getId(), dialog);
+            }
+        }
+
+        public void showHistory(final List<OsmPrimitive> primitives) {
+            List<OsmPrimitive> toLoad = filterPrimitivesWithUnloadedHistory(primitives);
             if (!toLoad.isEmpty()) {
                 HistoryLoadTask task = new HistoryLoadTask();
-                task.add(selectedItems);
+                task.add(primitives);
                 Main.worker.submit(task);
             }
@@ -321 +331 @@
             Runnable r = new Runnable() {
                 public void run() {
-                    for (OsmPrimitive p : selectedItems) {
+                    for (OsmPrimitive p : primitives) {
                         History h = HistoryDataSet.getInstance().getHistory(p.getId());
                         if (h == null) {
@@ -333 +343 @@
         }
 
+        public void actionPerformed(ActionEvent e) {
+            int [] rows = historyTable.getSelectedRows();
+            if (rows == null || rows.length == 0) return;
+            showHistory(model.getPrimitives(rows));
+        }
+
         protected void updateEnabledState() {
             setEnabled(historyTable.getSelectedRowCount() > 0);