From 0f0a0d9ba37fc99de5fddb6dae4059d81e1d4e3e Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Tue, 16 May 2006 09:32:56 +0000
Subject: [PATCH] added popup warning when proxy settings must be configured.

---
 src/jalview/ws/Discoverer.java |   24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/jalview/ws/Discoverer.java b/src/jalview/ws/Discoverer.java
index 557c7a5..f30cced 100755
--- a/src/jalview/ws/Discoverer.java
+++ b/src/jalview/ws/Discoverer.java
@@ -34,6 +34,7 @@ import ext.vamsas.*;
 import java.util.Vector;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+import javax.swing.JOptionPane;
 
 public class Discoverer
     extends Thread implements Runnable
@@ -210,12 +211,23 @@ public class Discoverer
       jalview.bin.Cache.log.debug("Discovering services using " + location);
       shs = locateWebService(location).getServices();
     }
-    catch (Exception e)
-    {
-      jalview.bin.Cache.log.debug("No Discovery service at " +
-                         location);
-      jalview.bin.Cache.log.debug(e);
-
+    catch (org.apache.axis.AxisFault f) {
+      // JBPNote - should do this a better way!
+      if (f.getFaultReason().indexOf("(407)")>-1) {
+        if (jalview.gui.Desktop.desktop!=null)
+          JOptionPane.showMessageDialog(jalview.gui.Desktop.desktop, "Please set up your proxy settings in the 'Connections' tab of the Preferences window",
+                                      "Proxy Authorization Failed",
+                                      JOptionPane.WARNING_MESSAGE);
+      } else {
+        jalview.bin.Cache.log.warn("No Discovery service at " +
+                                   location);
+        jalview.bin.Cache.log.debug("Axis Fault", f);
+      }
+    }
+    catch (Exception e) {
+      jalview.bin.Cache.log.warn("No Discovery service at " +
+                                 location);
+      jalview.bin.Cache.log.debug("Discovery Service General Exception", e);
     }
     if ( (shs != null) && shs.getServices().length > 0)
     {
-- 
1.7.10.2