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

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

Location:

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

Files:

• DatasetConsistencyTest.java (modified) (2 diffs)
• Node.java (modified) (1 diff)
• OsmUtils.java (modified) (1 diff)
• QuadBuckets.java (modified) (2 diffs)
• RelationMemberData.java (modified) (1 diff)
• Tag.java (modified) (2 diffs)
• Way.java (modified) (1 diff)
• WaySegment.java (modified) (1 diff)
• history/HistoryOsmPrimitive.java (modified) (2 diffs)
• visitor/BoundingXYVisitor.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)

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

@@ -37 +37 @@
         errorCount++;
         if (errorCount <= MAX_ERRORS) {
-            writer.println("[" + type + "] " + String.format(message, args));
+            writer.println('[' + type + "] " + String.format(message, args));
         }
     }
@@ -187 +187 @@
         if (Main.isDebugEnabled()) {
             StackTraceElement item = Thread.currentThread().getStackTrace()[2];
-            String operation = getClass().getSimpleName() + "." + item.getMethodName();
+            String operation = getClass().getSimpleName() + '.' + item.getMethodName();
             long elapsedTime = System.currentTimeMillis() - startTime;
             Main.debug(tr("Test ''{0}'' completed in {1}",

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

@@ -275 +275 @@
     public String toString() {
         String coorDesc = isLatLonKnown() ? "lat="+lat+",lon="+lon : "";
-        return "{Node id=" + getUniqueId() + " version=" + getVersion() + " " + getFlagsAsString() + " "  + coorDesc+"}";
+        return "{Node id=" + getUniqueId() + " version=" + getVersion() + ' ' + getFlagsAsString() + ' '  + coorDesc+'}';
     }
 

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

@@ -73 +73 @@
                 : null;
         if (p == null) {
-            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation/area, but got '" + x[0] + "'");
+            throw new IllegalArgumentException("Expecting n/node/w/way/r/relation/area, but got '" + x[0] + '\'');
         }
         for (final Map.Entry<String, String> i : TextTagParser.readTagsFromText(x[1]).entrySet()) {

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

@@ -80 +80 @@
         @Override
         public String toString() {
-            return super.toString() + "[" + level + "]: " + bbox();
+            return super.toString() + '[' + level + "]: " + bbox();
         }
 
@@ -361 +361 @@
 
             if (!canRemove()) {
-                abort("attempt to remove non-empty child: " + this.content + " " + Arrays.toString(this.getChildren()));
+                abort("attempt to remove non-empty child: " + this.content + ' ' + Arrays.toString(this.getChildren()));
             }
 

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

@@ -36 +36 @@
     @Override
     public String toString() {
-        return (memberType != null ? memberType.getAPIName() : "undefined") + " " + memberId;
+        return (memberType != null ? memberType.getAPIName() : "undefined") + ' ' + memberId;
     }
 

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

@@ -112 +112 @@
             return new Tag(x[0], x[1]);
         } else {
-            throw new IllegalArgumentException("'" + s + "' does not contain '='");
+            throw new IllegalArgumentException('\'' + s + "' does not contain '='");
         }
     }
@@ -118 +118 @@
     @Override
     public String toString() {
-        return key + "=" + value;
+        return key + '=' + value;
     }
 

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

@@ -331 +331 @@
     public String toString() {
         String nodesDesc = isIncomplete() ? "(incomplete)" : "nodes=" + Arrays.toString(nodes);
-        return "{Way id=" + getUniqueId() + " version=" + getVersion()+ " " + getFlagsAsString()  + " " + nodesDesc + "}";
+        return "{Way id=" + getUniqueId() + " version=" + getVersion()+ ' ' + getFlagsAsString() + ' ' + nodesDesc + '}';
     }
 

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

@@ -94 +94 @@
     @Override
     public String toString() {
-        return "WaySegment [way=" + way.getUniqueId() + ", lowerIndex=" + lowerIndex + "]";
+        return "WaySegment [way=" + way.getUniqueId() + ", lowerIndex=" + lowerIndex + ']';
     }
 }

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

@@ -238 +238 @@
         if (get(key) != null)
             return get(key);
-        key = "name:" + Locale.getDefault().getLanguage() + "_" + Locale.getDefault().getCountry();
+        key = "name:" + Locale.getDefault().getLanguage() + '_' + Locale.getDefault().getCountry();
         if (get(key) != null)
             return get(key);
@@ -278 +278 @@
                 + (user != null ? "user=" + user + ", " : "") + "changesetId="
                 + changesetId
-                + "]";
+                + ']';
     }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

@@ -181 +181 @@
     @Override
     public String toString() {
-        return "BoundingXYVisitor["+bounds+"]";
+        return "BoundingXYVisitor["+bounds+']';
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1729 +1729 @@
                 System.err.println("; phase 2 (draw): " + Utils.getDurationString(timeFinished - timePhase1) +
                     "; total: " + Utils.getDurationString(timeFinished - timeStart) +
-                    " (scale: " + circum + " zoom level: " + Selector.GeneralSelector.scale2level(circum) + ")");
+                    " (scale: " + circum + " zoom level: " + Selector.GeneralSelector.scale2level(circum) + ')');
             }