X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Fsupported%2FE621.java;h=f299ee7ff8d14b00df5cd3ca12318237a37d32ef;hb=ce297a794b1b7d3aa4e9234a6511dd9fe7216656;hp=1baa6201cb217508074cd54608085d38ecadcd01;hpb=211f7ddb50f68aa8a999023ef6d63d5756bdace6;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/supported/E621.java b/src/be/nikiroo/fanfix/supported/E621.java
index 1baa620..f299ee7 100644
--- a/src/be/nikiroo/fanfix/supported/E621.java
+++ b/src/be/nikiroo/fanfix/supported/E621.java
@@ -1,9 +1,9 @@
 package be.nikiroo.fanfix.supported;
 
-import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -13,6 +13,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;
 
@@ -26,7 +27,7 @@ import be.nikiroo.utils.StringUtils;
  * 
  * @author niki
  */
-class E621 extends BasicSupport {
+class E621 extends BasicSupport_Deprecated {
 	@Override
 	public String getSourceName() {
 		return "e621.net";
@@ -45,7 +46,7 @@ class E621 extends BasicSupport {
 		meta.setPublisher(getSourceName());
 		meta.setUuid(source.toString());
 		meta.setLuid("");
-		meta.setLang("EN");
+		meta.setLang("en");
 		meta.setSubject("Furry");
 		meta.setType(getType().toString());
 		meta.setImageDocument(true);
@@ -87,7 +88,7 @@ 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, null);
@@ -219,24 +220,8 @@ class E621 extends BasicSupport {
 		}
 
 		for (int i = 1; i <= last; i++) {
-			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;
-				}
-			});
+			urls.add(new AbstractMap.SimpleEntry<String, URL>(Integer
+					.toString(i), new URL(source.toString() + "?page=" + i)));
 		}
 
 		return urls;