X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFeaturesFile.java;h=23723c7ea994760a739ac21e9016a388d2adacd4;hb=86838d2566aadd780bd460bdc1276eec77875e26;hp=8664cbafe2f501fcfd1492489c5f3c63408eac90;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java index 8664cba..23723c7 100755 --- a/src/jalview/io/FeaturesFile.java +++ b/src/jalview/io/FeaturesFile.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -92,7 +92,7 @@ public class FeaturesFile extends AlignFile * @return true if features were added */ public boolean parse(AlignmentI align, - Hashtable colours, boolean removeHTML, boolean relaxedIdMatching) + Map colours, boolean removeHTML, boolean relaxedIdMatching) { return parse(align, colours, null, removeHTML, relaxedIdMatching); } @@ -105,8 +105,8 @@ public class FeaturesFile extends AlignFile * @param removeHTML - process html strings into plain text * @return true if features were added */ - public boolean parse(AlignmentI align, Hashtable colours, - Hashtable featureLink, boolean removeHTML) + public boolean parse(AlignmentI align, Map colours, + Map featureLink, boolean removeHTML) { return parse(align, colours, featureLink, removeHTML, false); } @@ -122,7 +122,7 @@ public class FeaturesFile extends AlignFile * @return true if features were added */ public boolean parse(AlignmentI align, - Hashtable colours, Hashtable featureLink, boolean removeHTML, boolean relaxedIdmatching) + Map colours, Map featureLink, boolean removeHTML, boolean relaxedIdmatching) { String line = null; @@ -136,7 +136,7 @@ public class FeaturesFile extends AlignFile StringTokenizer st; SequenceFeature sf; String featureGroup = null, groupLink = null; - Hashtable typeLink = new Hashtable(); + Map typeLink = new Hashtable(); /** * when true, assume GFF style features rather than Jalview style. */