Changeset 13171 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-11-27T20:19:15+01:00 (6 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)

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• ChildRelationBrowser.java (modified) (4 diffs)
• ReferringRelationsBrowser.java (modified) (3 diffs)

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

@@ -10 +10 @@
 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;
@@ -66 +68 @@
     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
@@ -85 +90 @@
 
         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));
+                    }
+                }
+            }
+        });
     }
 
@@ -105 +126 @@
 
         // ---
-        EditAction editAction = new EditAction();
+        editAction = new EditAction();
         childTree.addTreeSelectionListener(editAction);
         pnl.add(new JButton(editAction));

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();
-            }
-        }
-    }
 }