Merge branch 'subtree'

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

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
index 426355fa2eb40d86e130a07e36a7f3763e5ee62a..2ee319ab678b2f5c8b60c0edb2552ec0f88b4ff4 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderMainWindow.java
@@ -164,7 +164,7 @@ class TuiReaderMainWindow extends TWindow {
                                                        selectTargets.add(source);
                                                }
                                        } catch (IOException e) {
-                                               Instance.getTraceHandler().error(e);
+                                               Instance.getInstance().getTraceHandler().error(e);
                                        }
 
                                        showTarget = true;
@@ -176,7 +176,7 @@ class TuiReaderMainWindow extends TWindow {
                                                        selectTargets.add(author);
                                                }
                                        } catch (IOException e) {
-                                               Instance.getTraceHandler().error(e);
+                                               Instance.getInstance().getTraceHandler().error(e);
                                        }
 
                                        showTarget = true;
@@ -243,14 +243,14 @@ class TuiReaderMainWindow extends TWindow {
 
                try {
                        if (mode == Mode.SOURCE) {
-                               metas = reader.getLibrary().getListBySource(target);
+                               metas = reader.getLibrary().getList().filter(target, null, null);
                        } else if (mode == Mode.AUTHOR) {
-                               metas = reader.getLibrary().getListByAuthor(target);
+                               metas = reader.getLibrary().getList().filter(null, target, null);
                        } else {
-                               metas = reader.getLibrary().getList();
+                               metas = reader.getLibrary().getList().getMetas();
                        }
                } catch (IOException e) {
-                       Instance.getTraceHandler().error(e);
+                       Instance.getInstance().getTraceHandler().error(e);
                        metas = new ArrayList<MetaData>();
                }
 
@@ -316,7 +316,7 @@ class TuiReaderMainWindow extends TWindow {
                        reader.setMeta(meta);
                        reader.read(false);
                } catch (IOException e) {
-                       Instance.getTraceHandler().error(e);
+                       Instance.getInstance().getTraceHandler().error(e);
                }
        }
 
@@ -339,11 +339,11 @@ class TuiReaderMainWindow extends TWindow {
                MetaData meta = getSelectedMeta();
                if (meta != null) {
                        switch (menu.getId()) {
-                       case TuiReaderApplication.MENU_OPEN:
+                       case TuiReaderApplication.MENU_FILE_OPEN:
                                readStory(meta);
 
                                return;
-                       case TuiReaderApplication.MENU_EXPORT:
+                       case TuiReaderApplication.MENU_FILE_EXPORT:
 
                                try {
                                        // TODO: choose type, pg, error