From: jprocter Date: Fri, 10 Jun 2005 07:27:03 +0000 (+0000) Subject: removed exception name from server error state (to not alarm the casual user). X-Git-Tag: Release_2_0~75 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4eeaf2d61f7513947bd8c3a5988623ad29a8ce7a;p=jalview.git 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 --- 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); allowedServerExceptions = 0; jobComplete = false; - wsInfo.appendProgressText("Failed to submit the prediction: " + - e.toString() + "\nJust close the window\n"); + + wsInfo.appendProgressText("Failed to submit the prediction.\n" + +"It is most likely that there is a problem with the server.\n" + +"Just close the window\n"); System.err.println( - "JPredWS Client: Failed to submit the prediction\n" + + "JPredWS Client: Failed to submit the prediction (Probably a server error - see below)\n" + e.toString() + "\n"); // e.printStackTrace(); TODO: JBPNote DEBUG diff --git a/src/jalview/ws/MsaWSClient.java b/src/jalview/ws/MsaWSClient.java index b5e7938..94e19e7 100755 --- 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 +/* +* 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 */ package jalview.ws; @@ -40,8 +40,8 @@ import javax.xml.namespace.QName; public class MsaWSClient extends WSClient { - /** - * server is a WSDL2Java generated stub for an archetypal MsaWSI service. + /** + * server is a WSDL2Java generated stub for an archetypal MsaWSI service. */ ext.vamsas.MuscleWS server; @@ -284,12 +284,13 @@ public class MsaWSClient extends WSClient { // TODO: JBPNote catch timeout or other fault types explicitly // For unexpected errors System.err.println(WebServiceName + - " Client: Failed to submit the sequences for alignment.\n" + - WsURL + " : " + e.toString() + "\n"); + "Client: Failed to submit the sequences for alignment (probably a server side problem)\n" + + "When contacting Server:"+WsURL + "\n" + e.toString() + "\n"); this.allowedServerExceptions = 0; wsInfo.setStatus(wsInfo.STATE_STOPPED_SERVERERROR); - wsInfo.appendProgressText("Server problems! " + e.toString() + - "\nFailed to submit sequences for alignment. Just close the window\n"); + wsInfo.appendProgressText("Failed to submit sequences for alignment.\n" + + "It is most likely that there is a problem with the server.\n" + + "Just close the window\n"); // e.printStackTrace(); // TODO: JBPNote DEBUG }