JAL-2674 testing

[jalview.git] / src / jalview / analysis / Dna.java

diff --git a/src/jalview/analysis/Dna.java b/src/jalview/analysis/Dna.java
index a6fe541..d534c8f 100644 (file)
--- a/src/jalview/analysis/Dna.java
+++ b/src/jalview/analysis/Dna.java
@@ -71,6 +71,10 @@ public class Dna
 
   private final AlignmentI dataset;
 
+  private ShiftList vismapping;
+
+  private int[] startcontigs;
+
   /*
    * Working variables for the translation.
    * 
@@ -101,6 +105,45 @@ public class Dna
     this.annotations = viewport.getAlignment().getAlignmentAnnotation();
     this.dnaWidth = viewport.getAlignment().getWidth();
     this.dataset = viewport.getAlignment().getDataset();
+    initContigs();
+  }
+
+  /**
+   * Initialise contigs used as starting point for translateCodingRegion
+   */
+  private void initContigs()
+  {
+    vismapping = new ShiftList(); // map from viscontigs to seqstring
+    // intervals
+
+    int npos = 0;
+    int[] lastregion = null;
+    ArrayList<Integer> tempcontigs = new ArrayList<>();
+    while (contigs.hasNext())
+    {
+      int[] region = contigs.next();
+      if (lastregion == null)
+      {
+        vismapping.addShift(npos, region[0]);
+      }
+      else
+      {
+        // hidden region
+        vismapping.addShift(npos, region[0] - lastregion[1] + 1);
+      }
+      lastregion = region;
+      tempcontigs.add(region[0]);
+      tempcontigs.add(region[1]);
+    }
+
+    startcontigs = new int[tempcontigs.size()];
+    int i = 0;
+    for (Integer val : tempcontigs)
+    {
+      startcontigs[i] = val;
+      i++;
+    }
+    tempcontigs = null;
   }
 
   /**
@@ -393,38 +436,12 @@ public class Dna
           List<SequenceI> proteinSeqs)
   {
     List<int[]> skip = new ArrayList<>();
-    int skipint[] = null;
-    ShiftList vismapping = new ShiftList(); // map from viscontigs to seqstring
-    // intervals
-    int vc = 0;
-
+    int[] skipint = null;
     int npos = 0;
-    int[] lastregion = null;
-    while (contigs.hasNext())
-    {
-      int[] region = contigs.next();
-      if (lastregion == null)
-      {
-        vismapping.addShift(npos, region[0]);
-      }
-      else
-      {
-        // hidden region
-        vismapping.addShift(npos, region[0] - lastregion[1] + 1);
-      }
-      lastregion = region;
-      vc++;
-    }
+    int vc = 0;
 
-    int[] scontigs = new int[vc];
-    vc = 0;
-    while (contigs.hasNext())
-    {
-      int[] region = contigs.next();
-      scontigs[vc] = region[0];
-      scontigs[vc + 1] = region[1];
-      vc++;
-    }
+    int[] scontigs = new int[startcontigs.length];
+    System.arraycopy(startcontigs, 0, scontigs, 0, startcontigs.length);
 
     // allocate a roughly sized buffer for the protein sequence
     StringBuilder protein = new StringBuilder(seqstring.length() / 2);