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
derename.sh
[fanfix.git]
/
supported
/
Epub.java
diff --git
a/supported/Epub.java
b/supported/Epub.java
index 82af11855fdc299226fe2f52ca536f17a07d1d00..f8e467831381185244eae24b15d3a96a6cb0f6cb 100644
(file)
--- a/
supported/Epub.java
+++ b/
supported/Epub.java
@@
-42,10
+42,8
@@
class Epub extends InfoText {
try {
return new File(fakeSource.toURI());
} catch (URISyntaxException e) {
try {
return new File(fakeSource.toURI());
} catch (URISyntaxException e) {
- Instance.getTraceHandler()
- .error(new IOException(
- "Cannot get the source file from the info-text URL",
- e));
+ Instance.getInstance().getTraceHandler()
+ .error(new IOException("Cannot get the source file from the info-text URL", e));
}
return null;
}
return null;
@@
-57,9
+55,7
@@
class Epub extends InfoText {
try {
fakeIn.reset();
} catch (IOException e) {
try {
fakeIn.reset();
} catch (IOException e) {
- Instance.getTraceHandler()
- .error(new IOException(
- "Cannot reset the Epub Text stream", e));
+ Instance.getInstance().getTraceHandler().error(new IOException("Cannot reset the Epub Text stream", e));
}
return fakeIn;
}
return fakeIn;
@@
-87,8
+83,7
@@
class Epub extends InfoText {
ZipInputStream zipIn = null;
try {
zipIn = new ZipInputStream(in);
ZipInputStream zipIn = null;
try {
zipIn = new ZipInputStream(in);
- tmpDir = Instance.getTempFiles().createTempDir(
- "fanfic-reader-parser");
+ tmpDir = Instance.getInstance().getTempFiles().createTempDir("fanfic-reader-parser");
File tmp = new File(tmpDir, "file.txt");
File tmpInfo = new File(tmpDir, "file.info");
File tmp = new File(tmpDir, "file.txt");
File tmpInfo = new File(tmpDir, "file.info");
@@
-129,7
+124,7
@@
class Epub extends InfoText {
try {
cover = new Image(zipIn);
} catch (Exception e) {
try {
cover = new Image(zipIn);
} catch (Exception e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
} else if (entry.getName().equals(getDataPrefix() + "URL")) {
}
}
} else if (entry.getName().equals(getDataPrefix() + "URL")) {