Remove or move java.awt dependencies

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

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 05d122e68b89efc71587fda628f9b17e720736d7..72c68b1a20e589f206275444390e1aaf0c72b247 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -1,6 +1,5 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -13,6 +12,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.utils.Image;
 import be.nikiroo.utils.Progress;
 import be.nikiroo.utils.StringUtils;
 
@@ -87,10 +87,10 @@ class E621 extends BasicSupport {
                return true;
        }
 
-       private BufferedImage getCover(URL source) throws IOException {
+       private Image getCover(URL source) throws IOException {
                InputStream in = Instance.getCache().open(source, this, true);
                String images = getChapterContent(new URL(source.toString() + "?page="
-                               + 1), in, 1);
+                               + 1), in, 1, null);
                if (!images.isEmpty()) {
                        int pos = images.indexOf("<br/>");
                        if (pos >= 0) {
@@ -102,7 +102,7 @@ class E621 extends BasicSupport {
                return null;
        }
 
-       private String getAuthor(URL source, InputStream in) throws IOException {
+       private String getAuthor(URL source, InputStream in) {
                String author = getLine(in, "href=\"/post/show/", 0);
                if (author != null) {
                        String key = "href=\"";
@@ -144,7 +144,7 @@ class E621 extends BasicSupport {
                return null;
        }
 
-       private String getTitle(InputStream in) throws IOException {
+       private String getTitle(InputStream in) {
                String title = getLine(in, "<title>", 0);
                if (title != null) {
                        int pos = title.indexOf('>');
@@ -191,8 +191,8 @@ class E621 extends BasicSupport {
        }
 
        @Override
-       protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-                       throws IOException {
+       protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+                       Progress pg) throws IOException {
                List<Entry<String, URL>> urls = new ArrayList<Entry<String, URL>>();
                int last = 1; // no pool/show when only one page
 
@@ -222,14 +222,17 @@ class E621 extends BasicSupport {
                        final String key = Integer.toString(i);
                        final URL value = new URL(source.toString() + "?page=" + i);
                        urls.add(new Entry<String, URL>() {
+                               @Override
                                public URL setValue(URL value) {
                                        return null;
                                }
 
+                               @Override
                                public URL getValue() {
                                        return value;
                                }
 
+                               @Override
                                public String getKey() {
                                        return key;
                                }
@@ -240,8 +243,8 @@ class E621 extends BasicSupport {
        }
 
        @Override
-       protected String getChapterContent(URL source, InputStream in, int number)
-                       throws IOException {
+       protected String getChapterContent(URL source, InputStream in, int number,
+                       Progress pg) throws IOException {
                StringBuilder builder = new StringBuilder();
                String staticSite = "https://static1.e621.net";
                if (source.getHost().contains("e926")) {