X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FCigarArray.java;h=837a10bd3942df6240aa9ebc2e98492cae1f5ea1;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=e578f0b74c87ebfa3626987e903472c8614a464b;hpb=25aaaa87042b3f507ad4348120df7dd073182759;p=jalview.git diff --git a/src/jalview/datamodel/CigarArray.java b/src/jalview/datamodel/CigarArray.java index e578f0b..837a10b 100644 --- a/src/jalview/datamodel/CigarArray.java +++ b/src/jalview/datamodel/CigarArray.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * 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. * @@ -85,20 +85,19 @@ public class CigarArray extends CigarBase * @param columnSelection * @param selectionGroup */ - public CigarArray(AlignmentI alignment, ColumnSelection columnSelection, + public CigarArray(AlignmentI alignment, HiddenColumns hidden, SequenceGroup selectionGroup) { this(constructSeqCigarArray(alignment, selectionGroup)); constructFromAlignment(alignment, - columnSelection != null ? columnSelection.getHiddenColumns() + hidden != null ? hidden.getHiddenRegions() : null, selectionGroup); } private static int[] _calcStartEndBounds(AlignmentI alignment, SequenceGroup selectionGroup) { - int[] startend = new int[] - { 0, 0, 0 }; + int[] startend = new int[] { 0, 0, 0 }; if (selectionGroup != null) { startend[0] = selectionGroup.getSize(); @@ -219,7 +218,7 @@ public class CigarArray extends CigarBase } /** - * @see Cigar.getSequenceAndDeletions + * @see CigarBase.getSequenceAndDeletions * @param GapChar * char * @return Object[][] @@ -343,8 +342,11 @@ public class CigarArray extends CigarBase delpos = new java.util.Vector(); } int delstart = cursor, delend = cursor + range[i] - 1; // inclusive - delpos.addElement(new int[] - { vcursor + offset, range[i] }); // index of right hand column after + delpos.addElement(new int[] { vcursor + offset, range[i] }); // index of + // right + // hand + // column + // after // hidden region boundary offset += range[i] - 1; // shift in visible column coordinates System.arraycopy(operation, i + 1, operation, i, length - i);