X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=4d586899c525fd5f7330952aa68c38dd328ff47f;hb=2c6965c96b057296981403f3394a4c180ed60ea4;hp=56a3794e41346a750178a1460ddeb8fbef0b44f7;hpb=1a506ea005a3c4aba6108199ee6d2122e7528ea9;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 56a3794..4d58689 100755 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.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.5) + * 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; @@ -285,6 +284,7 @@ public class APopupMenu extends java.awt.PopupMenu implements } } } + // TODO: add group link menu entry here if (seq != null) { seqMenu.setLabel(seq.getName()); @@ -586,26 +586,25 @@ public class APopupMenu extends java.awt.PopupMenu implements return; } - - int rsize=0,gSize = sg.getSize(); - SequenceI[] rseqs,seqs = new SequenceI[gSize]; - SequenceFeature[] tfeatures,features = new SequenceFeature[gSize]; - + int rsize = 0, gSize = sg.getSize(); + SequenceI[] rseqs, seqs = new SequenceI[gSize]; + SequenceFeature[] tfeatures, features = new SequenceFeature[gSize]; + for (int i = 0; i < gSize; i++) { int start = sg.getSequenceAt(i).findPosition(sg.getStartRes()); int end = sg.findEndRes(sg.getSequenceAt(i)); - if (start<=end) + if (start <= end) { seqs[rsize] = sg.getSequenceAt(i); - features[rsize] = new SequenceFeature(null, null, null, start, end, - "Jalview"); + features[rsize] = new SequenceFeature(null, null, null, start, + end, "Jalview"); rsize++; } } rseqs = new SequenceI[rsize]; tfeatures = new SequenceFeature[rsize]; - System.arraycopy(seqs,0,rseqs, 0, rsize); + System.arraycopy(seqs, 0, rseqs, 0, rsize); System.arraycopy(features, 0, tfeatures, 0, rsize); features = tfeatures; seqs = rseqs;