git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4235 JAL-3599 Try and report Eclipse Product Version for jalviewjsTranspile....
[jalview.git]
/
src
/
jalview
/
analysis
/
GeneticCodes.java
diff --git
a/src/jalview/analysis/GeneticCodes.java
b/src/jalview/analysis/GeneticCodes.java
index
8d69b0b
..
133cb3a
100644
(file)
--- a/
src/jalview/analysis/GeneticCodes.java
+++ b/
src/jalview/analysis/GeneticCodes.java
@@
-21,9
+21,6
@@
package jalview.analysis;
import java.util.Locale;
package jalview.analysis;
import java.util.Locale;
-
-import jalview.bin.Cache;
-
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
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 java.util.Map;
import java.util.StringTokenizer;
+import jalview.bin.Console;
+
/**
* A singleton that provides instances of genetic code translation tables
*
/**
* A singleton that provides instances of genetic code translation tables
*
@@
-162,9
+161,8
@@
public final class GeneticCodes
}
} catch (IOException | NullPointerException e)
{
}
} 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())
{
}
if (codeTables.isEmpty())
{
@@
-205,8
+203,8
@@
public final class GeneticCodes
String[] tokens = line.split("\\t");
if (tokens.length == 2)
{
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
{
}
else
{
@@
-217,9
+215,8
@@
public final class GeneticCodes
}
} catch (IOException e)
{
}
} 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
{
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
{
}
else
{