Merge branch 'features/JAL-845splitPaneMergeDevelop' into develop

[jalview.git] / src / jalview / commands / ChangeCaseCommand.java

diff --git a/src/jalview/commands/ChangeCaseCommand.java b/src/jalview/commands/ChangeCaseCommand.java
index d06b0f2..7f7142f 100644 (file)
--- a/src/jalview/commands/ChangeCaseCommand.java
+++ b/src/jalview/commands/ChangeCaseCommand.java
@@ -20,7 +20,10 @@
  */
 package jalview.commands;
 
-import jalview.datamodel.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
+
+import java.util.List;
 
 public class ChangeCaseCommand implements CommandI
 {
@@ -36,10 +39,10 @@ public class ChangeCaseCommand implements CommandI
 
   SequenceI[] seqs;
 
-  int[][] regions;
+  List<int[]> regions;
 
   public ChangeCaseCommand(String description, SequenceI[] seqs,
-          int[][] regions, int caseChange)
+          List<int[]> regions, int caseChange)
   {
     this.description = description;
     this.seqs = seqs;
@@ -73,21 +76,21 @@ public class ChangeCaseCommand implements CommandI
     String sequence;
     int start, end;
     char nextChar;
-    for (int r = 0; r < regions.length; r++)
+    for (int[] r : regions)
     {
-      start = regions[r][0];
+      start = r[0];
       for (int s = 0; s < seqs.length; s++)
       {
         sequence = seqs[s].getSequenceAsString();
         StringBuffer newSeq = new StringBuffer();
 
-        if (regions[r][1] > sequence.length())
+        if (r[1] > sequence.length())
         {
           end = sequence.length();
         }
         else
         {
-          end = regions[r][1];
+          end = r[1];
         }
 
         if (start > 0)