Instance: use getInstance()

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / Epub.java

diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index c71ba1785ea9db20e6d10bc5b5a72f6612057d53..f8e467831381185244eae24b15d3a96a6cb0f6cb 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Epub.java
+++ b/src/be/nikiroo/fanfix/supported/Epub.java
@@ -1,7 +1,6 @@
 package be.nikiroo.fanfix.supported;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URISyntaxException;
@@ -17,8 +16,8 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
 import be.nikiroo.utils.StringUtils;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 /**
  * Support class for EPUB files created with this program (as we need some
@@ -43,10 +42,8 @@ class Epub extends InfoText {
                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;
@@ -58,9 +55,7 @@ class Epub extends InfoText {
                        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;
@@ -88,8 +83,7 @@ class Epub extends InfoText {
                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");
 
@@ -112,7 +106,7 @@ class Epub extends InfoText {
                                        String entryLName = entry.getName().toLowerCase();
 
                                        boolean imageEntry = false;
-                                       for (String ext : BasicSupportImages.getImageExt(false)) {
+                                       for (String ext : bsImages.getImageExt(false)) {
                                                if (entryLName.endsWith(ext)) {
                                                        imageEntry = true;
                                                }
@@ -130,7 +124,7 @@ class Epub extends InfoText {
                                                        try {
                                                                cover = new Image(zipIn);
                                                        } catch (Exception e) {
-                                                               Instance.getTraceHandler().error(e);
+                                                               Instance.getInstance().getTraceHandler().error(e);
                                                        }
                                                }
                                        } else if (entry.getName().equals(getDataPrefix() + "URL")) {
@@ -174,8 +168,7 @@ class Epub extends InfoText {
                        }
 
                        if (tmp.exists()) {
-                               this.fakeIn = new MarkableFileInputStream(new FileInputStream(
-                                               tmp));
+                               this.fakeIn = new MarkableFileInputStream(tmp);
                        }
 
                        if (tmpInfo.exists()) {