removed exception name from server error state (to not alarm the casual user).

diff --git a/src/jalview/ws/JPredClient.java b/src/jalview/ws/JPredClient.java
index 3711db0..fefb74c 100755 (executable)
--- a/src/jalview/ws/JPredClient.java
+++ b/src/jalview/ws/JPredClient.java
@@ -222,10 +222,12 @@ public class JPredClient extends WSClient {
                 wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);\r
                 allowedServerExceptions = 0;\r
                 jobComplete = false;\r
-                wsInfo.appendProgressText("Failed to submit the prediction: " +\r
-                    e.toString() + "\nJust close the window\n");\r
+\r
+                wsInfo.appendProgressText("Failed to submit the prediction.\n"\r
+                                          +"It is most likely that there is a problem with the server.\n"\r
+                                          +"Just close the window\n");\r
                 System.err.println(\r
-                    "JPredWS Client: Failed to submit the prediction\n" +\r
+                    "JPredWS Client: Failed to submit the prediction (Probably a server error - see below)\n" +\r
                     e.toString() + "\n");\r
 \r
                 // e.printStackTrace(); TODO: JBPNote DEBUG\r

diff --git a/src/jalview/ws/MsaWSClient.java b/src/jalview/ws/MsaWSClient.java
index b5e7938..94e19e7 100755 (executable)
--- a/src/jalview/ws/MsaWSClient.java
+++ b/src/jalview/ws/MsaWSClient.java
@@ -1,20 +1,20 @@
-/*
-* Jalview - A Sequence Alignment Editor and Viewer
-* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+/*\r
+* Jalview - A Sequence Alignment Editor and Viewer\r
+* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+*\r
+* This program is free software; you can redistribute it and/or\r
+* modify it under the terms of the GNU General Public License\r
+* as published by the Free Software Foundation; either version 2\r
+* of the License, or (at your option) any later version.\r
+*\r
+* This program is distributed in the hope that it will be useful,\r
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+* GNU General Public License for more details.\r
+*\r
+* You should have received a copy of the GNU General Public License\r
+* along with this program; if not, write to the Free Software\r
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
 */\r
 package jalview.ws;\r
 \r
@@ -40,8 +40,8 @@ import javax.xml.namespace.QName;
 \r
 \r
 public class MsaWSClient extends WSClient {\r
-    /**
- * server is a WSDL2Java generated stub for an archetypal MsaWSI service.
+    /**\r
+ * server is a WSDL2Java generated stub for an archetypal MsaWSI service.\r
  */\r
     ext.vamsas.MuscleWS server;\r
 \r
@@ -284,12 +284,13 @@ public class MsaWSClient extends WSClient {
                 // TODO: JBPNote catch timeout or other fault types explicitly\r
                 // For unexpected errors\r
                 System.err.println(WebServiceName +\r
-                    " Client: Failed to submit the sequences for alignment.\n" +\r
-                    WsURL + " : " + e.toString() + "\n");\r
+                    "Client: Failed to submit the sequences for alignment (probably a server side problem)\n"\r
+                    + "When contacting Server:"+WsURL + "\n" + e.toString() + "\n");\r
                 this.allowedServerExceptions = 0;\r
                 wsInfo.setStatus(wsInfo.STATE_STOPPED_SERVERERROR);\r
-                wsInfo.appendProgressText("Server problems! " + e.toString() +\r
-                    "\nFailed to submit sequences for alignment. Just close the window\n");\r
+                wsInfo.appendProgressText("Failed to submit sequences for alignment.\n"\r
+                    + "It is most likely that there is a problem with the server.\n"\r
+                    + "Just close the window\n");\r
 \r
                 // e.printStackTrace(); // TODO: JBPNote DEBUG\r
             }\r