Changeset 2563 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

Timestamp:

03.12.2009 19:02:25 (2 years ago)

Author:

Gubaer

Message:

fixed #3400: relation editor: improvement to highlight an element
fixed #3873: Feature request: download selected elements in relation editor
New: Dbl-Click in member table to set the map selection to this member
New: Ctrl-Dbl-Clik in member table to add the member to the the map selection
New: Download selected incomplete members only

File:

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

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

@@ -18 +18 @@
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -71 +72 @@
 
         addMouseListener(new PopupListener());
+        addMouseListener(new DblClickHandler());
     }
 
@@ -241 +243 @@
         return (MemberTableModel) getModel();
     }
+
+    class DblClickHandler extends MouseAdapter {
+        protected void setSelection(MouseEvent e) {
+            int row = rowAtPoint(e.getPoint());
+            if (row < 0) return;
+            OsmPrimitive primitive = getMemberTableModel().getReferredPrimitive(row);
+            getMemberTableModel().getLayer().data.setSelected(primitive.getPrimitiveId());
+        }
+
+        protected void addSelection(MouseEvent e) {
+            int row = rowAtPoint(e.getPoint());
+            if (row < 0) return;
+            OsmPrimitive primitive = getMemberTableModel().getReferredPrimitive(row);
+            getMemberTableModel().getSelectionModel().addSelectionInterval(row, row);
+            getMemberTableModel().getLayer().data.addSelected(primitive.getPrimitiveId());
+
+        }
+
+        @Override
+        public void mouseClicked(MouseEvent e) {
+            if (SwingUtilities.isLeftMouseButton(e) && e.getClickCount() > 1) {
+                if (e.isControlDown()) {
+                    addSelection(e);
+                } else {
+                    setSelection(e);
+                }
+            }
+        }
+    }
 }