Changeset 16643 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2020-06-14T20:19:59+02:00 (4 years ago)

Author:

simon04

Message:

see #19334 - ​https://errorprone.info/bugpattern/StringSplitter

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (3 diffs)
• AutosaveTask.java (modified) (1 diff)
• OsmDataLayer.java (modified) (1 diff)
• gpx/GpxDrawHelper.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1128 +1128 @@
             StringBuilder line = new StringBuilder();
             StringBuilder ret = new StringBuilder();
-            for (String s: text.split(" ")) {
+            for (String s: text.split(" ", -1)) {
                 if (g.getFontMetrics().stringWidth(line.toString() + s) > tileSource.getTileSize()) {
                     ret.append(line).append('\n');
@@ -1139 +1139 @@
         }
         int offset = 0;
-        for (String s: textToDraw.split("\n")) {
+        for (String s: textToDraw.split("\n", -1)) {
             g.setColor(Color.black);
             g.drawString(s, x + 1, y + offset + 1);
@@ -1632 +1632 @@
             if (tileLoader instanceof TMSCachedTileLoader) {
                 int offset = 200;
-                for (String part: ((TMSCachedTileLoader) tileLoader).getStats().split("\n")) {
+                for (String part: ((TMSCachedTileLoader) tileLoader).getStats().split("\n", -1)) {
                     offset += 15;
                     myDrawString(g, tr("Cache stats: {0}", part), 50, offset);

trunk/src/org/openstreetmap/josm/gui/layer/AutosaveTask.java

@@ -392 +392 @@
                             String jvmId = reader.readLine();
                             if (jvmId != null) {
-                                String pid = jvmId.split("@")[0];
+                                String pid = jvmId.split("@", -1)[0];
                                 skipFile = jvmPerfDataFileExists(pid);
                             }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -797 +797 @@
                             .orElse(k);
                     if (k.startsWith("extension")) {
-                        String[] chain = k.split(":");
+                        String[] chain = k.split(":", -1);
                         if (chain.length >= 3 && "segment".equals(chain[2])) {
                             segExts.addFlat(chain, v);

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -1017 +1017 @@
 
                 // use comma as separator
-                String[] column = line.split(",");
+                String[] column = line.split(",", -1);
 
                 // empty or comment line