X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationLabels.java;h=e16867a4c0d9389ee6614cc6ec625068a1a235dd;hb=cfa90577b4ddcb2e163a9bac0b2786d45de57933;hp=07a5ad9a71af7f88d8280f9a5e456eb1d84cb23b;hpb=5e8ec77d921ff2d604811e5e4ba7e9211b0f48de;p=jalview.git diff --git a/src/jalview/gui/AnnotationLabels.java b/src/jalview/gui/AnnotationLabels.java index 07a5ad9..e16867a 100755 --- a/src/jalview/gui/AnnotationLabels.java +++ b/src/jalview/gui/AnnotationLabels.java @@ -52,7 +52,6 @@ import java.awt.image.BufferedImage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.List; import java.util.regex.Pattern; import javax.swing.JCheckBoxMenuItem; @@ -953,13 +952,12 @@ public class AnnotationLabels extends JPanel implements MouseListener, } int[] alignmentStartEnd = new int[] { 0, ds.getWidth() - 1 }; - List hiddenCols = av.getAlignment().getHiddenColumns() - .getHiddenRegions(); - if (hiddenCols != null) + if (av.hasHiddenColumns()) { - alignmentStartEnd = av.getAlignment().getVisibleStartAndEndIndex( - hiddenCols); + alignmentStartEnd = av.getAlignment().getHiddenColumns() + .getVisibleStartAndEndIndex(av.getAlignment().getWidth()); } + String output = new FormatAdapter().formatSequences(FileFormat.Fasta, seqs, omitHidden, alignmentStartEnd); @@ -970,8 +968,8 @@ public class AnnotationLabels extends JPanel implements MouseListener, if (av.hasHiddenColumns()) { - av.getAlignment().getHiddenColumns() - .getHiddenColumnsCopy(hiddenColumns); + hiddenColumns = av.getAlignment().getHiddenColumns() + .getHiddenColumnsCopy(); } Desktop.jalviewClipboard = new Object[] { seqs, ds, // what is the dataset