Changeset 8304 in josm for trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

Timestamp:

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

Author:

Don-vip

Message:

simplify URL encoding/decoding

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -11 +11 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.util.Collections;
@@ -185 +183 @@
     }
 
-    protected static String getUserUrl(String username) throws UnsupportedEncodingException {
-        return Main.getBaseUserUrl() + "/" +  URLEncoder.encode(username, "UTF-8").replaceAll("\\+", "%20");
+    protected static String getUserUrl(String username) {
+        return Main.getBaseUserUrl() + "/" +  Utils.encodeUrl(username).replaceAll("\\+", "%20");
     }
 
@@ -209 +207 @@
             }
             lblUser.setDescription(username);
-            try {
-                if (user != null && user != User.getAnonymous()) {
-                    lblUser.setUrl(getUserUrl(username));
-                } else {
-                    lblUser.setUrl(null);
-                }
-            } catch(UnsupportedEncodingException e) {
-                Main.error(e);
+            if (user != null && user != User.getAnonymous()) {
+                lblUser.setUrl(getUserUrl(username));
+            } else {
                 lblUser.setUrl(null);
             }
@@ -226 +219 @@
             } else {
                 lblUser.setDescription(username);
-                try {
-                    lblUser.setUrl(getUserUrl(username));
-                } catch(UnsupportedEncodingException e) {
-                    Main.error(e);
-                    lblUser.setUrl(null);
-                }
+                lblUser.setUrl(getUserUrl(username));
             }
             lblChangeset.setDescription(tr("none"));