git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-653_JAL-1766_htslib_refseqsupport
[jalview.git]
/
src
/
jalview
/
io
/
FeaturesFile.java
diff --git
a/src/jalview/io/FeaturesFile.java
b/src/jalview/io/FeaturesFile.java
index
498226b
..
c6bc1dd
100755
(executable)
--- a/
src/jalview/io/FeaturesFile.java
+++ b/
src/jalview/io/FeaturesFile.java
@@
-123,8
+123,7
@@
public class FeaturesFile extends AlignFile
* - process html strings into plain text
* @return true if features were added
*/
* - process html strings into plain text
* @return true if features were added
*/
- public boolean parse(AlignmentI align, Hashtable colours,
- boolean removeHTML)
+ public boolean parse(AlignmentI align, Map colours, boolean removeHTML)
{
return parse(align, colours, null, removeHTML, false);
}
{
return parse(align, colours, null, removeHTML, false);
}
@@
-172,21
+171,18
@@
public class FeaturesFile extends AlignFile
@Override
public void addAnnotations(AlignmentI al)
{
@Override
public void addAnnotations(AlignmentI al)
{
- // TODO Auto-generated method stub
super.addAnnotations(al);
}
@Override
public void addProperties(AlignmentI al)
{
super.addAnnotations(al);
}
@Override
public void addProperties(AlignmentI al)
{
- // TODO Auto-generated method stub
super.addProperties(al);
}
@Override
public void addSeqGroups(AlignmentI al)
{
super.addProperties(al);
}
@Override
public void addSeqGroups(AlignmentI al)
{
- // TODO Auto-generated method stub
super.addSeqGroups(al);
}
super.addSeqGroups(al);
}