Changeset 11386 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

Timestamp:

2016-12-13T02:16:07+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1066 - Collapsible "if" statements should be merged

File:

• trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapControler.java

@@ -118 +118 @@
 
     /**
-     * Start drawing the selection rectangle if it was the 1st button (left
-     * button)
+     * Start drawing the selection rectangle if it was the 1st button (left button)
      */
     @Override
@@ -132 +131 @@
     public void mouseDragged(MouseEvent e) {
         if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) == MouseEvent.BUTTON1_DOWN_MASK &&
-                !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK)) {
-            if (iStartSelectionPoint != null) {
-                iEndSelectionPoint = e.getPoint();
-                iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);
-                isSelecting = true;
-            }
+                !(Main.isPlatformOsx() && e.getModifiersEx() == MAC_MOUSE_BUTTON3_MASK) && iStartSelectionPoint != null) {
+            iEndSelectionPoint = e.getPoint();
+            iSlippyMapChooser.setSelection(iStartSelectionPoint, iEndSelectionPoint);
+            isSelecting = true;
         }
     }