aaIndex replaces aaHash

[jalview.git] / src / jalview / schemes / NucleotideColourScheme.java

diff --git a/src/jalview/schemes/NucleotideColourScheme.java b/src/jalview/schemes/NucleotideColourScheme.java
index 9768d9a..6aaef7d 100755 (executable)
--- a/src/jalview/schemes/NucleotideColourScheme.java
+++ b/src/jalview/schemes/NucleotideColourScheme.java
@@ -47,7 +47,7 @@ public class NucleotideColourScheme extends ResidueColourScheme
     public Color findColour(String n)\r
     {\r
         // System.out.println("called"); log.debug\r
-        return colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];\r
+        return colors[ResidueProperties.nucleotideIndex[n.charAt(0)]];\r
     }\r
 \r
     /**\r
@@ -64,7 +64,7 @@ public class NucleotideColourScheme extends ResidueColourScheme
         {\r
             try\r
             {\r
-                currentColour = colors[((Integer) (ResidueProperties.nucleotideHash.get(n))).intValue()];\r
+                currentColour = colors[ ResidueProperties.nucleotideIndex[n.charAt(0)]];\r
             }\r
             catch (Exception ex)\r
             {\r