Don't check against NULL on NotNull
authorNiki Roo <niki@nikiroo.be>
Sat, 2 Dec 2017 15:54:18 +0000 (16:54 +0100)
committerNiki Roo <niki@nikiroo.be>
Sat, 2 Dec 2017 15:54:18 +0000 (16:54 +0100)
src/be/nikiroo/fanfix/supported/BasicSupport.java

index c609c70324dd665313cc07b1de4eaa91ccb48060..66ba64d621ac82e1498d009367da08cb044f0f19 100644 (file)
@@ -202,7 +202,7 @@ public abstract class BasicSupport {
         * @param in
         *            the input (the main resource)
         * 
-        * @return the associated {@link MetaData}
+        * @return the associated {@link MetaData}, never NULL
         * 
         * @throws IOException
         *             in case of I/O error
@@ -342,7 +342,7 @@ public abstract class BasicSupport {
         * @param pg
         *            the optional progress reporter
         * 
-        * @return the {@link Story}
+        * @return the {@link Story}, never NULL
         * 
         * @throws IOException
         *             in case of I/O error
@@ -419,7 +419,7 @@ public abstract class BasicSupport {
         * @param pg
         *            the optional progress reporter
         * 
-        * @return the {@link Story}
+        * @return the {@link Story}, never NULL
         * 
         * @throws IOException
         *             in case of I/O error
@@ -441,11 +441,6 @@ public abstract class BasicSupport {
                                pgMeta.setProgress(pgMeta.getMax()); // 10%
                        }
 
-                       if (story == null) {
-                               pg.setProgress(90);
-                               return null;
-                       }
-
                        pg.setName("Retrieving " + story.getMeta().getTitle());
 
                        setCurrentReferer(url);
@@ -496,9 +491,7 @@ public abstract class BasicSupport {
 
                                                words += cc.getWords();
                                                story.getChapters().add(cc);
-                                               if (story.getMeta() != null) {
-                                                       story.getMeta().setWords(words);
-                                               }
+                                               story.getMeta().setWords(words);
                                        } finally {
                                                if (chapIn != null) {
                                                        chapIn.close();