X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FPairwiseAlignPanel.java;h=bc775c63af1083cb7714efd23cec4c720d9bc813;hb=afffa24481a7d3cb65ae41e0948c16a5f490f302;hp=a377892c3588b94b2c34c9a227e349ce05e1ef97;hpb=87ea83af3e209a8c3a4b19f9530a9c05b4541148;p=jalview.git
diff --git a/src/jalview/appletgui/PairwiseAlignPanel.java b/src/jalview/appletgui/PairwiseAlignPanel.java
index a377892..bc775c6 100644
--- a/src/jalview/appletgui/PairwiseAlignPanel.java
+++ b/src/jalview/appletgui/PairwiseAlignPanel.java
@@ -1,31 +1,40 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 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.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();
@@ -53,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];
@@ -86,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");
@@ -113,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);
}
}
@@ -161,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(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);