Changeset 16955 in josm for trunk/src/org

Timestamp:

2020-08-29T07:53:14+02:00 (4 years ago)

Author:

simon04

Message:

see #19624 - use Utils.strip

Location:

trunk/src/org/openstreetmap/josm

Files:

• io/GeoJSONReader.java (modified) (2 diffs)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/GeoJSONReader.java

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -391 +392 @@
             try {
                 while ((line = reader.readLine()) != null) {
-                    line = line.replaceFirst(rs, "");
+                    line = Utils.strip(line, rs);
                     try (InputStream is = new ByteArrayInputStream(line.getBytes(StandardCharsets.UTF_8))) {
                         parse(is);

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -744 +744 @@
      */
     public static String strip(final String str) {
-        if (str == null || str.isEmpty()) {
-            return str;
-        }
         return strip(str, DEFAULT_STRIP);
     }