Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / Text.java

diff --git a/src/be/nikiroo/fanfix/supported/Text.java b/src/be/nikiroo/fanfix/supported/Text.java
index 3b486ce8d0c4a36b8610a3bd10da9943e3dbfb6c..c9ebd18d108ddac863b5182c9554033fe2e78f6e 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/Text.java
+++ b/src/be/nikiroo/fanfix/supported/Text.java
@@ -14,6 +14,7 @@ import java.util.Scanner;
 import be.nikiroo.fanfix.Instance;
 import be.nikiroo.fanfix.bundles.Config;
 import be.nikiroo.fanfix.data.MetaData;
+import be.nikiroo.utils.Progress;
 
 /**
  * Support class for local stories encoded in textual format, with a few rules:
@@ -56,7 +57,7 @@ class Text extends BasicSupport {
                meta.setPublisher("");
                meta.setUuid(source.toString());
                meta.setLuid("");
-               meta.setLang(getLang(source, reset(in))); // default is EN
+               meta.setLang(getLang(reset(in))); // default is EN
                meta.setSubject(getSubject(source));
                meta.setType(getType().toString());
                meta.setImageDocument(false);
@@ -76,7 +77,7 @@ class Text extends BasicSupport {
 
        }
 
-       private String getLang(URL source, InputStream in) throws IOException {
+       private String getLang(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -102,14 +103,14 @@ class Text extends BasicSupport {
                return lang;
        }
 
-       private String getTitle(InputStream in) throws IOException {
+       private String getTitle(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
                return scan.next();
        }
 
-       private String getAuthor(InputStream in) throws IOException {
+       private String getAuthor(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -125,7 +126,7 @@ class Text extends BasicSupport {
                return fixAuthor(author);
        }
 
-       private String getDate(InputStream in) throws IOException {
+       private String getDate(InputStream in) {
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
                scan.useDelimiter("\\n");
@@ -147,10 +148,10 @@ class Text extends BasicSupport {
 
        @Override
        protected String getDesc(URL source, InputStream in) throws IOException {
-               return getChapterContent(source, in, 0);
+               return getChapterContent(source, in, 0, null);
        }
 
-       private BufferedImage getCover(URL source) throws IOException {
+       private BufferedImage getCover(URL source) {
                String path;
                try {
                        path = new File(source.toURI()).getPath();
@@ -169,8 +170,8 @@ class Text extends BasicSupport {
        }
 
        @Override
-       protected List<Entry<String, URL>> getChapters(URL source, InputStream in)
-                       throws IOException {
+       protected List<Entry<String, URL>> getChapters(URL source, InputStream in,
+                       Progress pg) throws IOException {
                List<Entry<String, URL>> chaps = new ArrayList<Entry<String, URL>>();
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");
@@ -187,14 +188,17 @@ class Text extends BasicSupport {
                                final URL value = source;
                                final String key = chapName;
                                chaps.add(new Entry<String, URL>() {
+                                       @Override
                                        public URL setValue(URL value) {
                                                return null;
                                        }
 
+                                       @Override
                                        public URL getValue() {
                                                return value;
                                        }
 
+                                       @Override
                                        public String getKey() {
                                                return key;
                                        }
@@ -208,8 +212,8 @@ class Text extends BasicSupport {
        }
 
        @Override
-       protected String getChapterContent(URL source, InputStream in, int number)
-                       throws IOException {
+       protected String getChapterContent(URL source, InputStream in, int number,
+                       Progress pg) throws IOException {
                StringBuilder builder = new StringBuilder();
                @SuppressWarnings("resource")
                Scanner scan = new Scanner(in, "UTF-8");