Changeset 6805 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-02-03T18:07:45+01:00 (10 years ago)

Author:

bastiK

Message:

fixed #9674 - Support for escaping special characters

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -5 +5 @@
 
 import java.awt.Color;
+import java.io.UnsupportedEncodingException;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -12 +13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -524 +526 @@
             return s == null ? null : s.replace(target, replacement);
         }
+
+        /**
+         * Percent-encode a string. (See https://en.wikipedia.org/wiki/Percent-encoding)
+         * This is especially useful for data urls, e.g.
+         * <code>icon-image: concat("data:image/svg+xml,", URL_encode("<svg>...</svg>"));</code>
+         * @param s arbitrary string
+         * @return the encoded string
+         */
+        public static String URL_encode(String s) {
+            try {
+                return s == null ? null : URLEncoder.encode(s, "UTF-8");
+            } catch (UnsupportedEncodingException ex) {
+                throw new RuntimeException();
+            }
+        }
     }