X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FBasicLibrary.java;h=c558384d380526819f36a8dac9553b89d33517ca;hb=d66deb8d8b30cff6b54db352eef34a3508939f84;hp=3e3756fe90d1677ac2b9820bf300b10cc3b484ea;hpb=0bb51c9c66697fe63ba066715207deabbcc1d479;p=fanfix.git
diff --git a/src/be/nikiroo/fanfix/library/BasicLibrary.java b/src/be/nikiroo/fanfix/library/BasicLibrary.java
index 3e3756f..c558384 100644
--- a/src/be/nikiroo/fanfix/library/BasicLibrary.java
+++ b/src/be/nikiroo/fanfix/library/BasicLibrary.java
@@ -191,8 +191,8 @@ abstract public class BasicLibrary {
* @throws IOException
* in case of IOException
*/
- public Image getCustomSourceCover(@SuppressWarnings("unused") String source)
- throws IOException {
+ @SuppressWarnings("unused")
+ public Image getCustomSourceCover(String source) throws IOException {
return null;
}
@@ -209,8 +209,8 @@ abstract public class BasicLibrary {
* @throws IOException
* in case of IOException
*/
- public Image getCustomAuthorCover(@SuppressWarnings("unused") String author)
- throws IOException {
+ @SuppressWarnings("unused")
+ public Image getCustomAuthorCover(String author) throws IOException {
return null;
}
@@ -328,9 +328,6 @@ abstract public class BasicLibrary {
*
* @param pg
* the optional progress reporter
- *
- * @throws IOException
- * in case of IOException
*/
public void refresh(Progress pg) {
try {
@@ -525,13 +522,9 @@ abstract public class BasicLibrary {
* the starting character, *, 0 or a capital
* letter
*
- * @return the authors that fulfill the starting letter
- *
- * @throws IOException
- * in case of IOException
+ * @return the authors that fulfil the starting letter
*/
- private List getAuthorsGroup(List authors, char car)
- throws IOException {
+ private List getAuthorsGroup(List authors, char car) {
List accepted = new ArrayList();
for (String author : authors) {
char first = '*';
@@ -737,10 +730,8 @@ abstract public class BasicLibrary {
} catch (IOException e) {
// We should not have not-supported files in the
// library
- Instance.getTraceHandler().error(
- new IOException(String.format(
- "Cannot load file of type '%s' from library: %s",
- meta.getType(), file), e));
+ Instance.getInstance().getTraceHandler().error(new IOException(
+ String.format("Cannot load file of type '%s' from library: %s", meta.getType(), file), e));
} finally {
pgProcess.done();
pg.done();
@@ -758,14 +749,14 @@ abstract public class BasicLibrary {
* @param pg
* the optional progress reporter
*
- * @return the imported {@link Story}
+ * @return the imported Story {@link MetaData}
*
* @throws UnknownHostException
* if the host is not supported
* @throws IOException
* in case of I/O error
*/
- public Story imprt(URL url, Progress pg) throws IOException {
+ public MetaData imprt(URL url, Progress pg) throws IOException {
if (pg == null)
pg = new Progress();
@@ -783,7 +774,7 @@ abstract public class BasicLibrary {
Story story = save(support.process(pgProcess), pgSave);
pg.done();
- return story;
+ return story.getMeta();
}
/**
@@ -899,8 +890,7 @@ abstract public class BasicLibrary {
public synchronized Story save(Story story, String luid, Progress pg)
throws IOException {
- Instance.getTraceHandler().trace(
- this.getClass().getSimpleName() + ": saving story " + luid);
+ Instance.getInstance().getTraceHandler().trace(this.getClass().getSimpleName() + ": saving story " + luid);
// Do not change the original metadata, but change the original story
MetaData meta = story.getMeta().clone();
@@ -920,9 +910,8 @@ abstract public class BasicLibrary {
updateInfo(story.getMeta());
- Instance.getTraceHandler().trace(
- this.getClass().getSimpleName() + ": story saved (" + luid
- + ")");
+ Instance.getInstance().getTraceHandler()
+ .trace(this.getClass().getSimpleName() + ": story saved (" + luid + ")");
return story;
}
@@ -937,14 +926,13 @@ abstract public class BasicLibrary {
* in case of I/O error
*/
public synchronized void delete(String luid) throws IOException {
- Instance.getTraceHandler().trace(
- this.getClass().getSimpleName() + ": deleting story " + luid);
+ Instance.getInstance().getTraceHandler().trace(this.getClass().getSimpleName() + ": deleting story " + luid);
doDelete(luid);
invalidateInfo(luid);
- Instance.getTraceHandler().trace(
- this.getClass().getSimpleName() + ": story deleted (" + luid
+ Instance.getInstance().getTraceHandler()
+ .trace(this.getClass().getSimpleName() + ": story deleted (" + luid
+ ")");
}