Changeset 2124 in josm

Timestamp:

Sep 13, 2009 10:46:45 PM (4 years ago)

Author:

Gubaer

Message:

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

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmConnection.java (modified) (3 diffs)
• OsmServerChangesetReader.java (modified) (6 diffs)
• OsmServerReader.java (modified) (4 diffs)
• OsmServerUserInfoReader.java (modified) (1 diff)

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

@@ -14 +14 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.util.logging.Logger;
 
 import javax.swing.JCheckBox;
@@ -23 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
@@ -34 +34 @@
  */
 public class OsmConnection {
+    private static final Logger logger = Logger.getLogger(OsmConnection.class.getName());
 
     protected boolean cancel = false;

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

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -21 +22 @@
      */
     public OsmServerChangesetReader(){
+        setDoAuthenticate(false);
     }
 
@@ -32 +34 @@
     }
 
-
+    /**
+     * Queries a list
+     * @param query  the query specification. Must not be null.
+     * @param monitor a progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null
+     * @return the list of changesets read from the server
+     * @throws IllegalArgumentException thrown if query is null
+     * @throws OsmTransferException
+     */
     public List<Changeset> queryChangesets(ChangesetQuery query, ProgressMonitor monitor) throws OsmTransferException {
+        if (query == null)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "query"));
+        if (monitor == null) {
+            monitor = NullProgressMonitor.INSTANCE;
+        }
         try {
-            monitor.beginTask(tr("Reading changesetss..."));
+            monitor.beginTask(tr("Reading changesets..."));
             StringBuffer sb = new StringBuffer();
             sb.append("changesets?").append(query.getQueryString());
@@ -53 +67 @@
     }
 
+    /**
+     * Reads teh changeset with id <code>id</code> from the server
+     * 
+     * @param id  the changeset id. id > 0 required.
+     * @param monitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null
+     * @return the changeset read
+     * @throws OsmTransferException thrown if something goes wrong
+     * @throws IllegalArgumentException if id <= 0
+     */
     public Changeset readChangeset(long id, ProgressMonitor monitor) throws OsmTransferException {
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("parameter ''{0}'' > 0 expected. Got {1}", "id", id));
+        if (monitor == null) {
+            monitor = NullProgressMonitor.INSTANCE;
+        }
         try {
             monitor.beginTask(tr("Reading changeset {0} ...",id));
@@ -61 +89 @@
             if (in == null)
                 return null;
-            monitor.indeterminateSubTask(tr("Downloading changeset ..."));
+            monitor.indeterminateSubTask(tr("Downloading changeset {0} ...", id));
             List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
             if (changesets == null || changesets.isEmpty())
@@ -75 +103 @@
     }
 
+    /**
+     * not implemented yet
+     * 
+     * @param id
+     * @param monitor
+     * @return
+     * @throws OsmTransferException
+     */
     public Changeset downloadChangeset(long id, ProgressMonitor monitor) throws OsmTransferException {
         return null;
     }
-
 }

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;
+    }
 }

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

@@ -24 +24 @@
 
 public class OsmServerUserInfoReader extends OsmServerReader {
+
+    public OsmServerUserInfoReader() {
+        setDoAuthenticate(true);
+    }
 
     @Override