From: Charles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Date: Mon, 17 Nov 2014 13:47:12 +0000 (+0000)
Subject: Merge branch 'bug/JAL-1043_warning-dialog-not-shown-for-JABA-errors' into Release_2_8... 
X-Git-Tag: Jalview_2_9~140^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ab65c5e9ddda0ab52a0997caa874ec8fb0fafe84;hp=9f574631479f51a754c95dd73cc11992737f3ce3;p=jalview.git

Merge branch 'bug/JAL-1043_warning-dialog-not-shown-for-JABA-errors' into Release_2_8_2_Branch
---

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index 2eb484b..6cca61b 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -24,12 +24,15 @@
 package jalview.ws.jws2;
 
 import jalview.bin.Cache;
+import jalview.gui.Desktop;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
 import jalview.ws.jws2.jabaws2.Jws2InstanceFactory;
 
 import java.util.HashSet;
 import java.util.Set;
 
+import javax.swing.JOptionPane;
+
 import compbio.data.msa.Category;
 import compbio.data.msa.JABAService;
 import compbio.ws.client.Jws2Client;
@@ -131,8 +134,13 @@ public class JabaWsServerQuery implements Runnable
             // svccategories.toString());
 
           }
-        } catch (Exception ex)
+        } catch (javax.xml.ws.WebServiceException ex)
         {
+          JOptionPane
+                  .showInternalMessageDialog(
+                          Desktop.desktop,
+                          "Exception whilst trying to access the webservice registry:",
+                          "Webservice glitch", JOptionPane.WARNING_MESSAGE);
           System.err.println("Exception whilst trying to get at registry:");
           ex.printStackTrace();
           // if that failed, then we are probably working with a JABAWS1 server.
@@ -144,6 +152,10 @@ public class JabaWsServerQuery implements Runnable
             srv_set.add(srv);
           }
         }
+ catch (Exception ex)
+        {
+          ex.printStackTrace();
+        }
         for (Category cat : categories)
         {
           for (Services srv : cat.getServices())