Changeset 16459 in josm for trunk/src/org

Timestamp:

2020-05-17T23:26:27+02:00 (5 years ago)

Author:

simon04

Message:

fix #19254 - History browser: double click relation member table to open history of member

Location:

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

Files:

• NodeListViewer.java (modified) (5 diffs)
• RelationMemberListViewer.java (modified) (2 diffs)
• ShowHistoryAction.java (added)

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

@@ -6 +6 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
 
 import javax.swing.AbstractAction;
@@ -23 +21 @@
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
 import org.openstreetmap.josm.data.osm.history.History;
-import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -58 +54 @@
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
         table.addMouseListener(new InternalPopupMenuLauncher());
-        table.addMouseListener(new DoubleClickAdapter(table));
+        table.addMouseListener(new ShowHistoryAction.DoubleClickAdapter(e -> {
+            int row = table.rowAtPoint(e.getPoint());
+            return row <= 0 ? null : primitiveIdAtRow(tableModel, row);
+        }));
         return table;
     }
@@ -127 +126 @@
     }
 
-    static class ShowHistoryAction extends AbstractAction {
-        private transient PrimitiveId primitiveId;
-
-        /**
-         * Constructs a new {@code ShowHistoryAction}.
-         */
-        ShowHistoryAction() {
-            putValue(NAME, tr("Show history"));
-            putValue(SHORT_DESCRIPTION, tr("Open a history browser with the history of this node"));
-            new ImageProvider("dialogs", "history").getResource().attachImageIcon(this, true);
-        }
-
-        @Override
-        public void actionPerformed(ActionEvent e) {
-            if (isEnabled()) {
-                run();
-            }
-        }
-
-        public void setPrimitiveId(PrimitiveId pid) {
-            this.primitiveId = pid;
-            updateEnabledState();
-        }
-
-        public void run() {
-            if (HistoryDataSet.getInstance().getHistory(primitiveId) == null) {
-                MainApplication.worker.submit(new HistoryLoadTask().add(primitiveId));
-            }
-            MainApplication.worker.submit(() -> {
-                final History h = HistoryDataSet.getInstance().getHistory(primitiveId);
-                if (h == null)
-                    return;
-                GuiHelper.runInEDT(() -> HistoryBrowserDialogManager.getInstance().show(h));
-            });
-        }
-
-        public void updateEnabledState() {
-            setEnabled(primitiveId != null && !primitiveId.isNew());
-        }
-    }
-
     private static PrimitiveId primitiveIdAtRow(DiffTableModel model, int row) {
         Long id = (Long) model.getValueAt(row, 0).value;
@@ -186 +144 @@
     }
 
-    static class DoubleClickAdapter extends MouseAdapter {
-        private final JTable table;
-        private final ShowHistoryAction showHistoryAction;
-
-        DoubleClickAdapter(JTable table) {
-            this.table = table;
-            showHistoryAction = new ShowHistoryAction();
-        }
-
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() < 2)
-                return;
-            int row = table.rowAtPoint(e.getPoint());
-            if (row <= 0)
-                return;
-            PrimitiveId pid = primitiveIdAtRow((DiffTableModel) table.getModel(), row);
-            if (pid == null || pid.isNew())
-                return;
-            showHistoryAction.setPrimitiveId(pid);
-            showHistoryAction.run();
-        }
-    }
 }

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

@@ -8 +8 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+
+import org.openstreetmap.josm.data.osm.RelationMemberData;
 
 /**
@@ -34 +36 @@
             table.scrollRectToVisible(rect);
         });
+        table.addMouseListener(new ShowHistoryAction.DoubleClickAdapter(e -> {
+            int row = table.rowAtPoint(e.getPoint());
+            return row <= 0 ? null : (RelationMemberData) tableModel.getValueAt(row, 0).value;
+        }));
         return table;
     }