Changeset 8846 in josm for trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java

Timestamp:

2015-10-10T01:40:42+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib - minor performance improvements:

• Method passes constant String of length 1 to character overridden method
• Method needlessly boxes a boolean constant
• Method uses iterator().next() on a List to get the first item
• Method converts String to boxed primitive using excessive boxing
• Method converts String to primitive using excessive boxing
• Method creates array using constants
• Class defines List based fields but uses them like Sets

File:

• trunk/src/org/openstreetmap/josm/tools/template_engine/Tokenizer.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import java.util.Arrays;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 public class Tokenizer {
@@ -36 +37 @@
         @Override
         public String toString() {
-            return type + (text != null ? " " + text : "");
+            return type + (text != null ? ' ' + text : "");
         }
     }
@@ -42 +43 @@
     public enum TokenType { CONDITION_START, VARIABLE_START, CONTEXT_SWITCH_START, END, PIPE, APOSTROPHE, TEXT, EOF }
 
-    private final List<Character> specialCharaters = Arrays.asList(new Character[] {'$', '?', '{', '}', '|', '\'', '!'});
+    private final Set<Character> specialCharaters = new HashSet<>(Arrays.asList(new Character[] {'$', '?', '{', '}', '|', '\'', '!'}));
 
     private final String template;