X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredThread.java;h=4fcba3177a5249aa967062537c690dfab78386df;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=88e6a71d2835c9384d42684fa278ba2699657dac;hpb=338fec5009a92d5cedc15612a13313bdb3f42756;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredThread.java b/src/jalview/ws/jws1/JPredThread.java index 88e6a71..4fcba31 100644 --- a/src/jalview/ws/jws1/JPredThread.java +++ b/src/jalview/ws/jws1/JPredThread.java @@ -1,19 +1,20 @@ /* - * 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.ws.jws1; @@ -197,7 +198,8 @@ class JPredThread extends JWS1Thread implements WSClientI { // Adjust input view for gaps // propagate insertions into profile - alcsel = ColumnSelection.propagateInsertions(profileseq, al, input); + alcsel = ColumnSelection.propagateInsertions(profileseq, al, + input); } } } @@ -255,7 +257,6 @@ class JPredThread extends JWS1Thread implements WSClientI } } - public JPredJob(Hashtable SequenceInfo, SequenceI seq, int[] delMap) { super(); @@ -268,7 +269,9 @@ class JPredThread extends JWS1Thread implements WSClientI sequence = new vamsas.objects.simple.Sequence(); sequence.setId(seq.getName()); sequence.setSeq(sq); - } else { + } + else + { errorMessage = "Sequence is too short to predict with JPred - need at least 20 amino acids."; } } @@ -286,10 +289,12 @@ class JPredThread extends JWS1Thread implements WSClientI } } } - String errorMessage=""; + + String errorMessage = ""; + public String getValidationMessages() { - return errorMessage+"\n"; + return errorMessage + "\n"; } } @@ -319,7 +324,9 @@ class JPredThread extends JWS1Thread implements WSClientI jobs = new WSJob[] { job }; job.setJobnum(0); - } else { + } + else + { wsInfo.appendProgressText(job.getValidationMessages()); } } @@ -337,7 +344,9 @@ class JPredThread extends JWS1Thread implements WSClientI { job }; OutputHeader = wsInfo.getProgressText(); job.setJobnum(0); - } else { + } + else + { wsInfo.appendProgressText(job.getValidationMessages()); } }