Changeset 5772 in josm for trunk

Timestamp:

2013-03-13T00:29:53+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8505 - strip of trailing and leading whitespace characters of input URL (proper solution than String.trim(), see Utils.strip()) + unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Utils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/UtilsTest.java (added)

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -35 +35 @@
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -119 +120 @@
         if (dialog.getValue() != 1) return;
         remindUploadAddressHistory(uploadAddresses);
-        openUrl(layer.isSelected(), uploadAddresses.getText());
+        openUrl(layer.isSelected(), Utils.strip(uploadAddresses.getText()));
     }
     

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

@@ -573 +573 @@
         return connection;
     }
+    
+    /**
+     * An alternative to {@link String#trim()} to effectively remove all leading and trailing white characters, including Unicode ones.
+     * @see <a href="http://closingbraces.net/2008/11/11/javastringtrim/">Java’s String.trim has a strange idea of whitespace</a>
+     * @see <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4080617">JDK bug 4080617</a>  
+     * @param str The string to strip
+     * @return <code>str</code>, without leading and trailing characters, according to 
+     *         {@link Character#isWhitespace(char)} and {@link Character#isSpaceChar(char)}.
+     * @since 5772
+     */
+    public static String strip(String str) {
+        if (str == null || str.isEmpty()) {
+            return str;
+        }
+        int start = 0, end = str.length();
+        boolean leadingWhite = true;
+        while (leadingWhite && start < end) {
+            char c = str.charAt(start);
+            if (leadingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c))) {
+                start++;
+            }
+        }
+        boolean trailingWhite = true;
+        while (trailingWhite && end > start+1) {
+            char c = str.charAt(end-1);
+            if (trailingWhite = (Character.isWhitespace(c) || Character.isSpaceChar(c))) {
+                end--;
+            }
+        }
+        return str.substring(start, end);
+    }
 }