Changeset 11385 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2016-12-13T01:57:37+01:00 (7 years ago)

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• PowerLines.java (modified) (1 diff)
• TagChecker.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/PowerLines.java

@@ -65 +65 @@
                 for (Node n : w.getNodes()) {
                     if (!isPowerTower(n)) {
-                        if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n)) {
-                            if (!w.isFirstLastNode(n) || !isPowerStation(n)) {
-                                error = TestError.builder(this, Severity.WARNING, POWER_LINES)
-                                        .message(tr("Missing power tower/pole within power line"))
-                                        .primitives(n);
-                                errorNode = n;
-                            }
+                        if (!isPowerAllowed(n) && IN_DOWNLOADED_AREA.test(n) && (!w.isFirstLastNode(n) || !isPowerStation(n))) {
+                            error = TestError.builder(this, Severity.WARNING, POWER_LINES)
+                                    .message(tr("Missing power tower/pole within power line"))
+                                    .primitives(n);
+                            errorNode = n;
                         }
                     } else if (fixValue == null) {

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -466 +466 @@
                 withErrors.put(p, "HTML");
             }
-            if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null) {
-                if (!isTagIgnored(key, value)) {
-                    if (!isKeyInPresets(key)) {
-                        String prettifiedKey = harmonizeKey(key);
-                        String fixedKey = harmonizedKeys.get(prettifiedKey);
-                        if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
-                            // misspelled preset key
-                            final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
-                                    .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
-                                    .primitives(p);
-                            if (p.hasKey(fixedKey)) {
-                                errors.add(error.build());
-                            } else {
-                                errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
-                            }
-                            withErrors.put(p, "WPK");
+            if (checkValues && key != null && value != null && !value.isEmpty() && presetsValueData != null && !isTagIgnored(key, value)) {
+                if (!isKeyInPresets(key)) {
+                    String prettifiedKey = harmonizeKey(key);
+                    String fixedKey = harmonizedKeys.get(prettifiedKey);
+                    if (fixedKey != null && !"".equals(fixedKey) && !fixedKey.equals(key)) {
+                        // misspelled preset key
+                        final TestError.Builder error = TestError.builder(this, Severity.WARNING, MISSPELLED_KEY)
+                                .message(tr("Misspelled property key"), marktr("Key ''{0}'' looks like ''{1}''."), key, fixedKey)
+                                .primitives(p);
+                        if (p.hasKey(fixedKey)) {
+                            errors.add(error.build());
                         } else {
-                            errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
-                                    .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
-                                    .primitives(p)
-                                    .build());
-                            withErrors.put(p, "UPK");
+                            errors.add(error.fix(() -> new ChangePropertyKeyCommand(p, key, fixedKey)).build());
                         }
-                    } else if (!isTagInPresets(key, value)) {
-                        // try to fix common typos and check again if value is still unknown
-                        String fixedValue = harmonizeValue(prop.getValue());
-                        Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
-                        if (possibleValues.containsKey(fixedValue)) {
-                            final String newKey = possibleValues.get(fixedValue);
-                            // misspelled preset value
-                            errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE)
-                                    .message(tr("Misspelled property value"),
-                                            marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''."), prop.getValue(), key, fixedValue)
-                                    .primitives(p)
-                                    .fix(() -> new ChangePropertyCommand(p, key, newKey))
-                                    .build());
-                            withErrors.put(p, "WPV");
-                        } else {
-                            // unknown preset value
-                            errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
-                                    .message(tr("Presets do not contain property value"),
-                                            marktr("Value ''{0}'' for key ''{1}'' not in presets."), prop.getValue(), key)
-                                    .primitives(p)
-                                    .build());
-                            withErrors.put(p, "UPV");
-                        }
+                        withErrors.put(p, "WPK");
+                    } else {
+                        errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+                                .message(tr("Presets do not contain property key"), marktr("Key ''{0}'' not in presets."), key)
+                                .primitives(p)
+                                .build());
+                        withErrors.put(p, "UPK");
                     }
-                }
-            }
-            if (checkFixmes && key != null && value != null && !value.isEmpty()) {
-                if ((value.toLowerCase(Locale.ENGLISH).contains("fixme")
-                        || value.contains("check and delete")
-                        || key.contains("todo") || key.toLowerCase(Locale.ENGLISH).contains("fixme"))
-                        && !withErrors.contains(p, "FIXME")) {
-                    errors.add(TestError.builder(this, Severity.OTHER, FIXME)
-                            .message(tr("FIXMES"))
-                            .primitives(p)
-                            .build());
-                    withErrors.put(p, "FIXME");
-                }
-            }
-        }
+                } else if (!isTagInPresets(key, value)) {
+                    // try to fix common typos and check again if value is still unknown
+                    String fixedValue = harmonizeValue(prop.getValue());
+                    Map<String, String> possibleValues = getPossibleValues(presetsValueData.get(key));
+                    if (possibleValues.containsKey(fixedValue)) {
+                        final String newKey = possibleValues.get(fixedValue);
+                        // misspelled preset value
+                        errors.add(TestError.builder(this, Severity.WARNING, MISSPELLED_VALUE)
+                                .message(tr("Misspelled property value"),
+                                        marktr("Value ''{0}'' for key ''{1}'' looks like ''{2}''."), prop.getValue(), key, fixedValue)
+                                .primitives(p)
+                                .fix(() -> new ChangePropertyCommand(p, key, newKey))
+                                .build());
+                        withErrors.put(p, "WPV");
+                    } else {
+                        // unknown preset value
+                        errors.add(TestError.builder(this, Severity.OTHER, INVALID_VALUE)
+                                .message(tr("Presets do not contain property value"),
+                                        marktr("Value ''{0}'' for key ''{1}'' not in presets."), prop.getValue(), key)
+                                .primitives(p)
+                                .build());
+                        withErrors.put(p, "UPV");
+                    }
+                }
+            }
+            if (checkFixmes && key != null && value != null && !value.isEmpty() && isFixme(key, value) && !withErrors.contains(p, "FIXME")) {
+               errors.add(TestError.builder(this, Severity.OTHER, FIXME)
+                .message(tr("FIXMES"))
+                .primitives(p)
+                .build());
+               withErrors.put(p, "FIXME");
+            }
+        }
+    }
+
+    private static boolean isFixme(String key, String value) {
+        return key.toLowerCase(Locale.ENGLISH).contains("fixme") || key.contains("todo")
+          || value.toLowerCase(Locale.ENGLISH).contains("fixme") || value.contains("check and delete");
     }