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
/
ui
/
GuiReaderFrame.java
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
index f3748218fcbbcd1b25b70816454cd0d56d2870ac..e0ef6d72f8a6b75805e3989a46591ae5e7abbbaf 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderFrame.java
@@
-388,8
+388,7
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
@Override
public void actionPerformed(ActionEvent e) {
ConfigEditor<Config> ed = new ConfigEditor<Config>(
@Override
public void actionPerformed(ActionEvent e) {
ConfigEditor<Config> ed = new ConfigEditor<Config>(
- Config.class, Instance.getConfig(), GuiReader
- .trans(StringIdGui.SUBTITLE_CONFIG));
+ Config.class, Instance.getInstance().getConfig(), GuiReader.trans(StringIdGui.SUBTITLE_CONFIG));
JFrame frame = new JFrame(title);
frame.add(ed);
frame.setSize(850, 600);
JFrame frame = new JFrame(title);
frame.add(ed);
frame.setSize(850, 600);
@@
-414,8
+413,8
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
@Override
public void actionPerformed(ActionEvent e) {
ConfigEditor<UiConfig> ed = new ConfigEditor<UiConfig>(
@Override
public void actionPerformed(ActionEvent e) {
ConfigEditor<UiConfig> ed = new ConfigEditor<UiConfig>(
- UiConfig.class, Instance.get
UiConfig(), GuiReader
-
.trans(StringIdGui.SUBTITLE_CONFIG_UI));
+ UiConfig.class, Instance.get
Instance().getUiConfig(),
+
GuiReader
.trans(StringIdGui.SUBTITLE_CONFIG_UI));
JFrame frame = new JFrame(title);
frame.add(ed);
frame.setSize(800, 600);
JFrame frame = new JFrame(title);
frame.add(ed);
frame.setSize(800, 600);
@@
-477,7
+476,7
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
selectedBook.getInfo().getMeta()
.getLuid(), type, path, pg);
} catch (IOException e) {
selectedBook.getInfo().getMeta()
.getLuid(), type, path, pg);
} catch (IOException e) {
- Instance.getTraceHandler().error(e);
+ Instance.get
Instance().get
TraceHandler().error(e);
}
}
});
}
}
});
@@
-976,9
+975,9
@@
class GuiReaderFrame extends JFrame implements FrameHelper {
* the exception to log if any
*/
public void error(final String message, final String title, Exception e) {
* the exception to log if any
*/
public 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() {