X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FText.java;h=25d7899a61ef1caf7f042053499b28dc87530fa3;hb=48f14dc96bd27521e0c36ca227f3f3a2df3e5213;hp=3b486ce8d0c4a36b8610a3bd10da9943e3dbfb6c;hpb=2284842831ea46e89b97dd22b6e294caad361f30;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 3b486ce..25d7899 100644
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,6 +13,8 @@ import java.util.Scanner;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Image;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for local stories encoded in textual format, with a few rules:
@@ -27,12 +28,12 @@ import be.nikiroo.fanfix.data.MetaData;
  * number</li>
  * <li>A description of the story must be given as chapter number 0</li>
  * <li>A cover may be present, with the same filename but a PNG, JPEG or JPG
- * extension</li<
+ * extension</li>
  * </ul>
  * 
  * @author niki
  */
-class Text extends BasicSupport {
+class Text extends BasicSupport_Deprecated {
 	@Override
 	protected boolean isHtml() {
 		return false;
@@ -56,7 +57,7 @@ class Text extends BasicSupport {
 		meta.setPublisher("");
 		meta.setUuid(source.toString());
 		meta.setLuid("");
-		meta.setLang(getLang(source, reset(in))); // default is EN
+		meta.setLang(getLang(reset(in))); // default is EN
 		meta.setSubject(getSubject(source));
 		meta.setType(getType().toString());
 		meta.setImageDocument(false);
@@ -76,7 +77,7 @@ class Text extends BasicSupport {
 
 	}
 
-	private String getLang(URL source, InputStream in) throws IOException {
+	private String getLang(InputStream in) {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
@@ -102,14 +103,14 @@ class Text extends BasicSupport {
 		return lang;
 	}
 
-	private String getTitle(InputStream in) throws IOException {
+	private String getTitle(InputStream in) {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
 		return scan.next();
 	}
 
-	private String getAuthor(InputStream in) throws IOException {
+	private String getAuthor(InputStream in) {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
@@ -122,10 +123,10 @@ class Text extends BasicSupport {
 			author = authorDate.substring(0, pos);
 		}
 
-		return fixAuthor(author);
+		return BasicSupportHelper.fixAuthor(author);
 	}
 
-	private String getDate(InputStream in) throws IOException {
+	private String getDate(InputStream in) {
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
 		scan.useDelimiter("\\n");
@@ -147,15 +148,15 @@ class Text extends BasicSupport {
 
 	@Override
 	protected String getDesc(URL source, InputStream in) throws IOException {
-		return getChapterContent(source, in, 0);
+		return getChapterContent(source, in, 0, null);
 	}
 
-	private BufferedImage getCover(URL source) throws IOException {
+	private Image getCover(URL source) {
 		String path;
 		try {
 			path = new File(source.toURI()).getPath();
 		} catch (URISyntaxException e) {
-			Instance.syserr(e);
+			Instance.getTraceHandler().error(e);
 			path = null;
 		}
 
@@ -169,8 +170,8 @@ class Text extends BasicSupport {
 	}
 
 	@Override
-	protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-			throws IOException {
+	protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+			Progress pg) throws IOException {
 		List<Entry<String, URL>> chaps = new ArrayList<Entry<String, URL>>();
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
@@ -187,14 +188,17 @@ class Text extends BasicSupport {
 				final URL value = source;
 				final String key = chapName;
 				chaps.add(new Entry<String, URL>() {
+					@Override
 					public URL setValue(URL value) {
 						return null;
 					}
 
+					@Override
 					public URL getValue() {
 						return value;
 					}
 
+					@Override
 					public String getKey() {
 						return key;
 					}
@@ -208,8 +212,8 @@ class Text extends BasicSupport {
 	}
 
 	@Override
-	protected String getChapterContent(URL source, InputStream in, int number)
-			throws IOException {
+	protected String getChapterContent(URL source, InputStream in, int number,
+			Progress pg) throws IOException {
 		StringBuilder builder = new StringBuilder();
 		@SuppressWarnings("resource")
 		Scanner scan = new Scanner(in, "UTF-8");
@@ -238,7 +242,7 @@ class Text extends BasicSupport {
 				file = new File(url.toURI());
 				file = new File(file.getPath() + ".info");
 			} catch (URISyntaxException e) {
-				Instance.syserr(e);
+				Instance.getTraceHandler().error(e);
 				file = null;
 			}