Better URL entries + fix for FimFicAPI:

[fanfix.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 574ea0656c82168f73a9d9f5980d7870eb9a4b0b..9a09f077bf82b2145bd7242d52fbbb1b0d8cc266 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/EHentai.java
+++ b/src/be/nikiroo/fanfix/supported/EHentai.java
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
@@ -108,11 +109,11 @@ class EHentai extends BasicSupport_Deprecated {
                if (langLine != null) {
                        langLine = StringUtils.unhtml(langLine).trim();
                        if (langLine.equalsIgnoreCase("English")) {
-                               lang = "EN";
+                               lang = "en";
                        } else if (langLine.equalsIgnoreCase("Japanese")) {
-                               lang = "JP";
+                               lang = "jp";
                        } else if (langLine.equalsIgnoreCase("French")) {
-                               lang = "FR";
+                               lang = "fr";
                        } else {
                                // TODO find the code?
                                lang = langLine;
@@ -229,24 +230,8 @@ class EHentai extends BasicSupport_Deprecated {
                }
 
                for (int i = 0; i <= last; i++) {
-                       final String key = Integer.toString(i + 1);
-                       final URL value = new URL(source.toString() + "?p=" + 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 + 1), new URL(source.toString() + "?p=" + i)));
                }
 
                return urls;