X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=b190bbadcf61fbbe7530c199d01ca01fefd9a448;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=beec55b10bf4179e0fd3c0843b61eb85b321756a;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java old mode 100755 new mode 100644 index beec55b..b190bba --- a/src/jalview/appletgui/PairwiseAlignPanel.java +++ b/src/jalview/appletgui/PairwiseAlignPanel.java @@ -1,19 +1,20 @@ /* - * 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.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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.appletgui; @@ -24,6 +25,7 @@ import java.awt.event.*; import jalview.analysis.*; import jalview.datamodel.*; +import jalview.util.MessageManager; public class PairwiseAlignPanel extends Panel implements ActionListener { @@ -48,17 +50,18 @@ public class PairwiseAlignPanel extends Panel implements ActionListener if (ap.av.getSelectionGroup() == null) { - seqs = ap.av.alignment.getSequencesArray(); + seqs = ap.av.getAlignment().getSequencesArray(); } else { - seqs = ap.av.getSelectionGroup().getSequencesInOrder(ap.av.alignment); + seqs = ap.av.getSelectionGroup().getSequencesInOrder( + ap.av.getAlignment()); } float scores[][] = new float[seqs.length][seqs.length]; double totscore = 0; int count = ap.av.getSelectionGroup().getSize(); - String type = (ap.av.alignment.isNucleotide()) ? AlignSeq.DNA + String type = (ap.av.getAlignment().isNucleotide()) ? AlignSeq.DNA : AlignSeq.PEP; Sequence seq; @@ -159,7 +162,7 @@ public class PairwiseAlignPanel extends Panel implements ActionListener textarea.setFont(new java.awt.Font("Monospaced", 0, 12)); textarea.setText(""); viewInEditorButton.setFont(new java.awt.Font("Verdana", 0, 12)); - viewInEditorButton.setLabel("View in alignment editor"); + viewInEditorButton.setLabel(MessageManager.getString("label.view_alignment_editor")); viewInEditorButton.addActionListener(this); this.add(scrollPane, BorderLayout.CENTER); scrollPane.add(textarea);