Changeset 13171 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

Timestamp:

2017-11-27T20:19:15+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15598 - relation editor: handle double click in child and referring browsers the same way (patch by cmuelle8, modified)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -45 +45 @@
      * Constructs a new {@code ReferringRelationsBrowser}.
      * @param layer OSM data layer
-     * @param model referrinf relations browser model
+     * @param model referring relations browser model
      */
     public ReferringRelationsBrowser(OsmDataLayer layer, ReferringRelationsBrowserModel model) {
@@ -62 +62 @@
         add(new JScrollPane(referrers), BorderLayout.CENTER);
         referrers.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        referrers.addMouseListener(new DblClickMouseAdapter());
+        referrers.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2
+                    && !e.isAltDown() && !e.isAltGraphDown() && !e.isControlDown() && !e.isMetaDown() && !e.isShiftDown()
+                    && referrers.getCellBounds(referrers.getSelectedIndex(), referrers.getSelectedIndex()).contains(e.getPoint())) {
+                    editAction.actionPerformed(new ActionEvent(e.getSource(), ActionEvent.ACTION_PERFORMED, null));
+                }
+            }
+        });
 
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
@@ -171 +180 @@
         }
     }
-
-    class DblClickMouseAdapter extends MouseAdapter {
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() == 2) {
-                editAction.run();
-            }
-        }
-    }
 }