Changeset 2124 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

Timestamp:

2009-09-13T22:46:45+02:00 (15 years ago)

Author:

Gubaer

Message:

See #3483: "Load list of changesets from the server" is broken for users with non-ASCII usernames

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerReader.java (modified) (4 diffs)

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

@@ -10 +10 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.CharacterCodingException;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.Inflater;
@@ -30 +31 @@
 
     private OsmApi api = OsmApi.getOsmApi();
+    private boolean doAuthenticate = false;
 
     /**
@@ -66 +68 @@
             }
 
+            try {
+                if (doAuthenticate) {
+                    addAuth(activeConnection);
+                }
+            } catch(CharacterCodingException e) {
+                System.err.println(tr("Error: failed to add authentication credentials to the connection."));
+                throw new OsmTransferException(e);
+            }
             if (Main.pref.getBoolean("osm-server.use-compression", true)) {
                 activeConnection.setRequestProperty("Accept-Encoding", "gzip, deflate");
@@ -122 +132 @@
     public abstract DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException;
 
+    /**
+     * Returns true if this reader is adding authentication credentials to the read
+     * request sent to the server.
+     * 
+     * @return true if this reader is adding authentication credentials to the read
+     * request sent to the server
+     */
+    public boolean isDoAuthenticate() {
+        return doAuthenticate;
+    }
+
+    /**
+     * Sets whether this reader adds authentication credentials to the read
+     * request sent to the server.
+     * 
+     * @param doAuthenticate  true if  this reader adds authentication credentials to the read
+     * request sent to the server
+     */
+    public void setDoAuthenticate(boolean doAuthenticate) {
+        this.doAuthenticate = doAuthenticate;
+    }
 }