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
tests: allow testing live URLs
[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 cfd1e947013cbff6916b96f54a096e426e957422..8593fe6471c816812220defeedf5775fe1757642 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@
-85,10
+85,10
@@
class GuiReaderMainPanel extends JPanel {
* <p>
* Will invalidate the layout.
*
* <p>
* Will invalidate the layout.
*
- * @param
libOk
- * the library
can be queried
+ * @param
status
+ * the library
status, <b>must not</b> be NULL
*/
*/
- public void createMenu(
boolean libOk
);
+ public void createMenu(
Status status
);
/**
* Create a popup menu for a {@link GuiReaderBook} that represents a
/**
* Create a popup menu for a {@link GuiReaderBook} that represents a
@@
-138,6
+138,7
@@
class GuiReaderMainPanel extends JPanel {
pane = new JPanel();
pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
pane = new JPanel();
pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
+ JScrollPane scroll = new JScrollPane(pane);
Integer icolor = Instance.getUiConfig().getColor(
UiConfig.BACKGROUND_COLOR);
Integer icolor = Instance.getUiConfig().getColor(
UiConfig.BACKGROUND_COLOR);
@@
-145,9
+146,9
@@
class GuiReaderMainPanel extends JPanel {
color = new Color(icolor);
setBackground(color);
pane.setBackground(color);
color = new Color(icolor);
setBackground(color);
pane.setBackground(color);
+ scroll.setBackground(color);
}
}
- JScrollPane scroll = new JScrollPane(pane);
scroll.getVerticalScrollBar().setUnitIncrement(16);
add(scroll, BorderLayout.CENTER);
scroll.getVerticalScrollBar().setUnitIncrement(16);
add(scroll, BorderLayout.CENTER);
@@
-197,23
+198,28
@@
class GuiReaderMainPanel extends JPanel {
final BasicLibrary lib = helper.getReader().getLibrary();
final Status status = lib.getStatus();
final BasicLibrary lib = helper.getReader().getLibrary();
final Status status = lib.getStatus();
- if (status == Status.READ
Y
) {
+ if (status == Status.READ
_WRITE
) {
lib.refresh(pg);
}
inUi(new Runnable() {
@Override
public void run() {
lib.refresh(pg);
}
inUi(new Runnable() {
@Override
public void run() {
- if (status
== Status.READY
) {
- helper.createMenu(
true
);
+ if (status
.isReady()
) {
+ helper.createMenu(
status
);
pane.setVisible(true);
if (typeF == null) {
pane.setVisible(true);
if (typeF == null) {
- addBookPane(true, false);
+ try {
+ addBookPane(true, false);
+ } catch (IOException e) {
+ error(e.getLocalizedMessage(),
+ "IOException", e);
+ }
} else {
addBookPane(typeF, true);
}
} else {
} else {
addBookPane(typeF, true);
}
} else {
- helper.createMenu(
false
);
+ helper.createMenu(
status
);
validate();
String desc = Instance.getTransGui().getStringX(
validate();
String desc = Instance.getTransGui().getStringX(
@@
-255,8
+261,11
@@
class GuiReaderMainPanel extends JPanel {
* @param listMode
* TRUE to get a listing of all the sources or authors, FALSE to
* get one icon per source or author
* @param listMode
* TRUE to get a listing of all the sources or authors, FALSE to
* get one icon per source or author
+ *
+ * @throws IOException
+ * in case of I/O error
*/
*/
- public void addBookPane(boolean type, boolean listMode) {
+ public void addBookPane(boolean type, boolean listMode)
throws IOException
{
this.currentType = type;
BasicLibrary lib = helper.getReader().getLibrary();
if (type) {
this.currentType = type;
BasicLibrary lib = helper.getReader().getLibrary();
if (type) {
@@
-352,11
+361,17
@@
class GuiReaderMainPanel extends JPanel {
List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
List<MetaData> metas;
List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
List<MetaData> metas;
- if (currentType) {
- metas = lib.getListBySource(value);
- } else {
- metas = lib.getListByAuthor(value);
+ try {
+ if (currentType) {
+ metas = lib.getListBySource(value);
+ } else {
+ metas = lib.getListByAuthor(value);
+ }
+ } catch (IOException e) {
+ error(e.getLocalizedMessage(), "IOException", e);
+ metas = new ArrayList<MetaData>();
}
}
+
for (MetaData meta : metas) {
infos.add(GuiReaderBookInfo.fromMeta(meta));
}
for (MetaData meta : metas) {
infos.add(GuiReaderBookInfo.fromMeta(meta));
}