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

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

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -81 +80 @@
                 Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}",
                 tr("Command Stack")), KeyEvent.VK_O, Shortcut.ALT_SHIFT), 100, true);
-        undoTree.addMouseListener(new PopupMenuHandler());
+        undoTree.addMouseListener(new MouseEventHandler());
         undoTree.setRootVisible(false);
         undoTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
@@ -91 +90 @@
         InputMapUtils.unassignCtrlShiftUpDown(undoTree, JComponent.WHEN_FOCUSED);
         
-        redoTree.addMouseListener(new PopupMenuHandler());
+        redoTree.addMouseListener(new MouseEventHandler());
         redoTree.setRootVisible(false);
         redoTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
@@ -382 +381 @@
      * undo / redo switch to reduce duplicate code
      */
-    protected enum UndoRedoType {UNDO, REDO};
+    protected enum UndoRedoType {UNDO, REDO}
 
     /**
@@ -444 +443 @@
     }
 
-    class PopupMenuHandler extends PopupMenuLauncher {
+    class MouseEventHandler extends PopupMenuLauncher {
+
+        public MouseEventHandler() {
+            super(new CommandStackPopup());
+        }
         
         @Override
         public void mouseClicked(MouseEvent evt) {
-            super.mouseClicked(evt);
-            if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount()>1) {
+            if (isDoubleClick(evt)) {
                 selectAndZoomAction.actionPerformed(null);
             }
         }
-        
-        @Override
-        public void launch(MouseEvent evt) {
-            Point p = evt.getPoint();
-            JTree tree = (JTree) evt.getSource();
-            int row = tree.getRowForLocation(p.x, p.y);
-            if (row != -1) {
-                TreePath path = tree.getPathForLocation(p.x, p.y);
-                // right click on unselected element -> select it first
-                if (!tree.isPathSelected(path)) {
-                    tree.setSelectionPath(path);
-                }
-                TreePath[] selPaths = tree.getSelectionPaths();
-
-                CommandStackPopup menu = new CommandStackPopup();
-                menu.show(tree, p.x, p.y-3);
-            }
-        }
-    }
-
+    }
     
     private class CommandStackPopup extends JPopupMenu {