Changeset 16643 in josm for trunk/src/org/openstreetmap/josm/data/projection

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/data/projection

Files:

• CustomProjection.java (modified) (3 diffs)
• ProjectionCLI.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -358 +358 @@
 
         Pattern keyPattern = Pattern.compile("\\+(?<key>[a-zA-Z0-9_]+)(=(?<value>.*))?");
-        String[] parts = Utils.WHITE_SPACES_PATTERN.split(trimmedPref);
+        String[] parts = Utils.WHITE_SPACES_PATTERN.split(trimmedPref, -1);
         for (String part : parts) {
             Matcher m = keyPattern.matcher(part);
@@ -511 +511 @@
      */
     public Datum parseToWGS84(String paramList, Ellipsoid ellps) throws ProjectionConfigurationException {
-        String[] numStr = paramList.split(",");
+        String[] numStr = paramList.split(",", -1);
 
         if (numStr.length != 3 && numStr.length != 7)
@@ -621 +621 @@
      */
     public static Bounds parseBounds(String boundsStr) throws ProjectionConfigurationException {
-        String[] numStr = boundsStr.split(",");
+        String[] numStr = boundsStr.split(",", -1);
         if (numStr.length != 4)
             throw new ProjectionConfigurationException(tr("Unexpected number of arguments for parameter ''+bounds'' (must be 4)"));

trunk/src/org/openstreetmap/josm/data/projection/ProjectionCLI.java

@@ -166 +166 @@
 
     private EastNorth parseEastNorth(String s, ToDoubleFunction<String> parser) {
-        String[] en = s.split("[;, ]+");
+        String[] en = s.split("[;, ]+", -1);
         if (en.length != 2)
             throw new IllegalArgumentException(tr("Expected two coordinates, separated by white space, found {0} in ''{1}''", en.length, s));