X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=589a66438769a1b984f5e9491d16bb1e721b08f4;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=c122b3f31396fbf0ab54eeb1c79876a785281fb7;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java old mode 100755 new mode 100644 index c122b3f..589a664 --- a/src/jalview/appletgui/PairwiseAlignPanel.java +++ b/src/jalview/appletgui/PairwiseAlignPanel.java @@ -1,20 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4) - * Copyright (C) 2008 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Copyright (C) 2014 The Jalview Authors * - * 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. + * + * 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 this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * 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; @@ -25,6 +25,7 @@ import java.awt.event.*; import jalview.analysis.*; import jalview.datamodel.*; +import jalview.util.MessageManager; public class PairwiseAlignPanel extends Panel implements ActionListener { @@ -49,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; @@ -160,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);