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
formatting
[jalview.git]
/
src
/
jalview
/
io
/
StockholmFile.java
diff --git
a/src/jalview/io/StockholmFile.java
b/src/jalview/io/StockholmFile.java
index
840041d
..
6b60cd5
100644
(file)
--- a/
src/jalview/io/StockholmFile.java
+++ b/
src/jalview/io/StockholmFile.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
\r
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
*
\r
*
\r
* This file is part of Jalview.
\r
*
\r
@@
-521,7
+521,7
@@
public class StockholmFile extends AlignFile
}
\r
}
\r
\r
}
\r
}
\r
\r
- private AlignmentAnnotation parseAnnotationRow(Vector annotation,
\r
+ protected static AlignmentAnnotation parseAnnotationRow(Vector annotation,
\r
String label, String annots)
\r
{
\r
String convert1, convert2 = null;
\r
String label, String annots)
\r
{
\r
String convert1, convert2 = null;
\r
@@
-640,7
+640,7
@@
public class StockholmFile extends AlignFile
}
\r
}
\r
\r
}
\r
}
\r
\r
- private String id2type(String id)
\r
+ protected static String id2type(String id)
\r
{
\r
if (typeIds.containsKey(id))
\r
{
\r
{
\r
if (typeIds.containsKey(id))
\r
{
\r