Add more warnings source to 1.6) and fix warnings

[nikiroo-utils.git] / src / be / nikiroo / fanfix / reader / TuiReaderStoryWindow.java

diff --git a/src/be/nikiroo/fanfix/reader/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/TuiReaderStoryWindow.java
index 0d47cde4a680cae672b04346194ab0b112ffd406..e8dafc3fa339b47f47f5c2cfb2df5e6d1fdace87 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/TuiReaderStoryWindow.java
@@ -12,30 +12,26 @@ import jexer.TLabel;
 import jexer.TText;
 import jexer.TWindow;
 import jexer.event.TResizeEvent;
-import be.nikiroo.fanfix.Instance;
-import be.nikiroo.fanfix.Library;
 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.library.BasicLibrary;
 
-public class TuiReaderStoryWindow extends TWindow {
-       private Library lib;
+class TuiReaderStoryWindow extends TWindow {
+       private BasicLibrary lib;
        private MetaData meta;
        private Story story;
        private TText textField;
-       private int chapter = -2;
+       private int chapter = -1;
        private List<TButton> navigationButtons;
        private TLabel chapterName;
 
-       public TuiReaderStoryWindow(TApplication app, Library lib, MetaData meta) {
-               this(app, lib, meta, 0);
-       }
-
-       public TuiReaderStoryWindow(TApplication app, Library lib, MetaData meta,
-                       int chapter) {
+       // chapter: -1 for "none" (0 is desc)
+       public TuiReaderStoryWindow(TApplication app, BasicLibrary lib,
+                       MetaData meta, int chapter) {
                super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE);
-               
+
                this.lib = lib;
                this.meta = meta;
 
@@ -56,21 +52,25 @@ public class TuiReaderStoryWindow extends TWindow {
                                                                                                                                // button is
                                                                                                                                // pressed
                navigationButtons.add(addButton("<<  ", 0, row, new TAction() {
+                       @Override
                        public void DO() {
                                setChapter(0);
                        }
                }));
                navigationButtons.add(addButton("<  ", 4, row, new TAction() {
+                       @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter - 1);
                        }
                }));
                navigationButtons.add(addButton(">  ", 7, row, new TAction() {
+                       @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter + 1);
                        }
                }));
                navigationButtons.add(addButton(">>  ", 10, row, new TAction() {
+                       @Override
                        public void DO() {
                                setChapter(getStory().getChapters().size());
                        }