Instance: use getInstance()

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

diff --git a/src/be/nikiroo/fanfix/supported/EHentai.java b/src/be/nikiroo/fanfix/supported/EHentai.java
index 1947620a365fe9e41a95477f88b4960db538966f..03c1557432194187cb54e2b43e9f4239d42c1668 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/EHentai.java
+++ b/src/be/nikiroo/fanfix/supported/EHentai.java
@@ -26,11 +26,6 @@ import be.nikiroo.utils.StringUtils;
  * @author niki
  */
 class EHentai extends BasicSupport_Deprecated {
-       @Override
-       public String getSourceName() {
-               return "e-hentai.org";
-       }
-
        @Override
        protected MetaData getMeta(URL source, InputStream in) throws IOException {
                MetaData meta = new MetaData();
@@ -39,9 +34,9 @@ class EHentai extends BasicSupport_Deprecated {
                meta.setAuthor(getAuthor(reset(in)));
                meta.setDate(getDate(reset(in)));
                meta.setTags(getTags(reset(in)));
-               meta.setSource(getSourceName());
+               meta.setSource(getType().getSourceName());
                meta.setUrl(source.toString());
-               meta.setPublisher(getSourceName());
+               meta.setPublisher(getType().getSourceName());
                meta.setUuid(source.toString());
                meta.setLuid("");
                meta.setLang(getLang(reset(in)));
@@ -82,7 +77,6 @@ class EHentai extends BasicSupport_Deprecated {
 
        @Override
        public Map<String, String> getCookies() {
-               // TODO Auto-generated method stub
                Map<String, String> cookies = super.getCookies();
                cookies.put("nw", "1");
                return cookies;
@@ -261,10 +255,8 @@ class EHentai extends BasicSupport_Deprecated {
                                try {
                                        pages.add(new URL(line));
                                } catch (MalformedURLException e) {
-                                       Instance.getTraceHandler().error(
-                                                       new IOException(
-                                                                       "Parsing error, a link is not correctly parsed: "
-                                                                                       + line, e));
+                                       Instance.getInstance().getTraceHandler()
+                                                       .error(new IOException("Parsing error, a link is not correctly parsed: " + line, e));
                                }
                        }
                }
@@ -278,7 +270,7 @@ class EHentai extends BasicSupport_Deprecated {
                StringBuilder builder = new StringBuilder();
 
                for (URL page : pages) {
-                       InputStream pageIn = Instance.getCache().open(page, this, false);
+                       InputStream pageIn = Instance.getInstance().getCache().open(page, this, false);
                        try {
                                String link = getKeyLine(pageIn, "id=\"img\"", "src=\"", "\"");
                                if (link != null && !link.isEmpty()) {