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
JAL-934 - refactor to use label font functions
[jalview.git]
/
src
/
jalview
/
io
/
StockholmFile.java
diff --git
a/src/jalview/io/StockholmFile.java
b/src/jalview/io/StockholmFile.java
index
b407463
..
e81c31a
100644
(file)
--- a/
src/jalview/io/StockholmFile.java
+++ b/
src/jalview/io/StockholmFile.java
@@
-1,5
+1,5
@@
/*
\r
/*
\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
\r
*
\r
* This file is part of Jalview.
\r
@@
-363,8
+363,8
@@
public class StockholmFile extends AlignFile
if (x.search(annContent))
\r
{
\r
// parse out and create alignment annotation directly.
\r
if (x.search(annContent))
\r
{
\r
// parse out and create alignment annotation directly.
\r
- parseAnnotationRow(annotations, x.stringMatched(1), x
\r
- .stringMatched(2));
\r
+ parseAnnotationRow(annotations, x.stringMatched(1),
\r
+ x.stringMatched(2));
\r
}
\r
}
\r
else if (annType.equals("GR"))
\r
}
\r
}
\r
else if (annType.equals("GR"))
\r
@@
-447,7
+447,7
@@
public class StockholmFile extends AlignFile
ns = "";
\r
}
\r
ns += seq;
\r
ns = "";
\r
}
\r
ns += seq;
\r
- content.put(description, seq);
\r
+ content.put(description, ns);
\r
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r