Changeset 10300 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2016-05-30T01:17:28+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - Performance - Method passes constant String of length 1 to character overridden method + add unit tests/javadoc

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• Cascade.java (modified) (1 diff)
• mapcss/Condition.java (modified) (2 diffs)
• mapcss/LiteralExpression.java (modified) (2 diffs)
• mapcss/Selector.java (modified) (1 diff)
• styleelement/LabelCompositionStrategy.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/Cascade.java

@@ -130 +130 @@
             } catch (NumberFormatException e) {
                 if (Main.isDebugEnabled()) {
-                    Main.debug("'"+o+"' cannot be converted to float");
+                    Main.debug('\'' + (String) o + "' cannot be converted to float");
                 }
             }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -743 +743 @@
         private final Expression e;
 
+        /**
+         * Constructs a new {@code ExpressionFactory}
+         * @param e expression
+         */
         public ExpressionCondition(Expression e) {
             this.e = e;
@@ -755 +759 @@
         @Override
         public String toString() {
-            return "[" + e + ']';
+            return '[' + e.toString() + ']';
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/LiteralExpression.java

@@ -9 +9 @@
 /**
  * Simple literal value, that does not depend on other expressions.
+ * @since 5705
  */
 public class LiteralExpression implements Expression {
     private final Object literal;
 
+    /**
+     * Constructs a new {@code LiteralExpression}.
+     * @param literal literal
+     */
     public LiteralExpression(Object literal) {
         CheckParameterUtil.ensureParameterNotNull(literal);
@@ -28 +33 @@
             return Arrays.toString((float[]) literal);
         }
-        return "<" + literal + '>';
+        return '<' + literal.toString() + '>';
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -435 +435 @@
         @Override
         public String toString() {
-            return left + " " + (ChildOrParentSelectorType.PARENT.equals(type) ? '<' : '>') + link + ' ' + right;
+            return left.toString() + ' ' + (ChildOrParentSelectorType.PARENT.equals(type) ? '<' : '>') + link + ' ' + right;
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -269 +269 @@
         @Override
         public String toString() {
-            return "{" + getClass().getSimpleName() +'}';
+            return '{' + getClass().getSimpleName() + '}';
         }