Changeset 1911 in josm for trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

Timestamp:

2009-08-05T10:05:50+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3193: No layer is left highlighted when the bottom most one is deleted
fixed some references to Way.nodes
clean up of warnings
added documentation in LayerListDialog

File:

• trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (modified) (6 diffs)

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

@@ -145 +145 @@
      */
     public void mousePressed(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON1)
+        if (e.getButton() == MouseEvent.BUTTON1) {
             mousePosStart = mousePos = e.getPoint();
+        }
     }
 
@@ -157 +158 @@
 
         if (buttonPressed != 0) {
-            if (mousePosStart == null)
+            if (mousePosStart == null) {
                 mousePosStart = mousePos = e.getPoint();
+            }
             paintRect();
         }
@@ -191 +193 @@
         boolean alt = (e.getModifiersEx() & MouseEvent.ALT_DOWN_MASK) != 0;
         boolean ctrl = (e.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0;
-        if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0)
+        if ((e.getModifiersEx() & MouseEvent.BUTTON3_DOWN_MASK) == 0) {
             selectionEndedListener.selectionEnded(r, alt, shift, ctrl);
+        }
     }
 
@@ -235 +238 @@
             if ((double)w/h < aspectRatio) {
                 int neww = (int)(h*aspectRatio);
-                if (mousePos.x < mousePosStart.x)
+                if (mousePos.x < mousePosStart.x) {
                     x += w - neww;
+                }
                 w = neww;
             } else {
                 int newh = (int)(w/aspectRatio);
-                if (mousePos.y < mousePosStart.y)
+                if (mousePos.y < mousePosStart.y) {
                     y += h - newh;
+                }
                 h = newh;
             }
@@ -275 +280 @@
         if (clicked) {
             OsmPrimitive osm = nc.getNearest(center);
-            if (osm != null)
+            if (osm != null) {
                 selection.add(osm);
+            }
         } else {
             // nodes
             for (Node n : nc.getCurrentDataSet().nodes) {
-                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n)))
+                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n))) {
                     selection.add(n);
+                }
             }
 
             // ways
             for (Way w : nc.getCurrentDataSet().ways) {
-                if (w.deleted || w.getNodesCount() == 0 || w.incomplete)
-                        continue;
+                if (w.deleted || w.getNodesCount() == 0 || w.incomplete) {
+                    continue;
+                }
                 if (alt) {
                     for (Node n : w.getNodes()) {
@@ -303 +311 @@
                         }
                     }
-                    if (allIn) selection.add(w);
+                    if (allIn) {
+                        selection.add(w);
+                    }
                 }
             }