Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop

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

diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 593e83d..acebff2 100755 (executable)
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -27,6 +27,7 @@ import jalview.api.analysis.ScoreModelI;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
@@ -43,11 +44,11 @@ public class ResidueProperties
 
   public static final int[] purinepyrimidineIndex;
 
-  public static final Hashtable aa3Hash = new Hashtable();
+  public static final Map<String, Integer> aa3Hash = new HashMap<String, Integer>();
 
-  public static final Hashtable aa2Triplet = new Hashtable();
+  public static final Map<String, String> aa2Triplet = new HashMap<String, String>();
 
-  public static final Hashtable nucleotideName = new Hashtable();
+  public static final Map<String, String> nucleotideName = new HashMap<String, String>();
 
   static
   {
@@ -676,6 +677,8 @@ public class ResidueProperties
 
   public static Vector STOP = new Vector();
 
+  public static String START = "ATG";
+
   static
   {
     codonHash.put("K", Lys);
@@ -1521,7 +1524,7 @@ public class ResidueProperties
     return hyd;
   }
 
-  public static Hashtable getAA3Hash()
+  public static Map<String, Integer> getAA3Hash()
   {
     return aa3Hash;
   }