Changeset 8390 in josm for trunk/src/org/openstreetmap/josm/io/imagery

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/io/imagery

Files:

• ImageryReader.java (modified) (2 diffs)
• WMSImagery.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -263 +263 @@
                     Integer val = null;
                     try {
-                        val = Integer.parseInt(accumulator.toString());
+                        val = Integer.valueOf(accumulator.toString());
                     } catch(NumberFormatException e) {
                         val = null;
@@ -304 +304 @@
                     Integer tileSize = null;
                     try {
-                        tileSize  = Integer.parseInt(accumulator.toString());
+                        tileSize = Integer.valueOf(accumulator.toString());
                     } catch(NumberFormatException e) {
                         tileSize = null;

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -81 +81 @@
         }
         StringBuilder a = new StringBuilder(serviceUrl.getProtocol());
-        a.append("://")
-         .append(serviceUrl.getHost());
+        a.append("://").append(serviceUrl.getHost());
         if (serviceUrl.getPort() != -1) {
-            a.append(":")
-             .append(serviceUrl.getPort());
-        }
-        a.append(serviceUrl.getPath())
-         .append("?");
+            a.append(':').append(serviceUrl.getPort());
+        }
+        a.append(serviceUrl.getPath()).append('?');
         if (serviceUrl.getQuery() != null) {
             a.append(serviceUrl.getQuery());
             if (!serviceUrl.getQuery().isEmpty() && !serviceUrl.getQuery().endsWith("&")) {
-                a.append("&");
+                a.append('&');
             }
         }
@@ -150 +147 @@
             while ((line = br.readLine()) != null) {
                 ba.append(line);
-                ba.append("\n");
+                ba.append('\n');
             }
         }