Changeset 5958 in josm for trunk/src/org/openstreetmap/josm/gui/history/VersionTable.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/VersionTable.java (modified) (4 diffs)

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Observable;
@@ -30 +30 @@
 import org.openstreetmap.josm.actions.AbstractInfoAction;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
+import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -85 +86 @@
     }
 
-    protected void showPopupMenu(MouseEvent evt) {
-        HistoryBrowserModel.VersionTableModel model = getVersionTableModel();
-        int row = rowAtPoint(evt.getPoint());
-        if (row > -1 && !model.isLatest(row)) {
-            HistoryOsmPrimitive primitive = model.getPrimitive(row);
-            popupMenu.prepare(primitive);
-            popupMenu.show(evt.getComponent(), evt.getX(), evt.getY());
-        }
-    }
-
-    class MouseListener extends MouseAdapter {
+    class MouseListener extends PopupMenuLauncher {
+        public MouseListener() {
+            super(popupMenu);
+        }
         @Override
         public void mousePressed(MouseEvent e) {
-            if (!showPopup(e) && e.getButton() == MouseEvent.BUTTON1) {
+            super.mousePressed(e);
+            if (!e.isPopupTrigger() && e.getButton() == MouseEvent.BUTTON1) {
                 int row = rowAtPoint(e.getPoint());
                 int col = columnAtPoint(e.getPoint());
@@ -108 +103 @@
         }
         @Override
-        public void mouseReleased(MouseEvent e) {
-            showPopup(e);
-        }
-        private boolean showPopup(MouseEvent e) {
-            if (e.isPopupTrigger()) {
-                showPopupMenu(e);
-                return true;
+        protected int checkTableSelection(JTable table, Point p) {
+            HistoryBrowserModel.VersionTableModel model = getVersionTableModel();
+            int row = rowAtPoint(p);
+            if (row > -1 && !model.isLatest(row)) {
+                popupMenu.prepare(model.getPrimitive(row));
             }
-            return false;
+            return row;
         }
     }