X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderMainPanel.java;h=7caa243c411ca4bba0f4bf2c0dbbedd7368f8e07;hb=b6b657954954280c9ab0efcec67f3fe4a3ae0945;hp=cfd1e947013cbff6916b96f54a096e426e957422;hpb=574d709a282747a775b02fbaef01d26076cfec60;p=nikiroo-utils.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index cfd1e94..7caa243 100644
--- 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.
 		 * 
-		 * @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
@@ -108,18 +108,18 @@ class GuiReaderMainPanel extends JPanel {
 	}
 
 	/**
-	 * A {@link Runnable} with a {@link Story} parameter.
+	 * A {@link Runnable} with a {@link MetaData} parameter.
 	 * 
 	 * @author niki
 	 */
-	public interface StoryRunnable {
+	public interface MetaDataRunnable {
 		/**
 		 * Run the action.
 		 * 
-		 * @param story
-		 *            the story
+		 * @param meta
+		 *            the meta of the story
 		 */
-		public void run(Story story);
+		public void run(MetaData meta);
 	}
 
 	/**
@@ -138,6 +138,7 @@ class GuiReaderMainPanel extends JPanel {
 
 		pane = new JPanel();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
+		JScrollPane scroll = new JScrollPane(pane);
 
 		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);
+			scroll.setBackground(color);
 		}
 
-		JScrollPane scroll = new JScrollPane(pane);
 		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();
 
-				if (status == Status.READY) {
+				if (status == Status.READ_WRITE) {
 					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) {
-								addBookPane(true, false);
+								try {
+									addBookPane(true, false);
+								} catch (IOException e) {
+									error(e.getLocalizedMessage(),
+											"IOException", e);
+								}
 							} else {
 								addBookPane(typeF, true);
 							}
 						} else {
-							helper.createMenu(false);
+							helper.createMenu(status);
 							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
+	 * 
+	 * @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) {
@@ -352,11 +361,17 @@ class GuiReaderMainPanel extends JPanel {
 			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));
 			}
@@ -533,7 +548,7 @@ class GuiReaderMainPanel extends JPanel {
 	 * @param onSuccessPgName
 	 *            the name to use for the onSuccess progress bar
 	 */
-	public void imprt(final String url, final StoryRunnable onSuccess,
+	public void imprt(final String url, final MetaDataRunnable onSuccess,
 			String onSuccessPgName) {
 		final Progress pg = new Progress();
 		final Progress pgImprt = new Progress();
@@ -545,9 +560,9 @@ class GuiReaderMainPanel extends JPanel {
 			@Override
 			public void run() {
 				Exception ex = null;
-				Story story = null;
+				MetaData meta = null;
 				try {
-					story = helper.getReader().getLibrary()
+					meta = helper.getReader().getLibrary()
 							.imprt(BasicReader.getUrl(url), pgImprt);
 				} catch (IOException e) {
 					ex = e;
@@ -571,7 +586,7 @@ class GuiReaderMainPanel extends JPanel {
 					}
 				} else {
 					if (onSuccess != null) {
-						onSuccess.run(story);
+						onSuccess.run(meta);
 					}
 				}
 				pgOnSuccess.done();