projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove IOException from parser interface
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
text
/
SoneTextParser.java
diff --git
a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index
f338286
..
18dd53f
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/
src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@
-21,7
+21,7
@@
import static java.util.logging.Logger.getLogger;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.BufferedReader;
import java.io.IOException;
-import java.io.Reader;
+import java.io.
String
Reader;
import java.net.MalformedURLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.net.MalformedURLException;
import java.util.logging.Level;
import java.util.logging.Logger;
@@
-118,9
+118,9
@@
public class SoneTextParser implements Parser<SoneTextParserContext> {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- public Iterable<Part> parse(SoneTextParserContext context,
Reader source) throws IOException
{
+ public Iterable<Part> parse(SoneTextParserContext context,
String source)
{
PartContainer parts = new PartContainer();
PartContainer parts = new PartContainer();
- BufferedReader bufferedReader =
(source instanceof BufferedReader) ? (BufferedReader) source : new BufferedReader(source
);
+ BufferedReader bufferedReader =
new BufferedReader(new StringReader(source)
);
try {
String line;
boolean lastLineEmpty = true;
try {
String line;
boolean lastLineEmpty = true;
@@
-271,10
+271,11
@@
public class SoneTextParser implements Parser<SoneTextParserContext> {
}
lastLineEmpty = false;
}
}
lastLineEmpty = false;
}
+ } catch (IOException ioe1) {
+ // a buffered reader around a string reader should never throw.
+ throw new RuntimeException(ioe1);
} finally {
} finally {
- if (bufferedReader != source) {
- Closer.close(bufferedReader);
- }
+ Closer.close(bufferedReader);
}
for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) {
Part part = parts.getPart(partIndex);
}
for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) {
Part part = parts.getPart(partIndex);