git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: sort fixes
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
reader
/
ui
/
GuiReaderMainPanel.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 476e130b01bc6acd7eb4804ddd7d19ddc15db4c4..a5eb6916f5972b281d7b7237a3464e2f50ee7c55 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@
-142,8
+142,7
@@
class GuiReaderMainPanel extends JPanel {
pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
JScrollPane scroll = new JScrollPane(pane);
pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
JScrollPane scroll = new JScrollPane(pane);
- Integer icolor = Instance.getUiConfig().getColor(
- UiConfig.BACKGROUND_COLOR);
+ Integer icolor = Instance.getInstance().getUiConfig().getColor(UiConfig.BACKGROUND_COLOR);
if (icolor != null) {
color = new Color(icolor);
setBackground(color);
if (icolor != null) {
color = new Color(icolor);
setBackground(color);
@@
-224,8
+223,7
@@
class GuiReaderMainPanel extends JPanel {
helper.createMenu(status);
validate();
helper.createMenu(status);
validate();
- String desc = Instance.getTransGui().getStringX(
- StringIdGui.ERROR_LIB_STATUS,
+ String desc = Instance.getInstance().getTransGui().getStringX(StringIdGui.ERROR_LIB_STATUS,
status.toString());
if (desc == null) {
desc = GuiReader
status.toString());
if (desc == null) {
desc = GuiReader
@@
-365,9
+363,9
@@
class GuiReaderMainPanel extends JPanel {
List<MetaData> metas;
try {
if (currentType) {
List<MetaData> metas;
try {
if (currentType) {
- metas = lib.getList
BySource(value
);
+ metas = lib.getList
().filter(value, null, null
);
} else {
} else {
- metas = lib.getList
ByAuthor(value
);
+ metas = lib.getList
().filter(null, value, null
);
}
} catch (IOException e) {
error(e.getLocalizedMessage(), "IOException", e);
}
} catch (IOException e) {
error(e.getLocalizedMessage(), "IOException", e);
@@
-409,7
+407,7
@@
class GuiReaderMainPanel extends JPanel {
}
});
} catch (IOException e) {
}
});
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
GuiReader.trans(StringIdGui.TITLE_ERROR), e);
}
error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
GuiReader.trans(StringIdGui.TITLE_ERROR), e);
}
@@
-433,19
+431,19
@@
class GuiReaderMainPanel extends JPanel {
break;
case SOURCE:
for (MetaData meta : helper.getReader().getLibrary()
break;
case SOURCE:
for (MetaData meta : helper.getReader().getLibrary()
- .getList
BySource(book.getInfo().getMainInfo()
)) {
+ .getList
().filter(book.getInfo().getMainInfo(), null, null
)) {
luids.add(meta.getLuid());
}
break;
case AUTHOR:
for (MetaData meta : helper.getReader().getLibrary()
luids.add(meta.getLuid());
}
break;
case AUTHOR:
for (MetaData meta : helper.getReader().getLibrary()
- .getList
ByAuthor(book.getInfo().getMainInfo()
)) {
+ .getList
().filter(null, book.getInfo().getMainInfo(), null
)) {
luids.add(meta.getLuid());
}
break;
}
} catch (IOException e) {
luids.add(meta.getLuid());
}
break;
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
final Progress pg = new Progress();
}
final Progress pg = new Progress();
@@
-473,7
+471,7
@@
class GuiReaderMainPanel extends JPanel {
});
}
} catch (IOException e) {
});
}
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
GuiReader.trans(StringIdGui.TITLE_ERROR), e);
}
error(GuiReader.trans(StringIdGui.ERROR_CANNOT_OPEN),
GuiReader.trans(StringIdGui.TITLE_ERROR), e);
}
@@
-554,9
+552,9
@@
class GuiReaderMainPanel extends JPanel {
try {
EventQueue.invokeAndWait(run);
} catch (InterruptedException e) {
try {
EventQueue.invokeAndWait(run);
} catch (InterruptedException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
} catch (InvocationTargetException e) {
} catch (InvocationTargetException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
}
}
}
}
@@
-776,9
+774,9
@@
class GuiReaderMainPanel extends JPanel {
* the exception to log if any
*/
private void error(final String message, final String title, Exception e) {
* the exception to log if any
*/
private void error(final String message, final String title, Exception e) {
- Instance.getTraceHandler().error(title + ": " + message);
+ Instance.get
Instance().get
TraceHandler().error(title + ": " + message);
if (e != null) {
if (e != null) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
SwingUtilities.invokeLater(new Runnable() {
}
SwingUtilities.invokeLater(new Runnable() {