Changeset 8304 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-05-01T21:47:18+02:00 (10 years ago)

Author:

Don-vip

Message:

simplify URL encoding/decoding

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (3 diffs)
• OsmUrlToBounds.java (modified) (2 diffs)
• Utils.java (modified) (2 diffs)

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

@@ -27 +27 @@
 import java.io.InputStream;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -287 +284 @@
      *
      * (optional)
+     * @param archive zip file where the image is located
      * @return the current object, for convenience
      */
@@ -816 +814 @@
      */
     private static ImageResource getIfAvailableDataUrl(String url) {
-        try {
-            Matcher m = dataUrlPattern.matcher(url);
-            if (m.matches()) {
-                String mediatype = m.group(1);
-                String base64 = m.group(2);
-                String data = m.group(3);
-                byte[] bytes;
-                if (";base64".equals(base64)) {
-                    bytes = DatatypeConverter.parseBase64Binary(data);
-                } else {
-                    try {
-                        bytes = URLDecoder.decode(data, "UTF-8").getBytes(StandardCharsets.UTF_8);
-                    } catch (IllegalArgumentException ex) {
-                        Main.warn("Unable to decode URL data part: "+ex.getMessage() + " (" + data + ")");
-                        return null;
-                    }
-                }
-                if ("image/svg+xml".equals(mediatype)) {
-                    String s = new String(bytes, StandardCharsets.UTF_8);
-                    SVGDiagram svg = null;
-                    synchronized (getSvgUniverse()) {
-                        URI uri = getSvgUniverse().loadSVG(new StringReader(s), URLEncoder.encode(s, "UTF-8"));
-                        svg = getSvgUniverse().getDiagram(uri);
-                    }
-                    if (svg == null) {
-                        Main.warn("Unable to process svg: "+s);
-                        return null;
-                    }
-                    return new ImageResource(svg);
-                } else {
-                    try {
-                        // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
-                        // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
-                        // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
-                        Image img = read(new ByteArrayInputStream(bytes), false, true);
-                        return img == null ? null : new ImageResource(img);
-                    } catch (IOException e) {
-                        Main.warn("IOException while reading image: "+e.getMessage());
-                    }
-                }
-            }
-            return null;
-        } catch (UnsupportedEncodingException ex) {
-            throw new RuntimeException(ex.getMessage(), ex);
-        }
+        Matcher m = dataUrlPattern.matcher(url);
+        if (m.matches()) {
+            String mediatype = m.group(1);
+            String base64 = m.group(2);
+            String data = m.group(3);
+            byte[] bytes;
+            if (";base64".equals(base64)) {
+                bytes = DatatypeConverter.parseBase64Binary(data);
+            } else {
+                try {
+                    bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8);
+                } catch (IllegalArgumentException ex) {
+                    Main.warn("Unable to decode URL data part: "+ex.getMessage() + " (" + data + ")");
+                    return null;
+                }
+            }
+            if ("image/svg+xml".equals(mediatype)) {
+                String s = new String(bytes, StandardCharsets.UTF_8);
+                SVGDiagram svg = null;
+                synchronized (getSvgUniverse()) {
+                    URI uri = getSvgUniverse().loadSVG(new StringReader(s), Utils.encodeUrl(s));
+                    svg = getSvgUniverse().getDiagram(uri);
+                }
+                if (svg == null) {
+                    Main.warn("Unable to process svg: "+s);
+                    return null;
+                }
+                return new ImageResource(svg);
+            } else {
+                try {
+                    // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
+                    // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
+                    // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
+                    Image img = read(new ByteArrayInputStream(bytes), false, true);
+                    return img == null ? null : new ImageResource(img);
+                } catch (IOException e) {
+                    Main.warn("IOException while reading image: "+e.getMessage());
+                }
+            }
+        }
+        return null;
     }
 

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

@@ -6 +6 @@
 import java.awt.HeadlessException;
 import java.awt.Toolkit;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.Map;
@@ -26 +24 @@
             // a percent sign indicates an encoded URL (RFC 1738).
             if (url.contains("%")) {
-                url = URLDecoder.decode(url, "UTF-8");
-            }
-        } catch (UnsupportedEncodingException | IllegalArgumentException x) {
+                url = Utils.decodeUrl(url);
+            }
+        } catch (IllegalArgumentException x) {
             Main.error(x);
         }

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

@@ -25 +25 @@
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -1116 +1117 @@
                 sb.append(c);
             } else {
-                try {
-                    sb.append(URLEncoder.encode(c, "UTF-8"));
-                } catch (UnsupportedEncodingException ex) {
-                    throw new RuntimeException(ex);
-                }
+                sb.append(encodeUrl(c));
             }
         }
         return sb.toString();
+    }
+
+    /**
+     * Translates a string into <code>application/x-www-form-urlencoded</code>
+     * format. This method uses UTF-8 encoding scheme to obtain the bytes for unsafe
+     * characters.
+     *
+     * @param   s <code>String</code> to be translated.
+     * @return  the translated <code>String</code>.
+     * @see #decodeUrl(String)
+     * @since 8304
+     */
+    public static String encodeUrl(String s) {
+        final String enc = StandardCharsets.UTF_8.name();
+        try {
+            return URLEncoder.encode(s, enc);
+        } catch (UnsupportedEncodingException e) {
+            Main.error(e);
+            return null;
+        }
+    }
+
+    /**
+     * Decodes a <code>application/x-www-form-urlencoded</code> string.
+     * UTF-8 encoding is used to determine
+     * what characters are represented by any consecutive sequences of the
+     * form "<code>%<i>xy</i></code>".
+     *
+     * @param s the <code>String</code> to decode
+     * @return the newly decoded <code>String</code>
+     * @see #encodeUrl(String)
+     * @since 8304
+     */
+    public static String decodeUrl(String s) {
+        final String enc = StandardCharsets.UTF_8.name();
+        try {
+            return URLDecoder.decode(s, enc);
+        } catch (UnsupportedEncodingException e) {
+            Main.error(e);
+            return null;
+        }
     }