From: Niki Roo <niki@nikiroo.be>
Date: Sun, 12 Feb 2017 15:50:14 +0000 (+0100)
Subject: JDK 1.6 compatibility fixes (still not tested on 1.5)
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=9252c65e13ceb952626da9e1f9e6d5caef42733e;p=nikiroo-utils.git

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 ac39a10..f374f66 100644
--- 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 668e2b8..49bee8e 100644
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 20d2885..0166a37 100644
--- 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 ded09c2..b951728 100644
--- 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");