X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2FBasicReader.java;h=cbd4e0308a4584895b805d7ed3ac8bbdaf2c3732;hp=baf3c7dede9ebab876d7a4b3158d369e8224331d;hb=e42573a004fac26378c693ce9ef0d6319713c682;hpb=062ee296d56e273fa30fd3a078e5b18a02f2e00d

diff --git a/src/be/nikiroo/fanfix/reader/BasicReader.java b/src/be/nikiroo/fanfix/reader/BasicReader.java
index baf3c7d..cbd4e03 100644
--- a/src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/src/be/nikiroo/fanfix/reader/BasicReader.java
@@ -6,13 +6,13 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import be.nikiroo.fanfix.BasicLibrary;
 import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.LocalLibrary;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.bundles.UiConfig;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.fanfix.library.BasicLibrary;
+import be.nikiroo.fanfix.library.LocalLibrary;
 import be.nikiroo.fanfix.supported.BasicSupport;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.serial.SerialUtils;
@@ -24,49 +24,12 @@ import be.nikiroo.utils.serial.SerialUtils;
  * 
  * @author niki
  */
-public abstract class BasicReader {
-	/**
-	 * A type of {@link BasicReader}.
-	 * 
-	 * @author niki
-	 */
-	public enum ReaderType {
-		/** Simple reader that outputs everything on the console */
-		CLI,
-		/** Reader that starts local programs to handle the stories */
-		GUI,
-		/** A text (UTF-8) reader with menu and text windows */
-		TUI,
-
-		;
-
-		/**
-		 * Return the full class name of a type that implements said
-		 * {@link ReaderType}.
-		 * 
-		 * @return the class name
-		 */
-		public String getTypeName() {
-			String pkg = "be.nikiroo.fanfix.reader.";
-			switch (this) {
-			case CLI:
-				return pkg + "CliReader";
-			case TUI:
-				return pkg + "TuiReader";
-			case GUI:
-				return pkg + "GuiReader";
-			}
-
-			return null;
-		}
-	}
-
+public abstract class BasicReader implements Reader {
 	private static BasicLibrary defaultLibrary = Instance.getLibrary();
 	private static ReaderType defaultType = ReaderType.GUI;
 
 	private BasicLibrary lib;
 	private Story story;
-	private ReaderType type;
 
 	/**
 	 * Take the default reader type configuration from the config file.
@@ -83,43 +46,10 @@ public abstract class BasicReader {
 		}
 	}
 
-	/**
-	 * The type of this reader.
-	 * 
-	 * @return the type
-	 */
-	public ReaderType getType() {
-		return type;
-	}
-
-	/**
-	 * The type of this reader.
-	 * 
-	 * @param type
-	 *            the new type
-	 * 
-	 * @return the type
-	 */
-	protected BasicReader setType(ReaderType type) {
-		this.type = type;
-		return this;
-	}
-
-	/**
-	 * Return the current {@link Story}.
-	 * 
-	 * @return the {@link Story}
-	 */
 	public Story getStory() {
 		return story;
 	}
 
-	/**
-	 * The {@link LocalLibrary} to load the stories from (by default, takes the
-	 * default {@link LocalLibrary}).
-	 * 
-	 * @return the {@link LocalLibrary}
-	 */
 	public BasicLibrary getLibrary() {
 		if (lib == null) {
 			lib = defaultLibrary;
@@ -128,29 +58,10 @@ public abstract class BasicReader {
 		return lib;
 	}
 
-	/**
-	 * Change the {@link LocalLibrary} that will be managed by this
-	 * {@link BasicReader}.
-	 * 
-	 * @param lib
-	 *            the new {@link LocalLibrary}
-	 */
 	public void setLibrary(LocalLibrary lib) {
 		this.lib = lib;
 	}
 
-	/**
-	 * Create a new {@link BasicReader} for a {@link Story} in the
-	 * {@link LocalLibrary}.
-	 * 
-	 * @param luid
-	 *            the {@link Story} ID
-	 * @param pg
-	 *            the optional progress reporter
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
 	public void setStory(String luid, Progress pg) throws IOException {
 		story = lib.getStory(luid, pg);
 		if (story == null) {
@@ -158,17 +69,6 @@ public abstract class BasicReader {
 		}
 	}
 
-	/**
-	 * Create a new {@link BasicReader} for an external {@link Story}.
-	 * 
-	 * @param source
-	 *            the {@link Story} {@link URL}
-	 * @param pg
-	 *            the optional progress reporter
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error
-	 */
 	public void setStory(URL source, Progress pg) throws IOException {
 		BasicSupport support = BasicSupport.getSupport(source);
 		if (support == null) {
@@ -184,37 +84,6 @@ public abstract class BasicReader {
 		}
 	}
 
-	/**
-	 * Start the {@link Story} Reading.
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error or if the {@link Story} was not
-	 *             previously set
-	 */
-	public abstract void read() throws IOException;
-
-	/**
-	 * Read the selected chapter (starting at 1).
-	 * 
-	 * @param chapter
-	 *            the chapter
-	 * 
-	 * @throws IOException
-	 *             in case of I/O error or if the {@link Story} was not
-	 *             previously set
-	 */
-	public abstract void read(int chapter) throws IOException;
-
-	/**
-	 * Start the reader in browse mode for the given source (or pass NULL for
-	 * all sources).
-	 * 
-	 * @param source
-	 *            the type of {@link Story} to take into account, or NULL for
-	 *            all
-	 */
-	public abstract void browse(String source);
-
 	/**
 	 * Return a new {@link BasicReader} ready for use if one is configured.
 	 * <p>
@@ -222,11 +91,11 @@ public abstract class BasicReader {
 	 * 
 	 * @return a {@link BasicReader}, or NULL if none configured
 	 */
-	public static BasicReader getReader() {
+	public static Reader getReader() {
 		try {
 			if (defaultType != null) {
-				return ((BasicReader) SerialUtils.createObject(defaultType
-						.getTypeName())).setType(defaultType);
+				return (Reader) SerialUtils.createObject(defaultType
+						.getTypeName());
 			}
 		} catch (Exception e) {
 			Instance.syserr(new Exception("Cannot create a reader of type: "