Changeset 6523 in josm for trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

Timestamp:

2013-12-24T20:26:51+01:00 (10 years ago)

Author:

Don-vip

Message:

Ask user to change proxy settings when proxy errors occur at startup (useful when a laptop is often used between two locations with different proxy settings)

File:

• trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (modified) (3 diffs)

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

@@ -12 +12 @@
 import java.net.URI;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
 
 import org.openstreetmap.josm.Main;
@@ -56 +59 @@
     private InetSocketAddress socksProxySocketAddress;
     private ProxySelector delegate;
+
+    private final Set<String> errorResources = new HashSet<String>();
+    private final Set<String> errorMessages = new HashSet<String>();
 
     /**
@@ -134 +140 @@
     public void connectFailed(URI uri, SocketAddress sa, IOException ioe) {
         // Just log something. The network stack will also throw an exception which will be caught somewhere else
-        //
         Main.error(tr("Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}", sa.toString(), uri.toString(), ioe.toString()));
+        // Remember errors to give a friendly user message asking to review proxy configuration
+        errorResources.add(uri.toString());
+        errorMessages.add(ioe.toString());
+    }
+
+    /**
+     * Returns the set of current proxy resources that failed to be retrieved.
+     * @return the set of current proxy resources that failed to be retrieved
+     * @since 6523
+     */
+    public final Set<String> getErrorResources() {
+        return new TreeSet<String>(errorResources);
+    }
+
+    /**
+     * Returns the set of current proxy error messages.
+     * @return the set of current proxy error messages
+     * @since 6523
+     */
+    public final Set<String> getErrorMessages() {
+        return new TreeSet<String>(errorMessages);
+    }
+
+    /**
+     * Clear the sets of failed resources and error messages.
+     * @since 6523
+     */
+    public final void clearErrors() {
+        errorResources.clear();
+        errorMessages.clear();
+    }
+
+    /**
+     * Determines if proxy errors have occured.
+     * @return {@code true} if errors have occured, {@code false} otherwise.
+     * @since 6523
+     */
+    public final boolean hasErrors() {
+        return !errorResources.isEmpty();
     }