JDK 1.6 compatibility fixes (still not tested on 1.5)

Basically, a few comments causing bad "import"s and a call to
Charset.UTF8 instead of "UTF-8"

diff --git a/VERSION b/VERSION
index ac39a106c48515b621e90c028ed94c6f71bc03fa..f374f6662e9a1983e9b8a534a3295df618772ffe 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.0
+0.9.1

diff --git a/libs/nikiroo-utils-0.9.3-sources.jar b/libs/nikiroo-utils-0.9.4-sources.jar
similarity index 92%
rename from libs/nikiroo-utils-0.9.3-sources.jar
rename to libs/nikiroo-utils-0.9.4-sources.jar
index 668e2b8bad7b08f22a787713a68cfd8f40d69303..49bee8e49348622c1ebfd66a51bc8126784f5fe7 100644 (file)
Binary files a/libs/nikiroo-utils-0.9.3-sources.jar and b/libs/nikiroo-utils-0.9.4-sources.jar differ

diff --git a/src/be/nikiroo/fanfix/Cache.java b/src/be/nikiroo/fanfix/Cache.java
index 20d2885df2f5fd43ecebe72c2dbb80f222aa65bb..0166a37d1689fa6152ec7a451bf568071809302b 100644 (file)
--- a/src/be/nikiroo/fanfix/Cache.java
+++ b/src/be/nikiroo/fanfix/Cache.java
@@ -15,7 +15,6 @@ import java.net.HttpURLConnection;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.file.FileAlreadyExistsException;
 import java.util.Date;
 import java.util.Map;
 import java.util.zip.GZIPInputStream;
@@ -228,7 +227,7 @@ public class Cache {
         * @param uniqueID
         *            a unique ID for this resource
         * 
-        * @return the resulting {@link FileAlreadyExistsException}
+        * @return the resulting {@link File}
         * 
         * @throws IOException
         *             in case of I/O error

diff --git a/src/be/nikiroo/fanfix/supported/BasicSupport.java b/src/be/nikiroo/fanfix/supported/BasicSupport.java
index ded09c2234ba9cf50f8db06cdfa6f72280539e07..b9517284318e30169f571109fb4611d789fa006d 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/BasicSupport.java
+++ b/src/be/nikiroo/fanfix/supported/BasicSupport.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -20,8 +19,8 @@ import be.nikiroo.fanfix.bundles.StringId;
 import be.nikiroo.fanfix.data.Chapter;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
-import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
+import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -799,8 +798,7 @@ public abstract class BasicSupport {
                                        "\n* * *\n");
                }
 
-               InputStream in = new ByteArrayInputStream(
-                               content.getBytes(StandardCharsets.UTF_8));
+               InputStream in = new ByteArrayInputStream(content.getBytes("UTF-8"));
                try {
                        @SuppressWarnings("resource")
                        Scanner scan = new Scanner(in, "UTF-8");