after merge

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

diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 4906eb7..d25707f 100755 (executable)
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -1135,20 +1135,6 @@ public class ResidueProperties
     propHash.put("polar", polar);\r
   }\r
 \r
-  public static Hashtable chainColours = new Hashtable();\r
-\r
-  static\r
-  {\r
-    chainColours.put("A", Color.red);\r
-    chainColours.put("B", Color.orange);\r
-    chainColours.put("C", Color.yellow);\r
-    chainColours.put("D", Color.green);\r
-    chainColours.put("E", Color.cyan);\r
-    chainColours.put("F", Color.blue);\r
-    chainColours.put("G", Color.magenta);\r
-    chainColours.put("H", Color.pink);\r
-  }\r
-\r
   private ResidueProperties()\r
   {\r
   }\r
@@ -1234,7 +1220,7 @@ public class ResidueProperties
       String key = (String) e.nextElement();\r
       Vector tmp = (Vector) codonHash.get(key);\r
 \r
-      if (tmp.contains(codon))\r
+      if (tmp.contains(codon.toUpperCase()))\r
       {\r
         return key;\r
       }\r
@@ -1242,9 +1228,4 @@ public class ResidueProperties
 \r
     return null;\r
   }\r
-\r
-  public static Hashtable getChainColours()\r
-  {\r
-    return chainColours;\r
-  }\r
 }\r