Merge remote-tracking branch 'origin/develop' into bug/JAL-2491

[jalview.git] / src / jalview / datamodel / CigarArray.java

diff --git a/src/jalview/datamodel/CigarArray.java b/src/jalview/datamodel/CigarArray.java
index ebc7cd1..aab82a1 100644 (file)
--- a/src/jalview/datamodel/CigarArray.java
+++ b/src/jalview/datamodel/CigarArray.java
@@ -20,6 +20,8 @@
  */
 package jalview.datamodel;
 
+import htsjdk.samtools.Cigar;
+
 import java.util.List;
 
 public class CigarArray extends CigarBase
@@ -85,20 +87,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();
@@ -343,8 +344,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);