Changeset 1472 in josm

Timestamp:

2009-03-08T16:54:08+01:00 (15 years ago)

Author:

stoecker

Message:

fix #2264 - ctrl+area selection, update translations, added is,ar

Location:

trunk

Files:

• lib/josm-translation.jar (modified) ( previous)
• src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -198 +198 @@
 
             Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
-            selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false);
+            selectPrims(Collections.singleton((OsmPrimitive)virtualNode), false, false, false, false);
             virtualWays.clear();
             virtualNode = null;
@@ -334 +334 @@
 
         if (ctrl && shift) {
-            if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false, false);
+            if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false, false, false);
             mode = Mode.rotate;
             setCursor(ImageProvider.getCursor("rotate", null));
@@ -344 +344 @@
             selectPrims(osmColl,
                 shift || Main.ds.getSelected().containsAll(osmColl),
-                ctrl, false);
+                ctrl, false, false);
             mode = Mode.move;
         } else {
@@ -392 +392 @@
                 selectPrims(
                     Main.map.mapView.getNearestCollection(e.getPoint()),
-                    shift, ctrl, true);
+                    shift, ctrl, true, false);
 
                 // If the user double-clicked a node, change to draw mode
@@ -434 +434 @@
 
     public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-        selectPrims(selectionManager.getObjectsInRectangle(r, alt), shift, ctrl, false);
-    }
-
-    public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift, boolean ctrl, boolean released) {
+        selectPrims(selectionManager.getObjectsInRectangle(r, alt), shift, ctrl, true, true);
+    }
+
+    public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift,
+    boolean ctrl, boolean released, boolean area) {
         if ((shift && ctrl) || (ctrl && !released))
             return; // not allowed together
@@ -453 +454 @@
                 if(curSel.contains(osm))
                     curSel.remove(osm);
-                else
+                else if(!area)
                     curSel.add(osm);
             }