git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
77924f3
)
JAL-1569 formatting
author
Jim Procter
<jprocter@dundee.ac.uk>
Sun, 23 Nov 2014 16:31:26 +0000
(16:31 +0000)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Sun, 23 Nov 2014 16:31:26 +0000
(16:31 +0000)
src/jalview/io/StockholmFile.java
patch
|
blob
|
history
diff --git
a/src/jalview/io/StockholmFile.java
b/src/jalview/io/StockholmFile.java
index
c546930
..
85f9455
100644
(file)
--- a/
src/jalview/io/StockholmFile.java
+++ b/
src/jalview/io/StockholmFile.java
@@
-199,7
+199,9
@@
public class StockholmFile extends AlignFile
r = new Regex("# STOCKHOLM ([\\d\\.]+)");
if (!r.search(nextLine()))
{
r = new Regex("# STOCKHOLM ([\\d\\.]+)");
if (!r.search(nextLine()))
{
- throw new IOException(MessageManager.getString("exception.stockholm_invalid_format"));
+ throw new IOException(
+ MessageManager
+ .getString("exception.stockholm_invalid_format"));
}
else
{
}
else
{
@@
-417,9
+419,11
@@
public class StockholmFile extends AlignFile
if (!x.search(line))
{
// logger.error("Could not parse sequence line: " + line);
if (!x.search(line))
{
// logger.error("Could not parse sequence line: " + line);
- throw new IOException(MessageManager.formatMessage("exception.couldnt_parse_sequence_line", new String[]{line}));
+ throw new IOException(MessageManager.formatMessage(
+ "exception.couldnt_parse_sequence_line", new String[]
+ { line }));
}
}
- String ns = (String) seqs.get(x.stringMatched(1));
+ String ns = seqs.get(x.stringMatched(1));
if (ns == null)
{
ns = "";
if (ns == null)
{
ns = "";
@@
-529,7
+533,9
@@
public class StockholmFile extends AlignFile
}
else
{
}
else
{
- throw new IOException(MessageManager.formatMessage("exception.error_parsing_line", new String[]{line}));
+ throw new IOException(MessageManager.formatMessage(
+ "exception.error_parsing_line", new String[]
+ { line }));
}
}
else if (annType.equals("GC"))
}
}
else if (annType.equals("GC"))
@@
-658,7
+664,9
@@
public class StockholmFile extends AlignFile
}
else
{
}
else
{
- throw new IOException(MessageManager.formatMessage("exception.unknown_annotation_detected", new String[]{annType,annContent}));
+ throw new IOException(MessageManager.formatMessage(
+ "exception.unknown_annotation_detected", new String[]
+ { annType, annContent }));
}
}
}
}
}
}