Changeset 19261 in josm for trunk/src

Timestamp:

2024-11-25T23:08:52+01:00 (2 weeks ago)

Author:

taylor.smock

Message:

See #24014: Add multiline and normalize attributes to preset xsd

normalize="false" will prevent all whitespace normalization while
normalize="true" + multiline="true" will strip start and end whitespace and
inner whitespace that is not newlines.

The primary reason for this change is ​osmwiki:Key:inscription which can have
newlines in order to match the inscription.

This does not modify UI elements to support multiline editing.

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/tagging/presets/items/Text.java (modified) (3 diffs)
• gui/tagging/presets/items/TextItem.java (modified) (1 diff)
• tools/Utils.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java

@@ -14 +14 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import javax.swing.AbstractButton;
@@ -48 +49 @@
  */
 public class Text extends KeyedItem {
+    private static final Pattern MULTILINE_WHITESPACE_PATTERN = Pattern.compile("[\\s&&[^\n]]+");
 
     private static int auto_increment_selected; // NOSONAR
@@ -241 +243 @@
         }
 
-        v = Utils.removeWhiteSpaces(v);
+        if (this.normalize) {
+            if (this.multiline) {
+                v = Utils.removeWhiteSpaces(MULTILINE_WHITESPACE_PATTERN, v);
+            } else {
+                v = Utils.removeWhiteSpaces(v);
+            }
+        }
 
         if (!"false".equals(use_last_as_default) || auto_increment != null) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/TextItem.java

@@ -23 +23 @@
     /** The context used for translating {@link #text} */
     public String text_context; // NOSONAR
+
+    /** {@code true} if the value is a multiline value */
+    public boolean multiline; // NOSONAR
+    /** {@code true} if the value should be normalized */
+    public boolean normalize = true; // NOSONAR
 
     /** The localized version of {@link #text} */

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

@@ -821 +821 @@
      */
     public static String removeWhiteSpaces(String s) {
+        return removeWhiteSpaces(WHITE_SPACES_PATTERN, s);
+    }
+
+    /**
+     * Removes leading, trailing, and multiple inner whitespaces from the given string, to be used as a key or value.
+     * @param s The string
+     * @param whitespaces The regex for whitespaces to remove outside the leading and trailing whitespaces (see {@link #strip(String)})
+     * @return The string without leading, trailing or multiple inner whitespaces
+     * @since 19261
+     */
+    public static String removeWhiteSpaces(Pattern whitespaces, String s) {
         if (isEmpty(s)) {
             return s;
         }
-        return strip(s).replaceAll("\\s+", " ");
+        return whitespaces.matcher(strip(s)).replaceAll(" ");
     }