X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPairwiseAlignPanel.java;h=f33b2d64f6b0c27d44a22b34e0ce187cee67ae7f;hb=747167089ecf8d6afc70d417f5a20352e029bd95;hp=d0817946f6cccae0b1725ace72a4358f8da85e5d;hpb=281aa090976818b388374b7aae780a29a8864b96;p=jalview.git diff --git a/src/jalview/gui/PairwiseAlignPanel.java b/src/jalview/gui/PairwiseAlignPanel.java index d081794..f33b2d6 100755 --- a/src/jalview/gui/PairwiseAlignPanel.java +++ b/src/jalview/gui/PairwiseAlignPanel.java @@ -21,13 +21,13 @@ package jalview.gui; import jalview.analysis.AlignSeq; +import jalview.api.AlignViewportI; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentView; import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.jbgui.GPairwiseAlignPanel; import jalview.util.MessageManager; -import jalview.viewmodel.AlignmentViewport; import java.awt.event.ActionEvent; import java.util.Vector; @@ -43,7 +43,7 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel private static final String DASHES = "---------------------\n"; - AlignmentViewport av; + AlignViewportI av; Vector sequences; @@ -51,28 +51,27 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel * Creates a new PairwiseAlignPanel object. * * @param viewport - * DOCUMENT ME! */ - public PairwiseAlignPanel(AlignmentViewport viewport) + public PairwiseAlignPanel(AlignViewportI viewport) { super(); this.av = viewport; - sequences = new Vector(); + sequences = new Vector<>(); SequenceGroup selectionGroup = viewport.getSelectionGroup(); boolean isSelection = selectionGroup != null && selectionGroup.getSize() > 0; AlignmentView view = viewport.getAlignmentView(isSelection); // String[] seqStrings = viewport.getViewAsString(true); - String[] seqStrings = view.getSequenceStrings(viewport - .getGapCharacter()); + String[] seqStrings = view + .getSequenceStrings(viewport.getGapCharacter()); SequenceI[] seqs; if (isSelection) { - seqs = (SequenceI[]) view.getAlignmentAndHiddenColumns(viewport - .getGapCharacter())[0]; + seqs = (SequenceI[]) view + .getAlignmentAndHiddenColumns(viewport.getGapCharacter())[0]; } else { @@ -109,8 +108,7 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel } first = false; as.printAlignment(System.out); - scores[i][j] = as.getMaxScore() - / as.getASeq1().length; + scores[i][j] = as.getMaxScore() / as.getASeq1().length; totscore = totscore + scores[i][j]; textarea.append(as.getOutput()); @@ -140,8 +138,8 @@ public class PairwiseAlignPanel extends GPairwiseAlignPanel for (int i = 0; i < seqs.length; i++) { - System.out.println(String.format("%3d %s", i + 1, - seqs[i].getDisplayId(true))); + System.out.println( + String.format("%3d %s", i + 1, seqs[i].getDisplayId(true))); } /*