Changeset 5366 in josm

Timestamp:

2012-07-25T20:45:18+02:00 (12 years ago)

Author:

Don-vip

Message:

URL-encode user name when querying changesets in order to download changesets of deleted OSM user accounts such as "huohw%5pqefhewq[ojmfq]w"

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/changeset/query/ChangesetQueryTask.java (modified) (3 diffs)
• io/ChangesetQuery.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java

@@ -10 +10 @@
 import java.util.Set;
 
+import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.ChangesetCache;
@@ -18 +20 @@
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.dialogs.changeset.ChangesetDownloadTask;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.ChangesetQuery;
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
@@ -93 +96 @@
         if (canceled) return;
         if (lastException != null) {
-            ExceptionUtil.explainException(lastException);
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                private final Component parent = progressMonitor != null ? progressMonitor.getWindowParent() : null;
+                @Override
+                public void run() {
+                    JOptionPane.showMessageDialog(
+                            parent != null ? parent : Main.parent,
+                            ExceptionUtil.explainException(lastException),
+                            tr("Errors during download"),
+                            JOptionPane.ERROR_MESSAGE);
+                }
+            });
             return;
         }

trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.text.MessageFormat;
@@ -233 +235 @@
             sb.append("user").append("=").append(uid);
         } else if (userName != null) {
-            sb.append("display_name").append("=").append(userName);
+            try {
+                sb.append("display_name").append("=").append(URLEncoder.encode(userName, "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
         }
         if (bounds != null) {
@@ -268 +274 @@
         }
         return sb.toString();
+    }
+
+    @Override
+    public String toString() {
+        return getQueryString();
     }