git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'subtree'
[fanfix.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 97e46f142abb2fabb632cbe88444b66db1786f76..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) {
selectTargets.add(source);
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
showTarget = true;
}
showTarget = true;
@@
-176,7
+176,7
@@
class TuiReaderMainWindow extends TWindow {
selectTargets.add(author);
}
} catch (IOException e) {
selectTargets.add(author);
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
showTarget = true;
}
showTarget = true;
@@
-243,14
+243,14
@@
class TuiReaderMainWindow extends TWindow {
try {
if (mode == Mode.SOURCE) {
try {
if (mode == Mode.SOURCE) {
- metas = reader.getLibrary().getList
BySource(target
);
+ metas = reader.getLibrary().getList
().filter(target, null, null
);
} else if (mode == Mode.AUTHOR) {
} else if (mode == Mode.AUTHOR) {
- metas = reader.getLibrary().getList
ByAuthor(target
);
+ metas = reader.getLibrary().getList
().filter(null, target, null
);
} else {
} else {
- metas = reader.getLibrary().getList();
+ metas = reader.getLibrary().getList()
.getMetas()
;
}
} catch (IOException e) {
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
metas = new ArrayList<MetaData>();
}
metas = new ArrayList<MetaData>();
}
@@
-316,7
+316,7
@@
class TuiReaderMainWindow extends TWindow {
reader.setMeta(meta);
reader.read(false);
} catch (IOException e) {
reader.setMeta(meta);
reader.read(false);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
}
}