From 67837328c9ded45b23691e2a3ebdb29c75f157f2 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Thu, 2 May 2019 21:43:44 +0200 Subject: [PATCH] fix typo in Enum i18n + fix Import --- libs/nikiroo-utils-4.7.2-dev-sources.jar | Bin 320245 -> 320535 bytes .../nikiroo/fanfix/bundles/StringIdGui.java | 2 +- .../fanfix/bundles/resources_gui.properties | 2 +- .../bundles/resources_gui_fr.properties | 2 +- src/be/nikiroo/fanfix/supported/Cbz.java | 5 ++--- src/be/nikiroo/fanfix/supported/Epub.java | 5 ++--- .../nikiroo/fanfix/supported/InfoReader.java | 5 ++--- src/be/nikiroo/fanfix/supported/Text.java | 4 ++-- 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/libs/nikiroo-utils-4.7.2-dev-sources.jar b/libs/nikiroo-utils-4.7.2-dev-sources.jar index 6676e982d0c5a8864652d574fe7af08620453ac7..c4f532dfe98705c805819c33f9d373d787aad704 100644 GIT binary patch delta 19464 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 b6@qRlL{VkpOlC1jhz>?mi>pMFt1ABoY+2wj delta 19093 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 z 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 JCHUc<`VWvhOgR7m 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); } -- 2.27.0