X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=fb4e7cd33fccfefffa52b1af0270d934d931206b;hb=3d6cffe82270a1faacf1f0d39c34b11ab316e0db;hp=f338286d6e42c08f8905260e21d2876480ba312f;hpb=1e9a08c2b73b16dc178437eb8c8025aaa083fcca;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index f338286..fb4e7cd 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneTextParser.java - Copyright © 2010–2015 David Roden
+ * Sone - SoneTextParser.java - Copyright © 2010–2016 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +21,16 @@ import static java.util.logging.Logger.getLogger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.Reader;
+import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.impl.IdOnlySone;
@@ -117,10 +120,11 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 	/**
 	 * {@inheritDoc}
 	 */
+	@Nonnull
 	@Override
-	public Iterable<Part> parse(SoneTextParserContext context, Reader source) throws IOException {
+	public Iterable<Part> parse(@Nonnull String source, @Nullable SoneTextParserContext context) {
 		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;
@@ -271,10 +275,11 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 				}
 				lastLineEmpty = false;
 			}
+		} catch (IOException ioe1) {
+			// a buffered reader around a string reader should never throw.
+			throw new RuntimeException(ioe1);
 		} finally {
-			if (bufferedReader != source) {
-				Closer.close(bufferedReader);
-			}
+			Closer.close(bufferedReader);
 		}
 		for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) {
 			Part part = parts.getPart(partIndex);