X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;h=1a96464cf455083f7dcdd0c876b896c91901f8cd;hb=aced09c4feeaf3406269442c14e54abeeb4cad81;hp=aba0f927c5aa6c3e06549cbb6647811808f43a10;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index aba0f92..1a96464 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -1,19 +1,22 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * * Jalview 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 3 of the License, or (at your option) any later version. - * + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. + * * Jalview 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 Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.jws1; @@ -28,6 +31,7 @@ import jalview.analysis.*; import jalview.bin.*; import jalview.datamodel.*; import jalview.gui.*; +import jalview.util.MessageManager; public class JPredClient extends WS1Client { @@ -140,8 +144,7 @@ public class JPredClient extends WS1Client { if (!msa && msf.length > 1) { - throw new Error( - "Implementation Error! Multiple single sequence prediction jobs are not yet supported."); + throw new Error(MessageManager.getString("error.implementation_error_multiple_single_sequence_prediction_jobs_not_supported")); } String altitle = getPredictionName(WebServiceName) + " for " @@ -281,7 +284,7 @@ public class JPredClient extends WS1Client private WebserviceInfo setWebService() { WebServiceName = "JNetWS"; - WebServiceJobTitle = "JNet secondary structure prediction"; + WebServiceJobTitle = MessageManager.getString("label.jnet_secondary_structure_prediction"); WebServiceReference = "\"Cuff J. A and Barton G.J (2000) Application of " + "multiple sequence alignment profiles to improve protein secondary structure prediction, " + "Proteins 40:502-511\"."; @@ -308,12 +311,11 @@ public class JPredClient extends WS1Client } catch (Exception ex) { JOptionPane.showMessageDialog(Desktop.desktop, - "The Secondary Structure Prediction Service named " - + WebServiceName + " at " + WsURL - + " couldn't be located.", "Internal Jalview Error", + MessageManager.formatMessage("label.secondary_structure_prediction_service_couldnt_be_located", new String[]{WebServiceName,WsURL}), + MessageManager.getString("label.internal_jalview_error"), JOptionPane.WARNING_MESSAGE); - wsInfo.setProgressText("Serious! " + WebServiceName - + " Service location failed\nfor URL :" + WsURL + "\n" + wsInfo.setProgressText(MessageManager.formatMessage("label.secondary_structure_prediction_service_couldnt_be_located", new String[]{WebServiceName,WsURL}) + + "\n" + ex.getMessage()); wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_SERVERERROR);