X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fanalysis%2FDnaTest.java;h=d2fa99a98609ceb3f3fd85e4a79ffe07d75d33ae;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=2e21d9c0e2c2c4daee93ad176325b6a74d15b39a;hpb=fe28b89504fd1b76cc9d9631184aa6e065d7e243;p=jalview.git diff --git a/test/jalview/analysis/DnaTest.java b/test/jalview/analysis/DnaTest.java index 2e21d9c..d2fa99a 100644 --- a/test/jalview/analysis/DnaTest.java +++ b/test/jalview/analysis/DnaTest.java @@ -28,7 +28,7 @@ import jalview.api.AlignViewportI; import jalview.datamodel.AlignedCodon; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; -import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import jalview.gui.AlignViewport; @@ -133,7 +133,7 @@ public class DnaTest AlignmentI alf = new FormatAdapter().readFile( JAL_1312_example_align_fasta, DataSourceType.PASTE, FileFormat.Fasta); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(alf, cs); Dna dna = new Dna(av, new int[] { 0, alf.getWidth() - 1 }); AlignmentI translated = dna.translateCdna(); @@ -157,7 +157,7 @@ public class DnaTest int vwidth = 15; for (int ipos = 0; ipos + vwidth < alf.getWidth(); ipos += vwidth) { - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); if (ipos > 0) { cs.hideColumns(0, ipos - 1); @@ -188,7 +188,7 @@ public class DnaTest { AlignmentI alf = new FormatAdapter().readFile(fasta, DataSourceType.PASTE, FileFormat.Fasta); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(alf, cs); Dna dna = new Dna(av, new int[] { 0, alf.getWidth() - 1 }); AlignmentI translated = dna.translateCdna(); @@ -208,7 +208,7 @@ public class DnaTest { AlignmentI alf = new FormatAdapter().readFile(fasta, DataSourceType.PASTE, FileFormat.Fasta); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); cs.hideColumns(6, 14); // hide codons 3/4/5 cs.hideColumns(24, 35); // hide codons 9-12 cs.hideColumns(177, 191); // hide codons 60-64 @@ -296,7 +296,7 @@ public class DnaTest */ AlignmentI cdna = new AlignmentGenerator(true) .generate(12, 8, 97, 5, 5); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(cdna, cs); Dna dna = new Dna(av, new int[] { 0, cdna.getWidth() - 1 }); AlignmentI translated = dna.translateCdna(); @@ -542,7 +542,7 @@ public class DnaTest assertEquals(seqDs, al.getSequenceAt(0).getDatasetSequence() .getSequenceAsString()); - ColumnSelection cs = new ColumnSelection(); + HiddenColumns cs = new HiddenColumns(); AlignViewportI av = new AlignViewport(al, cs); Dna testee = new Dna(av, new int[] { 0, al.getWidth() - 1 }); AlignmentI reversed = testee.reverseCdna(false);