Changeset 13541 in josm for trunk/src

Timestamp:

2018-03-18T23:36:36+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #16104 - better support of space characters in values for tags copy/paste

File:

• trunk/src/org/openstreetmap/josm/tools/TextTagParser.java (modified) (3 diffs)

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

@@ -36 +36 @@
         private boolean esc;
         private final StringBuilder s = new StringBuilder(200);
+        private String valueStops = "\n\r\t";
         private int pos;
         private final String data;
@@ -46 +47 @@
         public TextAnalyzer(String text) {
             pos = 0;
-            data = text;
+            data = Utils.strip(text);
             n = data.length();
+            // fix #1604: allow space characters as value stops for single-line input only
+            if (data.indexOf('\r') == -1 && data.indexOf('\n') == -1) {
+                valueStops += " ";
+            }
         }
 
@@ -73 +78 @@
                     break;
                 }
-                v = parseString("\n\r\t ");
+                v = parseString(valueStops);
                 tags.put(k, v);
             }