Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.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/gui/tagging/presets/items/Combo.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -85 +85 @@
             // all items were unset (and so is default)
             originalValue = lhm.get("");
-            if ("force".equals(use_last_as_default) && LAST_VALUES.containsKey(key) && !presetInitiallyMatches) {
+            if (!presetInitiallyMatches && "force".equals(use_last_as_default) && LAST_VALUES.containsKey(key)) {
                 combobox.setSelectedItem(lhm.get(LAST_VALUES.get(key)));
             } else {