jabaws, not jaba

[jalview.git] / src / jalview / gui / WsPreferences.java

diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java
index 45654f2..8bf81bb 100644 (file)
--- a/src/jalview/gui/WsPreferences.java
+++ b/src/jalview/gui/WsPreferences.java
@@ -143,7 +143,7 @@ public class WsPreferences extends GWsPreferences
   private String editUrl(String initUrl, String title)
   {
     String url=initUrl;
-    URL foo;
+    URL foo=null;
     if (url==null)
     {
       url = "";
@@ -170,7 +170,14 @@ public class WsPreferences extends GWsPreferences
     }
     if (valid && resp==JOptionPane.OK_OPTION)
     {
-      return urltf.getText().trim();
+      int validate = JOptionPane.showInternalConfirmDialog(Desktop.desktop, null, "Validate JabaWS Server ?\n(Look in console output for results)", JOptionPane.YES_NO_OPTION);
+      if (validate == JOptionPane.OK_OPTION)
+      {
+        if (jalview.ws.jws2.Jws2Discoverer.testServiceUrl(foo)) 
+        {
+          return foo.toString();
+        }
+      }
     }
     return initUrl; 
   }
@@ -205,7 +212,6 @@ public class WsPreferences extends GWsPreferences
   {
     new Thread(new Runnable() {
 
-      @Override
       public void run()
       {
         updateWsMenuConfig(false);
@@ -221,7 +227,6 @@ public class WsPreferences extends GWsPreferences
     {
       new Thread(new Runnable() {
 
-        @Override
         public void run()
         {
           progressBar.setVisible(true);
@@ -237,7 +242,6 @@ public class WsPreferences extends GWsPreferences
     } else {
       new Thread(new Runnable() {
 
-        @Override
         public void run()
         {
           Desktop.instance.startServiceDiscovery(false);