X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2FFinder.java;h=96151d743f0c4782a7d864581f0ec934de5c36df;hb=85d8faf004199c5cc63773d7d4643143d16600da;hp=41478d68c25712a0cc9cb2e9ac26bf100fed0539;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/analysis/Finder.java b/src/jalview/analysis/Finder.java index 41478d6..96151d7 100644 --- a/src/jalview/analysis/Finder.java +++ b/src/jalview/analysis/Finder.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.analysis; @@ -84,7 +87,6 @@ public class Finder boolean found = false; int end = alignment.getHeight(); - // ///////////////////////////////////////////// if (selection != null) @@ -99,7 +101,7 @@ public class Finder while (!found && (seqIndex < end)) { seq = (Sequence) alignment.getSequenceAt(seqIndex); - + if ((selection != null && selection.getSize() > 0) && !selection.getSequences(null).contains(seq)) { @@ -121,9 +123,10 @@ public class Finder { searchResults.addResult(seq, res, res); hasResults = true; - //resIndex=seq.getLength(); + // resIndex=seq.getLength(); // seqIndex++; - if (!findAll) { + if (!findAll) + { found = true; break; }