X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws1%2FJPredClient.java;h=b429c97588868d8e3f9eab6c6658525214f3657d;hb=a45774ee31d9f35d4eff46d54d7deab719afb092;hp=8fff195e84c72f7038543e4035e96aa1330e0e71;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git diff --git a/src/jalview/ws/jws1/JPredClient.java b/src/jalview/ws/jws1/JPredClient.java index 8fff195..b429c97 100644 --- a/src/jalview/ws/jws1/JPredClient.java +++ b/src/jalview/ws/jws1/JPredClient.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -99,33 +99,7 @@ public class JPredClient extends WS1Client if (viewonly) { - int[] viscontigs = alview.getVisibleContigs(); - int spos = 0; - int i = 0; - if (viscontigs != null) - { - // Construct the delMap - mapping from the positions within the input to - // Jnet to the contigs in the original sequence - - delMap = new int[seq.getEnd() - seq.getStart() + 1]; - int gapMap[] = seq.gapMap(); - for (int contig = 0; contig < viscontigs.length; contig += 2) - { - - while (spos < gapMap.length && gapMap[spos] < viscontigs[contig]) - { - spos++; - } - while (spos < gapMap.length - && gapMap[spos] <= viscontigs[contig + 1]) - { - delMap[i++] = spos++; - } - } - int tmap[] = new int[i]; - System.arraycopy(delMap, 0, tmap, 0, i); - delMap = tmap; - } + delMap = alview.getVisibleContigMapFor(seq.gapMap()); } if (msa && msf.length > 1) {