From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 May 2019 19:43:44 +0000 (+0200)
Subject: fix typo in Enum i18n + fix Import
X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=commitdiff_plain;h=67837328c9ded45b23691e2a3ebdb29c75f157f2

fix typo in Enum i18n + fix Import
---

diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar
index 6676e98..c4f532d 100644
Binary files a/libs/nikiroo-utils-4.7.2-dev-sources.jar and b/libs/nikiroo-utils-4.7.2-dev-sources.jar differ
diff --git a/src/be/nikiroo/fanfix/bundles/StringIdGui.java b/src/be/nikiroo/fanfix/bundles/StringIdGui.java
index 0fb8385..6bb774c 100644
--- a/src/be/nikiroo/fanfix/bundles/StringIdGui.java
+++ b/src/be/nikiroo/fanfix/bundles/StringIdGui.java
@@ -150,7 +150,7 @@ public enum StringIdGui {
 	@Meta(def = "An error occured when contacting the library", format = Format.STRING, description = "default description if the error is not known")
 	ERROR_LIB_STATUS, //
 	@Meta(def = "You are not allowed to access this library", format = Format.STRING, description = "library access not allowed")
-	ERROR_LIB_STATUS_UNAUTORIZED, //
+	ERROR_LIB_STATUS_UNAUTHORIZED, //
 	@Meta(def = "Library not valid", format = Format.STRING, description = "the library is invalid (not correctly set up)")
 	ERROR_LIB_STATUS_INVALID, //
 	@Meta(def = "Library currently unavailable", format = Format.STRING, description = "the library is out of commission")
diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui.properties b/src/be/nikiroo/fanfix/bundles/resources_gui.properties
index 9840392..de44c18 100644
--- a/src/be/nikiroo/fanfix/bundles/resources_gui.properties
+++ b/src/be/nikiroo/fanfix/bundles/resources_gui.properties
@@ -165,7 +165,7 @@ PROGRESS_CHANGE_SOURCE = Change the source of the book to %s
 ERROR_LIB_STATUS = An error occured when contacting the library
 # library access not allowed
 # (FORMAT: STRING) 
-ERROR_LIB_STATUS_UNAUTORIZED = You are not allowed to access this library
+ERROR_LIB_STATUS_UNAUTHORIZED = You are not allowed to access this library
 # the library is invalid (not correctly set up)
 # (FORMAT: STRING) 
 ERROR_LIB_STATUS_INVALID = Library not valid
diff --git a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
index 453957c..2b6d192 100644
--- a/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
+++ b/src/be/nikiroo/fanfix/bundles/resources_gui_fr.properties
@@ -165,7 +165,7 @@ PROGRESS_CHANGE_SOURCE = Change la source du livre en %s
 ERROR_LIB_STATUS = Une erreur est survenue en contactant la librairie
 # library access not allowed
 # (FORMAT: STRING) 
-ERROR_LIB_STATUS_UNAUTORIZED = Vous n'étes pas autorisé à accéder à cette librairie
+ERROR_LIB_STATUS_UNAUTHORIZED = Vous n'étes pas autorisé à accéder à cette librairie
 # the library is invalid (not correctly set up)
 # (FORMAT: STRING) 
 ERROR_LIB_STATUS_INVALID = Librairie invalide
diff --git a/src/be/nikiroo/fanfix/supported/Cbz.java b/src/be/nikiroo/fanfix/supported/Cbz.java
index e1a766e..dfc1bbb 100644
--- a/src/be/nikiroo/fanfix/supported/Cbz.java
+++ b/src/be/nikiroo/fanfix/supported/Cbz.java
@@ -21,7 +21,7 @@ import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -78,8 +78,7 @@ class Cbz extends Epub {
 		InputStream cbzIn = null;
 		ZipInputStream zipIn = null;
 		try {
-			cbzIn = new MarkableFileInputStream(new FileInputStream(
-					getSourceFileOriginal()));
+			cbzIn = new MarkableFileInputStream(getSourceFileOriginal());
 			zipIn = new ZipInputStream(cbzIn);
 			for (ZipEntry entry = zipIn.getNextEntry(); entry != null; entry = zipIn
 					.getNextEntry()) {
diff --git a/src/be/nikiroo/fanfix/supported/Epub.java b/src/be/nikiroo/fanfix/supported/Epub.java
index c71ba17..ae26574 100644
--- a/src/be/nikiroo/fanfix/supported/Epub.java
+++ b/src/be/nikiroo/fanfix/supported/Epub.java
@@ -17,7 +17,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.IOUtils;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -174,8 +174,7 @@ class Epub extends InfoText {
 			}
 
 			if (tmp.exists()) {
-				this.fakeIn = new MarkableFileInputStream(new FileInputStream(
-						tmp));
+				this.fakeIn = new MarkableFileInputStream(tmp);
 			}
 
 			if (tmpInfo.exists()) {
diff --git a/src/be/nikiroo/fanfix/supported/InfoReader.java b/src/be/nikiroo/fanfix/supported/InfoReader.java
index 817345e..57f021f 100644
--- a/src/be/nikiroo/fanfix/supported/InfoReader.java
+++ b/src/be/nikiroo/fanfix/supported/InfoReader.java
@@ -14,7 +14,7 @@ import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.Image;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 
 // not complete: no "description" tag
 public class InfoReader {
@@ -25,8 +25,7 @@ public class InfoReader {
 		}
 
 		if (infoFile.exists()) {
-			InputStream in = new MarkableFileInputStream(new FileInputStream(
-					infoFile));
+			InputStream in = new MarkableFileInputStream(infoFile);
 			try {
 				return createMeta(infoFile.toURI().toURL(), in, withCover);
 			} finally {
diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 3518f20..5a4188a 100644
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -19,7 +19,7 @@ import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.utils.Image;
 import be.nikiroo.utils.ImageUtils;
-import be.nikiroo.utils.MarkableFileInputStream;
+import be.nikiroo.utils.streams.MarkableFileInputStream;
 import be.nikiroo.utils.Progress;
 
 /**
@@ -71,7 +71,7 @@ class Text extends BasicSupport {
 	protected Document loadDocument(URL source) throws IOException {
 		try {
 			sourceFile = new File(source.toURI());
-			in = new MarkableFileInputStream(new FileInputStream(sourceFile));
+			in = new MarkableFileInputStream(sourceFile);
 		} catch (URISyntaxException e) {
 			throw new IOException("Cannot load the text document: " + source);
 		}