Instance: use getInstance()

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

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java b/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
index 62006f41790ed6771c4e952cde667ccb00d18a2b..b5c7bb9cdee9ccaf96c1de6c38eeb4aaa76a9537 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupportHelper.java
@@ -26,10 +26,9 @@ public class BasicSupportHelper {
         * @return the cover if any, or NULL
         */
        public Image getDefaultCover(String subject) {
-               if (subject != null && !subject.isEmpty()
-                               && Instance.getCoverDir() != null) {
+               if (subject != null && !subject.isEmpty() && Instance.getInstance().getCoverDir() != null) {
                        try {
-                               File fileCover = new File(Instance.getCoverDir(), subject);
+                               File fileCover = new File(Instance.getInstance().getCoverDir(), subject);
                                return getImage(null, fileCover.toURI().toURL(), subject);
                        } catch (MalformedURLException e) {
                        }
@@ -63,7 +62,8 @@ public class BasicSupportHelper {
         * @param support
         *            the linked {@link BasicSupport} (can be NULL)
         * @param source
-        *            the story source
+        *            the source of the story (for image lookup in the same path if
+        *            the source is a file, can be NULL)
         * @param line
         *            the resource to check
         * 
@@ -80,7 +80,7 @@ public class BasicSupportHelper {
                        }
                        InputStream in = null;
                        try {
-                               in = Instance.getCache().open(url, support, true);
+                               in = Instance.getInstance().getCache().open(url, support, true);
                                return new Image(in);
                        } catch (IOException e) {
                        } finally {
@@ -103,7 +103,8 @@ public class BasicSupportHelper {
         * @param support
         *            the linked {@link BasicSupport} (can be NULL)
         * @param source
-        *            the story source
+        *            the source of the story (for image lookup in the same path if
+        *            the source is a file, can be NULL)
         * @param line
         *            the resource to check
         * 
@@ -154,8 +155,7 @@ public class BasicSupportHelper {
                                // try for URLs
                                try {
                                        for (String ext : getImageExt(true)) {
-                                               if (Instance.getCache()
-                                                               .check(new URL(line + ext), true)) {
+                                               if (Instance.getInstance().getCache().check(new URL(line + ext), true)) {
                                                        url = new URL(line + ext);
                                                        break;
                                                }
@@ -166,7 +166,7 @@ public class BasicSupportHelper {
                                                for (String ext : getImageExt(true)) {
                                                        try {
                                                                url = new URL(line + ext);
-                                                               Instance.getCache().refresh(url, support, true);
+                                                               Instance.getInstance().getCache().refresh(url, support, true);
                                                                break;
                                                        } catch (IOException e) {
                                                                // no image with this ext
@@ -182,7 +182,7 @@ public class BasicSupportHelper {
                        // refresh the cached file
                        if (url != null) {
                                try {
-                                       Instance.getCache().refresh(url, support, true);
+                                       Instance.getInstance().getCache().refresh(url, support, true);
                                } catch (IOException e) {
                                        // woops, broken image
                                        url = null;
@@ -204,7 +204,7 @@ public class BasicSupportHelper {
        public String fixAuthor(String author) {
                if (author != null) {
                        for (String suffix : new String[] { " ", ":" }) {
-                               for (String byString : Instance.getConfig().getList(Config.CONF_BYS)) {
+                               for (String byString : Instance.getInstance().getConfig().getList(Config.CONF_BYS)) {
                                        byString += suffix;
                                        if (author.toUpperCase().startsWith(byString.toUpperCase())) {
                                                author = author.substring(byString.length()).trim();