Merge branch 'develop' of https://source.jalview.org/git/jalview.git into menard

[jalview.git] / src / jalview / io / FeaturesFile.java

diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java
index d072d3d..9fc04b4 100755 (executable)
--- a/src/jalview/io/FeaturesFile.java
+++ b/src/jalview/io/FeaturesFile.java
@@ -106,7 +106,7 @@ public class FeaturesFile extends AlignFile
    * @return true if features were added\r
    */\r
   public boolean parse(AlignmentI align, \r
-          Hashtable colours, boolean removeHTML, boolean relaxedIdMatching)\r
+          Map colours, boolean removeHTML, boolean relaxedIdMatching)\r
   {\r
     return parse(align, colours, null, removeHTML, relaxedIdMatching);\r
   }\r
@@ -119,8 +119,8 @@ public class FeaturesFile extends AlignFile
    * @param removeHTML - process html strings into plain text\r
    * @return true if features were added\r
    */\r
-  public boolean parse(AlignmentI align, Hashtable colours,\r
-          Hashtable featureLink, boolean removeHTML)\r
+  public boolean parse(AlignmentI align, Map colours,\r
+          Map featureLink, boolean removeHTML)\r
   {\r
     return parse(align, colours, featureLink, removeHTML, false);\r
   }\r
@@ -136,7 +136,7 @@ public class FeaturesFile extends AlignFile
    * @return true if features were added\r
    */\r
   public boolean parse(AlignmentI align,\r
-          Hashtable colours, Hashtable featureLink, boolean removeHTML, boolean relaxedIdmatching)\r
+          Map colours, Map featureLink, boolean removeHTML, boolean relaxedIdmatching)\r
   {\r
 \r
     String line = null;\r
@@ -150,7 +150,7 @@ public class FeaturesFile extends AlignFile
       StringTokenizer st;\r
       SequenceFeature sf;\r
       String featureGroup = null, groupLink = null;\r
-      Hashtable typeLink = new Hashtable();\r
+      Map typeLink = new Hashtable();\r
       /**\r
        * when true, assume GFF style features rather than Jalview style.\r
        */\r