Changeset 11929 in josm

Timestamp:

2017-04-16T14:50:24+02:00 (8 years ago)

Author:

Don-vip

Message:

PMD - disable "InefficientEmptyStringCheck"

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java (modified) (2 diffs)
• tools/pmd/josm-ruleset.xml (modified) (1 diff)

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

@@ -95 +95 @@
             condition = parseExpression(CONDITION_WITH_APOSTROPHES_END_TOKENS);
             check(TokenType.APOSTROPHE);
-            if (searchExpression.getText().trim().isEmpty()) {
+            String searchText = searchExpression.getText().trim();
+            if (searchText.isEmpty()) {
                 result.getEntries().add(condition);
             } else {
                 try {
                     result.getEntries().add(new SearchExpressionCondition(
-                            SearchCompiler.compile(searchExpression.getText()), condition));
+                            SearchCompiler.compile(searchText), condition));
                 } catch (SearchCompiler.ParseError e) {
                     throw new ParseError(searchExpression.getPosition(), e);
@@ -125 +126 @@
         check(TokenType.APOSTROPHE);
         ContextSwitchTemplate result;
-        if (searchExpression.getText().trim().isEmpty())
+        String searchText = searchExpression.getText().trim();
+        if (searchText.isEmpty())
             throw new ParseError(tr("Expected search expression"));
         else {
             try {
-                Match match = SearchCompiler.compile(searchExpression.getText());
+                Match match = SearchCompiler.compile(searchText);
                 result = new ContextSwitchTemplate(match, template, searchExpression.getPosition());
             } catch (SearchCompiler.ParseError e) {

trunk/tools/pmd/josm-ruleset.xml

@@ -32 +32 @@
         <exclude name="StringToString"/>
         <exclude name="UselessStringValueOf"/>
+        <exclude name="InefficientEmptyStringCheck"/>
   </rule>
   <rule ref="rulesets/java/typeresolution.xml">