Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

Timestamp:

2017-01-12T01:24:40+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - Method orders expressions in a conditional in a sub optimal way

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (modified) (2 diffs)

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

@@ -586 +586 @@
 
             // Select Draw Tool if no selection has been made
-            if (getLayerManager().getEditDataSet().selectionEmpty() && !cancelDrawMode) {
+            if (!cancelDrawMode && getLayerManager().getEditDataSet().selectionEmpty()) {
                 Main.map.selectDrawTool(true);
                 updateStatusLine();
@@ -639 +639 @@
     @Override
     public void doKeyPressed(KeyEvent e) {
-        if (!Main.isDisplayingMapView() ||
-                !repeatedKeySwitchLassoOption || !getShortcut().isEvent(e)) return;
+        if (!repeatedKeySwitchLassoOption || !Main.isDisplayingMapView() || !getShortcut().isEvent(e))
+            return;
         if (Main.isDebugEnabled()) {
             Main.debug(getClass().getName()+" consuming event "+e);