X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fcommands%2FChangeCaseCommand.java;h=147676863a9e4bb70c8d993e31a2e6da1829ebdf;hb=ee19482a42988b76fdca9d46065ce2ca14ea73c5;hp=138628ab7126649b664cf67d1f5abc1eb899b350;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git
diff --git a/src/jalview/commands/ChangeCaseCommand.java b/src/jalview/commands/ChangeCaseCommand.java
index 138628a..1476768 100644
--- a/src/jalview/commands/ChangeCaseCommand.java
+++ b/src/jalview/commands/ChangeCaseCommand.java
@@ -1,24 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
- * 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.commands;
-import jalview.datamodel.*;
+import java.util.Locale;
+
+import jalview.datamodel.AlignmentI;
+import jalview.datamodel.SequenceI;
+
+import java.util.List;
public class ChangeCaseCommand implements CommandI
{
@@ -34,10 +41,10 @@ public class ChangeCaseCommand implements CommandI
SequenceI[] seqs;
- int[][] regions;
+ List regions;
public ChangeCaseCommand(String description, SequenceI[] seqs,
- int[][] regions, int caseChange)
+ List regions, int caseChange)
{
this.description = description;
this.seqs = seqs;
@@ -71,21 +78,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)
@@ -96,13 +103,15 @@ public class ChangeCaseCommand implements CommandI
if ((caseChange == TO_UPPER && doCommand)
|| (caseChange == TO_LOWER && !doCommand))
{
- newSeq.append(sequence.substring(start, end).toUpperCase());
+ newSeq.append(
+ sequence.substring(start, end).toUpperCase(Locale.ROOT));
}
else if ((caseChange == TO_LOWER && doCommand)
|| (caseChange == TO_UPPER && !doCommand))
{
- newSeq.append(sequence.substring(start, end).toLowerCase());
+ newSeq.append(
+ sequence.substring(start, end).toLowerCase(Locale.ROOT));
}
else