From 9252c65e13ceb952626da9e1f9e6d5caef42733e Mon Sep 17 00:00:00 2001
From: Niki Roo <niki@nikiroo.be>
Date: Sun, 12 Feb 2017 16:50:14 +0100
Subject: [PATCH] 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"

---
 VERSION                                       |   2 +-
 ...es.jar => nikiroo-utils-0.9.4-sources.jar} | Bin 33260 -> 33252 bytes
 src/be/nikiroo/fanfix/Cache.java              |   3 +--
 .../fanfix/supported/BasicSupport.java        |   6 ++----
 4 files changed, 4 insertions(+), 7 deletions(-)
 rename libs/{nikiroo-utils-0.9.3-sources.jar => nikiroo-utils-0.9.4-sources.jar} (92%)

diff --git a/VERSION b/VERSION
index ac39a106..f374f666 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 668e2b8bad7b08f22a787713a68cfd8f40d69303..49bee8e49348622c1ebfd66a51bc8126784f5fe7 100644
GIT binary patch
delta 1602
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
AS^xk5

delta 1635
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

diff --git a/src/be/nikiroo/fanfix/Cache.java b/src/be/nikiroo/fanfix/Cache.java
index 20d2885d..0166a37d 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 ded09c22..b9517284 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");
-- 
2.27.0