X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=bc775c63af1083cb7714efd23cec4c720d9bc813;hb=6c118f968f6e8f726fdbb6ce6c24d870b22419bb;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..bc775c6
--- a/src/jalview/appletgui/PairwiseAlignPanel.java
+++ b/src/jalview/appletgui/PairwiseAlignPanel.java
@@ -1,30 +1,39 @@
 /*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.appletgui;
 
-import java.util.*;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.analysis.*;
-import jalview.datamodel.*;
+import jalview.analysis.AlignSeq;
+import jalview.datamodel.Alignment;
+import jalview.datamodel.Sequence;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Panel;
+import java.awt.ScrollPane;
+import java.awt.TextArea;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Vector;
 
 public class PairwiseAlignPanel extends Panel implements ActionListener
 {
@@ -49,17 +58,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;
 
@@ -85,25 +95,20 @@ public class PairwiseAlignPanel extends Panel implements ActionListener
         totscore = totscore + scores[i][j];
 
         textarea.append(as.getOutput());
-        seq = new Sequence(as.getS1().getName(), as.getAStr1(), as.getS1()
-                .getStart(), as.getS1().getEnd());
-        sequences.addElement(seq);
-
-        seq = new Sequence(as.getS2().getName(), as.getAStr2(), as.getS2()
-                .getStart(), as.getS2().getEnd());
-        sequences.addElement(seq);
+        sequences.add(as.getAlignedSeq1());
+        sequences.add(as.getAlignedSeq1());
       }
     }
 
     if (count > 2)
     {
-      System.out
-              .println("Pairwise alignment scaled similarity score matrix\n");
+      System.out.println(
+              "Pairwise alignment scaled similarity score matrix\n");
 
       for (int i = 0; i < count; i++)
       {
-        jalview.util.Format.print(System.out, "%s \n", ("" + i) + " "
-                + seqs[i].getName());
+        jalview.util.Format.print(System.out, "%s \n",
+                ("" + i) + " " + seqs[i].getName());
       }
 
       System.out.println("\n");
@@ -112,8 +117,8 @@ public class PairwiseAlignPanel extends Panel implements ActionListener
       {
         for (int j = 0; j < i; j++)
         {
-          jalview.util.Format.print(System.out, "%7.3f", scores[i][j]
-                  / totscore);
+          jalview.util.Format.print(System.out, "%7.3f",
+                  scores[i][j] / totscore);
         }
       }
 
@@ -160,7 +165,8 @@ 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);