X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FGeneticCodes.java;fp=src%2Fjalview%2Fanalysis%2FGeneticCodes.java;h=133cb3a14c49ee9d50527db5344fcb49cab7855b;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=8d69b0ba679e0156f237eaa79ea55b840af22062;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/src/jalview/analysis/GeneticCodes.java b/src/jalview/analysis/GeneticCodes.java index 8d69b0b..133cb3a 100644 --- a/src/jalview/analysis/GeneticCodes.java +++ b/src/jalview/analysis/GeneticCodes.java @@ -21,9 +21,6 @@ package jalview.analysis; import java.util.Locale; - -import jalview.bin.Cache; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -33,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 * @@ -162,9 +161,8 @@ 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()) { @@ -205,8 +203,8 @@ public final class GeneticCodes String[] tokens = line.split("\\t"); if (tokens.length == 2) { - ambiguityCodes.put(tokens[0].toUpperCase(Locale.ROOT), - tokens[1].toUpperCase(Locale.ROOT)); + ambiguityCodes.put(tokens[0].toUpperCase(Locale.ROOT), + tokens[1].toUpperCase(Locale.ROOT)); } else { @@ -217,9 +215,8 @@ public final class GeneticCodes } } 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()); } } @@ -294,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 {