Changeset 11386 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

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/preferences/display/ColorPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -277 +277 @@
         for (int i = 0; i < colors.getRowCount(); ++i) {
             String key = (String) colors.getValueAt(i, 0);
-            if (Main.pref.putColor(key, (Color) colors.getValueAt(i, 1))) {
-                if (key.startsWith("mappaint.")) {
-                    ret = true;
-                }
+            if (Main.pref.putColor(key, (Color) colors.getValueAt(i, 1)) && key.startsWith("mappaint.")) {
+                ret = true;
             }
         }