X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=bc775c63af1083cb7714efd23cec4c720d9bc813;hb=e3f8846ad3af97c5b26e09f7a4e3bcc901f758ca;hp=9afc70b2e54081427cc582eda8bbe9d0ad06c7bd;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git

diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java
index 9afc70b..bc775c6 100644
--- a/src/jalview/appletgui/PairwiseAlignPanel.java
+++ b/src/jalview/appletgui/PairwiseAlignPanel.java
@@ -1,6 +1,6 @@
 /*
- * 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.
  * 
@@ -20,15 +20,21 @@
  */
 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
 {
   Vector sequences = new Vector();
@@ -56,8 +62,8 @@ public class PairwiseAlignPanel extends Panel implements ActionListener
     }
     else
     {
-      seqs = ap.av.getSelectionGroup().getSequencesInOrder(
-              ap.av.getAlignment());
+      seqs = ap.av.getSelectionGroup()
+              .getSequencesInOrder(ap.av.getAlignment());
     }
 
     float scores[][] = new float[seqs.length][seqs.length];
@@ -89,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");
@@ -116,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);
         }
       }
 
@@ -164,8 +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(MessageManager
-            .getString("label.view_alignment_editor"));
+    viewInEditorButton.setLabel(
+            MessageManager.getString("label.view_alignment_editor"));
     viewInEditorButton.addActionListener(this);
     this.add(scrollPane, BorderLayout.CENTER);
     scrollPane.add(textarea);