Changeset 19101 in josm for trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java

Timestamp:

2024-06-11T23:53:20+02:00 (4 months ago)

Author:

taylor.smock

Message:

Cleanup some new PMD warnings from PMD 7.x

I haven't updated to PMD 7.x in ivy/maven yet since I still have 83 PMD violations
to go through, and I don't know (yet) if any of them were supposed to be ignored
by the xpath expressions in tools/pmd/josm-ruleset.xml.

I may re-enable some of the PMD checks I've temporarily disabled prior to committing
the update for PMD.

Additionally cleanup some SonarLint issues in the modified files.

File:

• trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java

@@ -62 +62 @@
     @Override
     public boolean isValid(TemplateEngineDataProvider dataProvider) {
-        if (special && SPECIAL_VALUE_EVERYTHING.equals(variableName))
-            return true;
-        else
-            return dataProvider.getTemplateValue(variableName, special) != null;
+        return (special && SPECIAL_VALUE_EVERYTHING.equals(variableName))
+            || dataProvider.getTemplateValue(variableName, special) != null;
     }
 
@@ -94 +92 @@
             return false;
         Variable other = (Variable) obj;
-        if (special != other.special)
-            return false;
-        if (variableName == null) {
-            if (other.variableName != null)
-                return false;
-        } else if (!variableName.equals(other.variableName))
-            return false;
-        return true;
+        return this.special == other.special && Objects.equals(this.variableName, other.variableName);
     }
 }