Changeset 5958 in josm for trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

Timestamp:

2013-05-13T03:10:05+02:00 (11 years ago)

Author:

Don-vip

Message:

• Improve PopupMenuLauncher to automatically select JTable/JList/JTree line under cursor
• Simplify all popup menus with this new feature
• Remove custom popup menus in BoundingBoxSelection and BoundingBoxSelection to use default text field popup menus recently introduced
• Fix EDT violations in changeset window
• Make Autoscale actions publicly available in MainMenu
• Add a new "Zoom to problem" mode in AutoScaleAction
• Make "Zoom to problem" menu item in validator dialog use this new feature
• Update enabled state of "Zoom to Conflict" and "Zoom to problem" against selection of conflict/validator dialog

File:

• trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java (modified) (8 diffs)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -66 +68 @@
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
-        table.addMouseListener(new PopupMenuLauncher(table));
+        table.addMouseListener(new InternalPopupMenuLauncher());
         table.addMouseListener(new DoubleClickAdapter(table));
         return table;
@@ -79 +81 @@
         table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         selectionSynchronizer.participateInSynchronizedSelection(table.getSelectionModel());
-        table.addMouseListener(new PopupMenuLauncher(table));
+        table.addMouseListener(new InternalPopupMenuLauncher());
         table.addMouseListener(new DoubleClickAdapter(table));
         return table;
@@ -115 +117 @@
         selectionSynchronizer = new SelectionSynchronizer();
 
+        popupMenu = new NodeListPopupMenu();
+
         // ---------------------------
         gc.gridx = 0;
@@ -135 +139 @@
         gc.anchor = GridBagConstraints.NORTHWEST;
         add(embeddInScrollPane(buildCurrentNodeListTable()),gc);
-
-        popupMenu = new NodeListPopupMenu();
     }
 
@@ -172 +174 @@
 
     static class NodeListPopupMenu extends JPopupMenu {
-        private ZoomToNodeAction zoomToNodeAction;
-        private ShowHistoryAction showHistoryAction;
+        private final ZoomToNodeAction zoomToNodeAction;
+        private final ShowHistoryAction showHistoryAction;
 
         public NodeListPopupMenu() {
@@ -262 +264 @@
             Runnable r = new Runnable() {
                 public void run() {
-                    History h = HistoryDataSet.getInstance().getHistory(primitiveId);
+                    final History h = HistoryDataSet.getInstance().getHistory(primitiveId);
                     if (h == null)
                         return;
-                    HistoryBrowserDialogManager.getInstance().show(h);
+                    GuiHelper.runInEDT(new Runnable() {
+                        @Override public void run() {
+                            HistoryBrowserDialogManager.getInstance().show(h);
+                        }
+                    });
                 }
             };
@@ -283 +289 @@
     }
 
-    class PopupMenuLauncher extends MouseAdapter {
-        private JTable table;
-
-        public PopupMenuLauncher(JTable table) {
-            this.table = table;
-        }
-
-        @Override
-        public void mousePressed(MouseEvent e) {
-            showPopup(e);
-        }
-
-        @Override
-        public void mouseReleased(MouseEvent e) {
-            showPopup(e);
-        }
-
-        private void showPopup(MouseEvent e) {
-            if (!e.isPopupTrigger()) return;
-            Point p = e.getPoint();
-            int row = table.rowAtPoint(p);
-
-            PrimitiveId pid = primitiveIdAtRow(table.getModel(), row);
-            if (pid == null)
-                return;
-            popupMenu.prepare(pid);
-            popupMenu.show(e.getComponent(), e.getX(), e.getY());
+    class InternalPopupMenuLauncher extends PopupMenuLauncher {
+        public InternalPopupMenuLauncher() {
+            super(popupMenu);
+        }
+
+        @Override protected int checkTableSelection(JTable table, Point p) {
+            int row = super.checkTableSelection(table, p);
+            popupMenu.prepare(primitiveIdAtRow(table.getModel(), row));
+            return row;
         }
     }