X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FGeneticCodes.java;h=4c826b2201ffa9ecf39acc97d5eb72b69b0a9afd;hb=c932f0e85a8852824cdd8ce790af68682732c85c;hp=137b7f8316e8b21e4e75b581fd81dfbe65e30c18;hpb=c491024e7256817870ff7d53f35ea55db045681d;p=jalview.git

diff --git a/src/jalview/analysis/GeneticCodes.java b/src/jalview/analysis/GeneticCodes.java
index 137b7f8..4c826b2 100644
--- a/src/jalview/analysis/GeneticCodes.java
+++ b/src/jalview/analysis/GeneticCodes.java
@@ -1,7 +1,26 @@
+/*
+ * 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.analysis;
 
-import jalview.bin.Cache;
-
+import java.util.Locale;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,6 +30,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import jalview.bin.Console;
+
 /**
  * A singleton that provides instances of genetic code translation tables
  * 
@@ -119,7 +140,7 @@ public final class GeneticCodes
       InputStream is = getClass().getResourceAsStream(fileName);
       if (is == null)
       {
-        System.err.println("Resource file not found: " + fileName);
+        jalview.bin.Console.errPrintln("Resource file not found: " + fileName);
         return;
       }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
@@ -140,13 +161,12 @@ public final class GeneticCodes
       }
     } catch (IOException | NullPointerException e)
     {
-      Cache.log.error(
-              "Error reading genetic codes data file " + fileName + ": "
-              + e.getMessage());
+      Console.error("Error reading genetic codes data file " + fileName
+              + ": " + e.getMessage());
     }
     if (codeTables.isEmpty())
     {
-      System.err.println(
+      jalview.bin.Console.errPrintln(
               "No genetic code tables loaded, check format of file "
                       + fileName);
     }
@@ -170,7 +190,7 @@ public final class GeneticCodes
       InputStream is = getClass().getResourceAsStream(fileName);
       if (is == null)
       {
-        System.err.println("Resource file not found: " + fileName);
+        jalview.bin.Console.errPrintln("Resource file not found: " + fileName);
         return;
       }
       BufferedReader dataIn = new BufferedReader(new InputStreamReader(is));
@@ -178,26 +198,25 @@ public final class GeneticCodes
       while (line != null)
       {
         line = readLine(dataIn);
-        if (line != null && !"DNA".equals(line.toUpperCase()))
+        if (line != null && !"DNA".equals(line.toUpperCase(Locale.ROOT)))
         {
           String[] tokens = line.split("\\t");
           if (tokens.length == 2)
           {
-          ambiguityCodes.put(tokens[0].toUpperCase(),
-                  tokens[1].toUpperCase());
+            ambiguityCodes.put(tokens[0].toUpperCase(Locale.ROOT),
+                    tokens[1].toUpperCase(Locale.ROOT));
           }
           else
           {
-            System.err.println(
+            jalview.bin.Console.errPrintln(
                     "Unexpected data in " + fileName + ": " + line);
           }
         }
       }
     } catch (IOException e)
     {
-      Cache.log.error(
-              "Error reading nucleotide ambiguity codes data file: "
-                      + e.getMessage());
+      Console.error("Error reading nucleotide ambiguity codes data file: "
+              + e.getMessage());
     }
   }
 
@@ -272,7 +291,7 @@ public final class GeneticCodes
                 line.lastIndexOf(QUOTE));
         if (aminos.length() != NUCS_COUNT_CUBED) // 4 * 4 * 4 combinations
         {
-          Cache.log.error("wrong data length in code table: " + line);
+          Console.error("wrong data length in code table: " + line);
         }
         else
         {
@@ -321,13 +340,13 @@ public final class GeneticCodes
       @Override
       public String translateCanonical(String codon)
       {
-        return codons.get(codon.toUpperCase());
+        return codons.get(codon.toUpperCase(Locale.ROOT));
       }
 
       @Override
       public String translate(String codon)
       {
-        String upper = codon.toUpperCase();
+        String upper = codon.toUpperCase(Locale.ROOT);
         String peptide = translateCanonical(upper);
 
         /*