Changeset 10300 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2016-05-30T01:17:28+02:00 (8 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/data

Files:

• AutosaveTask.java (modified) (1 diff)
• ProjectionBounds.java (modified) (1 diff)
• Version.java (modified) (1 diff)
• imagery/ImageryInfo.java (modified) (1 diff)
• notes/Note.java (modified) (1 diff)
• osm/SimplePrimitiveId.java (modified) (1 diff)
• validation/routines/DomainValidator.java (modified) (1 diff)
• validation/tests/ConditionalKeys.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -171 +171 @@
         while (true) {
             String filename = String.format("%1$s_%2$tY%2$tm%2$td_%2$tH%2$tM%2$tS%2$tL%3$s",
-                    layer.layerFileName, now, index == 0 ? "" : ("_" + index));
+                    layer.layerFileName, now, index == 0 ? "" : ('_' + Integer.toString(index)));
             File result = new File(autosaveDir, filename + '.' + Main.pref.get("autosave.extension", "osm"));
             try {

trunk/src/org/openstreetmap/josm/data/ProjectionBounds.java

@@ -106 +106 @@
     @Override
     public String toString() {
-        return "ProjectionBounds["+minEast+","+minNorth+","+maxEast+","+maxNorth+']';
+        return "ProjectionBounds["+minEast+','+minNorth+','+maxEast+','+maxNorth+']';
     }
 

trunk/src/org/openstreetmap/josm/data/Version.java

@@ -191 +191 @@
             s += " SVN";
         }
-        String result = "JOSM/1.5 ("+ s+' '+LanguageInfo.getJOSMLocaleCode()+")";
+        String result = "JOSM/1.5 ("+ s+' '+LanguageInfo.getJOSMLocaleCode()+')';
         if (includeOsDetails && Main.platform != null) {
             result += ' ' + Main.platform.getOSDescription();

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -863 +863 @@
     public String getExtendedUrl() {
         return imageryType.getTypeString() + (defaultMaxZoom != 0
-            ? "["+(defaultMinZoom != 0 ? Integer.toString(defaultMinZoom) + ',' : "")+defaultMaxZoom+"]" : "") + ':' + url;
+            ? ('['+(defaultMinZoom != 0 ? (Integer.toString(defaultMinZoom) + ',') : "")+defaultMaxZoom+"]") : "") + ':' + url;
     }
 

trunk/src/org/openstreetmap/josm/data/notes/Note.java

@@ -148 +148 @@
     @Override
     public String toString() {
-        return tr("Note") + " " + id + ": " + getFirstComment();
+        return tr("Note") + ' ' + id + ": " + getFirstComment();
     }
 }

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

@@ -57 +57 @@
     @Override
     public String toString() {
-        return type + " " + id;
+        return type.toString() + ' ' + id;
     }
 

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -1815 +1815 @@
                 case '\uFF0E': // fullwidth full stop
                 case '\uFF61': // halfwidth ideographic full stop
-                    return ascii + "."; // restore the missing stop
+                    return ascii + '.'; // restore the missing stop
                 default:
                     return ascii;

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -104 +104 @@
             // <restriction-value> @ <condition>[;<restriction-value> @ <condition>]
             final List<ConditionalValue> r = new ArrayList<>();
-            final Pattern part = Pattern.compile("([^@\\p{Space}][^@]*?)"
-                    + "\\s*@\\s*" + "(\\([^)\\p{Space}][^)]+?\\)|[^();\\p{Space}][^();]*?)\\s*");
-            final Matcher m = Pattern.compile("(" + part + ")(;\\s*" + part + ")*").matcher(value);
+            final String part = Pattern.compile("([^@\\p{Space}][^@]*?)"
+                    + "\\s*@\\s*" + "(\\([^)\\p{Space}][^)]+?\\)|[^();\\p{Space}][^();]*?)\\s*").toString();
+            final Matcher m = Pattern.compile('(' + part + ")(;\\s*" + part + ")*").matcher(value);
             if (!m.matches()) {
                 throw new ConditionalParsingException(tr("Does not match pattern ''restriction value @ condition''"));