git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dependency fix + Local/Remote Library support
[fanfix.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
BasicReader.java
diff --git
a/src/be/nikiroo/fanfix/reader/BasicReader.java
b/src/be/nikiroo/fanfix/reader/BasicReader.java
index 05e3e3df1124b6eae858e536e5b57adec2db78e2..f8341ae0b10d32cc75eba966ed116561749ea7cf 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/BasicReader.java
+++ b/
src/be/nikiroo/fanfix/reader/BasicReader.java
@@
-6,8
+6,9
@@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.MalformedURLException;
import java.net.URL;
+import be.nikiroo.fanfix.BasicLibrary;
import be.nikiroo.fanfix.Instance;
import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.Library;
+import be.nikiroo.fanfix.L
ocalL
ibrary;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
import be.nikiroo.fanfix.bundles.Config;
import be.nikiroo.fanfix.bundles.UiConfig;
import be.nikiroo.fanfix.data.MetaData;
@@
-49,10
+50,10
@@
public abstract class BasicReader {
}
}
}
}
- private static Library defaultLibrary = Instance.getLibrary();
+ private static
Basic
Library defaultLibrary = Instance.getLibrary();
private static ReaderType defaultType = ReaderType.GUI;
private static ReaderType defaultType = ReaderType.GUI;
- private Library lib;
+ private
Basic
Library lib;
private Story story;
private ReaderType type;
private Story story;
private ReaderType type;
@@
-101,12
+102,12
@@
public abstract class BasicReader {
}
/**
}
/**
- * The {@link Library} to load the stories from (by default, takes the
- * default {@link Library}).
+ * The {@link L
ocalL
ibrary} to load the stories from (by default, takes the
+ * default {@link L
ocalL
ibrary}).
*
*
- * @return the {@link Library}
+ * @return the {@link L
ocalL
ibrary}
*/
*/
- public Library getLibrary() {
+ public
Basic
Library getLibrary() {
if (lib == null) {
lib = defaultLibrary;
}
if (lib == null) {
lib = defaultLibrary;
}
@@
-115,19
+116,19
@@
public abstract class BasicReader {
}
/**
}
/**
- * Change the {@link Library} that will be managed by this
+ * Change the {@link L
ocalL
ibrary} that will be managed by this
* {@link BasicReader}.
*
* @param lib
* {@link BasicReader}.
*
* @param lib
- * the new {@link Library}
+ * the new {@link L
ocalL
ibrary}
*/
*/
- public void setLibrary(Library lib) {
+ public void setLibrary(L
ocalL
ibrary lib) {
this.lib = lib;
}
/**
* Create a new {@link BasicReader} for a {@link Story} in the
this.lib = lib;
}
/**
* Create a new {@link BasicReader} for a {@link Story} in the
- * {@link Library}.
+ * {@link L
ocalL
ibrary}.
*
* @param luid
* the {@link Story} ID
*
* @param luid
* the {@link Story} ID
@@
-247,12
+248,13
@@
public abstract class BasicReader {
}
/**
}
/**
- * Change the default {@link Library} to open with the {@link BasicReader}s.
+ * Change the default {@link LocalLibrary} to open with the
+ * {@link BasicReader}s.
*
* @param lib
*
* @param lib
- * the new {@link Library}
+ * the new {@link L
ocalL
ibrary}
*/
*/
- public static void setDefaultLibrary(Library lib) {
+ public static void setDefaultLibrary(
Basic
Library lib) {
BasicReader.defaultLibrary = lib;
}
BasicReader.defaultLibrary = lib;
}
@@
-285,7
+287,7
@@
public abstract class BasicReader {
}
// open with external player the related file
}
// open with external player the related file
- public static void open(Library lib, String luid) throws IOException {
+ public static void open(
Basic
Library lib, String luid) throws IOException {
MetaData meta = lib.getInfo(luid);
File target = lib.getFile(luid);
MetaData meta = lib.getInfo(luid);
File target = lib.getFile(luid);