X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fcommands%2FChangeCaseCommand.java;h=f0ea2f69b205805e090fe8059ece4673ddc36425;hb=c843dbd309a13ac1b576d76b33e2a0a5d3a227bc;hp=d06b0f25761cab413aa7309edf846b340fed9a54;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/src/jalview/commands/ChangeCaseCommand.java b/src/jalview/commands/ChangeCaseCommand.java
index d06b0f2..f0ea2f6 100644
--- a/src/jalview/commands/ChangeCaseCommand.java
+++ b/src/jalview/commands/ChangeCaseCommand.java
@@ -20,26 +20,29 @@
  */
 package jalview.commands;
 
-import jalview.datamodel.*;
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
+
+import java.util.List;
 
 public class ChangeCaseCommand implements CommandI
 {
   String description;
 
-  public static int TO_LOWER = 0;
+  public final static int TO_LOWER = 0;
 
-  public static int TO_UPPER = 1;
+  public final static int TO_UPPER = 1;
 
-  public static int TOGGLE_CASE = 2;
+  public final static int TOGGLE_CASE = 2;
 
-  int caseChange = -1;
+  private int caseChange;
 
-  SequenceI[] seqs;
+  private SequenceI[] seqs;
 
-  int[][] regions;
+  private List<int[]> regions;
 
   public ChangeCaseCommand(String description, SequenceI[] seqs,
-          int[][] regions, int caseChange)
+          List<int[]> regions, int caseChange)
   {
     this.description = description;
     this.seqs = seqs;
@@ -48,21 +51,25 @@ public class ChangeCaseCommand implements CommandI
     doCommand(null);
   }
 
+  @Override
   public String getDescription()
   {
     return description;
   }
 
+  @Override
   public int getSize()
   {
     return 1;
   }
 
+  @Override
   public void doCommand(AlignmentI[] views)
   {
     changeCase(true);
   }
 
+  @Override
   public void undoCommand(AlignmentI[] views)
   {
     changeCase(false);
@@ -73,21 +80,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)