Changeset 3198 in josm for trunk/src/org

Timestamp:

2010-04-22T23:22:47+02:00 (14 years ago)

Author:

bastiK

Message:

see #4929 - rectangle selection selects filtered objects.
(the other things mentioned in this ticket are not addressed)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• SelectionManager.java (modified) (3 diffs)
• dialogs/DialogsPanel.java (modified) (1 diff)
• dialogs/FilterDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -190 +190 @@
 
         boolean shift = (e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0;
-        boolean alt = (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0;
+        boolean alt = (e.getModifiersEx() & (MouseEvent.ALT_DOWN_MASK | MouseEvent.ALT_GRAPH_DOWN_MASK)) != 0;
         boolean ctrl = (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0;
         if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
@@ -284 +284 @@
             // nodes
             for (Node n : nc.getCurrentDataSet().getNodes()) {
-                if (n.isUsable() && r.contains(nc.getPoint(n))) {
+                if (n.isSelectable() && r.contains(nc.getPoint(n))) {
                     selection.add(n);
                 }
@@ -291 +291 @@
             // ways
             for (Way w : nc.getCurrentDataSet().getWays()) {
-                if (!w.isUsable() || w.getNodesCount() == 0) {
+                if (!w.isSelectable() || w.getNodesCount() == 0) {
                     continue;
                 }

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

@@ -82 +82 @@
                 reconstruct(Action.INVISIBLE_TO_DEFAULT, dlg);
             }
-            dlg.showNotify();
         } else {
             dlg.hideDialog();

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

@@ -191 +191 @@
 
     public void processDatasetEvent(AbstractDatasetChangedEvent event) {
-        System.err.print("FilterDialog/processDatasetEvent");
         filters.executeFilters();
     }