X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPairwiseAlignPanel.java;h=66ceffea67b67f9a1577a3a07dc5c94098c96f5e;hb=0846d23b8e3bd33b2120a0f724299bf05c175f32;hp=f237e72a8eb5aad0860536a47252fd16dd321382;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java index f237e72..66ceffe 100755 --- a/src/jalview/gui/PairwiseAlignPanel.java +++ b/src/jalview/gui/PairwiseAlignPanel.java @@ -1,31 +1,35 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ 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.gui; -import java.util.*; -import java.awt.event.*; - -import jalview.analysis.*; -import jalview.datamodel.*; -import jalview.jbgui.*; +import jalview.analysis.AlignSeq; +import jalview.datamodel.Alignment; +import jalview.datamodel.Sequence; +import jalview.datamodel.SequenceI; +import jalview.jbgui.GPairwiseAlignPanel; import jalview.util.MessageManager; +import java.awt.event.ActionEvent; +import java.util.Vector; + /** * DOCUMENT ME! * @@ -95,13 +99,8 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel totscore = totscore + scores[i][j]; textarea.append(as.getOutput()); - seq = new Sequence(as.getS1().getName(), as.getAStr1(), as.getS1() - .getStart(), as.getS1().getEnd()); - sequences.add(seq); - - seq = new Sequence(as.getS2().getName(), as.getAStr2(), as.getS2() - .getStart(), as.getS2().getEnd()); - sequences.add(seq); + sequences.add(as.getAlignedSeq1()); + sequences.add(as.getAlignedSeq2()); } } @@ -149,7 +148,8 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel AlignFrame af = new AlignFrame(new Alignment(seq), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); - Desktop.addInternalFrame(af, MessageManager.getString("label.pairwise_aligned_sequences"), + Desktop.addInternalFrame(af, + MessageManager.getString("label.pairwise_aligned_sequences"), AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT); } }