Changeset 8390 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2015-05-18T02:14:30+02:00 (9 years ago)

Author:

Don-vip

Message:

Sonar - various performance improvements

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• AbstractPrimitive.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• OsmUtils.java (modified) (2 diffs)
• Relation.java (modified) (1 diff)
• TigerUtils.java (modified) (1 diff)
• history/History.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -435 +435 @@
 
         if (isIncomplete()) {
-            builder.append("I");
+            builder.append('I');
         }
         if (isModified()) {
-            builder.append("M");
+            builder.append('M');
         }
         if (isVisible()) {
-            builder.append("V");
+            builder.append('V');
         }
         if (isDeleted()) {
-            builder.append("D");
+            builder.append('D');
         }
         return builder.toString();

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -1285 +1285 @@
         if (isDisabled()) {
             if (isDisabledAndHidden()) {
-                builder.append("h");
+                builder.append('h');
             } else {
-                builder.append("d");
+                builder.append('d');
             }
         }
         if (isTagged()) {
-            builder.append("T");
+            builder.append('T');
         }
         if (hasDirectionKeys()) {
             if (reversedDirection()) {
-                builder.append("<");
+                builder.append('<');
             } else {
-                builder.append(">");
+                builder.append('>');
             }
         }

trunk/src/org/openstreetmap/josm/data/osm/OsmUtils.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -14 +14 @@
 public final class OsmUtils {
 
-    private OsmUtils() {
-        // Hide default constructor for utils classes
-    }
-
-    private static final List<String> TRUE_VALUES = new ArrayList<>(Arrays
-            .asList(new String[] { "true", "yes", "1", "on" }));
-    private static final List<String> FALSE_VALUES = new ArrayList<>(Arrays
-            .asList(new String[] { "false", "no", "0", "off" }));
-    private static final List<String> REVERSE_VALUES = new ArrayList<>(Arrays
-            .asList(new String[] { "reverse", "-1" }));
+    private static final Set<String> TRUE_VALUES = new HashSet<>(Arrays
+            .asList("true", "yes", "1", "on"));
+    private static final Set<String> FALSE_VALUES = new HashSet<>(Arrays
+            .asList("false", "no", "0", "off"));
+    private static final Set<String> REVERSE_VALUES = new HashSet<>(Arrays
+            .asList("reverse", "-1"));
 
     public static final String trueval = "yes";
     public static final String falseval = "no";
     public static final String reverseval = "-1";
+
+    private OsmUtils() {
+        // Hide default constructor for utils classes
+    }
 
     public static Boolean getOsmBoolean(String value) {

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -274 +274 @@
               .append(" version=")
               .append(getVersion())
-              .append(" ")
+              .append(' ')
               .append(getFlagsAsString())
               .append(" [");
         for (RelationMember rm:getMembers()) {
             result.append(OsmPrimitiveType.from(rm.getMember()))
-                  .append(" ")
+                  .append(' ')
                   .append(rm.getMember().getUniqueId())
                   .append(", ");
         }
         result.delete(result.length()-2, result.length())
-              .append("]")
-              .append("}");
+              .append("]}");
         return result.toString();
     }

trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java

@@ -60 +60 @@
         for (Object part : resultSet) {
             if (combined.length() > 0) {
-                combined.append(":");
+                combined.append(':');
             }
             combined.append(part);

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -341 +341 @@
             result.append(", versions=\n");
             for (HistoryOsmPrimitive v : versions) {
-                result.append("\t").append(v).append(",\n");
+                result.append('\t').append(v).append(",\n");
             }
         }
-        result.append("]");
+        result.append(']');
         return result.toString();
     }