Ticket #15598: josm-handle-doubleclick-coherent-in-ChildRelationBrowser-and-ReferringRelationsBrowser.patch

src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -9 +9 @@
 import java.awt.Dialog;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.HashSet;
@@ -65 +67 @@
     /** the osm data layer this browser is related to */
     private transient OsmDataLayer layer;
 
+    /** the editAction used in the bottom panel and for doubleClick */
+    private EditAction editAction;
+
     /**
      * Replies the {@link OsmDataLayer} this editor is related to
      *
@@ -84 +89 @@
         add(pane, BorderLayout.CENTER);
 
         add(buildButtonPanel(), BorderLayout.SOUTH);
+        childTree.setToggleClickCount(0);
+        childTree.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount() == 2 && !e.isAltDown() && !e.isAltGraphDown() &&
+                    !e.isControlDown() && !e.isMetaDown() && !e.isShiftDown() &&
+                    childTree.getRowForLocation(e.getX(), e.getY()) ==
+                    childTree.getMinSelectionRow()) {
+                    Relation r = (Relation) childTree.getLastSelectedPathComponent();
+                    if (r.isIncomplete()) {
+                        childTree.expandPath(childTree.getSelectionPath());
+                    } else {
+                        editAction.actionPerformed(
+                           new ActionEvent(e.getSource(), ActionEvent.ACTION_PERFORMED, null));
+                    }
+                }
+            }
+        });
     }
 
     /**
@@ -104 +127 @@
         pnl.add(new JButton(downloadSelectedAction));
 
         // ---
-        EditAction editAction = new EditAction();
+        editAction = new EditAction();
         childTree.addTreeSelectionListener(editAction);
         pnl.add(new JButton(editAction));
 

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

@@ -44 +44 @@
     /**
      * 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) {
         this.model = model;
@@ -61 +61 @@
         referrers.setCellRenderer(new OsmPrimitivRenderer());
         add(new JScrollPane(referrers), BorderLayout.CENTER);
         referrers.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        referrers.addMouseListener(new DblClickMouseAdapter());
 
         JPanel pnl = new JPanel(new FlowLayout(FlowLayout.LEFT));
 
@@ -74 +73 @@
         referrers.getSelectionModel().addListSelectionListener(editAction);
         pnl.add(new JButton(editAction));
         add(pnl, BorderLayout.SOUTH);
+
+        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));
+                }
+            }
+        });
     }
 
     public void init() {
@@ -170 +182 @@
             refreshEnabled();
         }
     }
-
-    class DblClickMouseAdapter extends MouseAdapter {
-        @Override
-        public void mouseClicked(MouseEvent e) {
-            if (e.getClickCount() == 2) {
-                editAction.run();
-            }
-        }
-    }
 }