Changeset 2641 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2009-12-16T18:58:04+01:00 (14 years ago)

Author:

Gubaer

Message:

new: supports system defined proxies if JOSM is started with -Djava.net.useSystemProxies=true
fixed #1641: JOSM doesn't allow for setting HTTP proxy user/password distrinct from OSM server user/password
fixed #2865: SOCKS Proxy Support
fixed #4182: Proxy Authentication

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• CredentialDialog.java (added)
• UploadPrimitivesTask.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -29 +29 @@
 import org.openstreetmap.josm.io.OsmApiPrimitiveGoneException;
 import org.openstreetmap.josm.io.OsmServerWriter;
+import org.openstreetmap.josm.io.OsmTransferCancelledException;
 import org.openstreetmap.josm.io.OsmTransferException;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -239 +240 @@
                     //
                     break;
+                } catch(OsmTransferCancelledException e) {
+                    uploadCancelled = true;
+                    return;
                 } catch(OsmApiPrimitiveGoneException e) {
                     // try to recover from  410 Gone