X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignmentPanel.java;h=15b2198448b2267de76abe2c4b04997d2a20d92f;hb=153dd62dc91da13ae732600e6ea55ddbe15eab39;hp=874b552f443310726d10179c9ed99ad066cdd68b;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java index 874b552..15b2198 100755 --- a/src/jalview/appletgui/AlignmentPanel.java +++ b/src/jalview/appletgui/AlignmentPanel.java @@ -1,20 +1,19 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1) - * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) + * Copyright (C) 2010 J Procter, AM Waterhouse, 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 file is part of Jalview. * - * 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. + * 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. * - * 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 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 . */ package jalview.appletgui; @@ -229,34 +228,36 @@ public class AlignmentPanel extends Panel implements AdjustmentListener { seqPanel.seqCanvas.highlightSearchResults(results); } + /** - * scroll the view to show the position of the highlighted - * region in results (if any) + * scroll the view to show the position of the highlighted region in results + * (if any) + * * @param results */ public void scrollToPosition(SearchResults results) { // do we need to scroll the panel? - if (results != null && results.getSize()>0) + if (results != null && results.getSize() > 0) { int seqIndex = av.alignment.findIndex(results); - if (seqIndex==-1) + if (seqIndex == -1) { return; } SequenceI seq = av.alignment.getSequenceAt(seqIndex); - int [] r = results.getResults(seq, seq.getStart(), seq.getEnd()); - if (r==null) + int[] r = results.getResults(seq, seq.getStart(), seq.getEnd()); + if (r == null) { return; } int start = r[0]; int end = r[1]; - if (start<0) + if (start < 0) { return; } - if (end==seq.getEnd()) + if (end == seq.getEnd()) { return; }