+ * Will invalidate the layout. * * @param libOk * the library can be queried - * - * @return the bar */ - public void createMenu(boolean b); + public void createMenu(boolean libOk); /** * Create a popup menu for a {@link GuiReaderBook} that represents a @@ -120,9 +122,9 @@ class GuiReaderMainPanel extends JPanel { /** * Create a new {@link GuiReaderMainPanel}. * - * @param reader - * the associated {@link GuiReader} to forward some commands and - * access its {@link LocalLibrary} + * @param parent + * the associated {@link FrameHelper} to forward some commands + * and access its {@link LocalLibrary} * @param type * the type of {@link Story} to load, or NULL for all types */ @@ -158,17 +160,17 @@ class GuiReaderMainPanel extends JPanel { pgBar.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - invalidate(); + pgBar.invalidate(); pgBar.setProgress(null); - validate(); setEnabled(true); + validate(); } }); pgBar.addUpdateListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - invalidate(); + pgBar.invalidate(); validate(); repaint(); } @@ -179,50 +181,54 @@ class GuiReaderMainPanel extends JPanel { pane.setVisible(false); final Progress pg = new Progress(); final String typeF = type; - outOfUi(pg, new Runnable() { + outOfUi(pg, true, new Runnable() { @Override public void run() { - BasicLibrary lib = helper.getReader().getLibrary(); - Status status = lib.getStatus(); + final BasicLibrary lib = helper.getReader().getLibrary(); + final Status status = lib.getStatus(); if (status == Status.READY) { lib.refresh(pg); - invalidate(); - helper.createMenu(true); - if (typeF == null) { - addBookPane(true, false); - } else { - addBookPane(typeF, true); - } - refreshBooks(); - validate(); - pane.setVisible(true); - } else { - invalidate(); - helper.createMenu(false); - validate(); - - String err = lib.getLibraryName() + "\n"; - switch (status) { - case INVALID: - err += "Library not valid"; - break; - - case UNAUTORIZED: - err += "You are not allowed to access this library"; - break; - - case UNAVAILABLE: - err += "Library currently unavailable"; - break; - - default: - err += "An error occured when contacting the library"; - break; - } - - error(err, "Library error", null); } + + inUi(new Runnable() { + @Override + public void run() { + if (status == Status.READY) { + helper.createMenu(true); + if (typeF == null) { + addBookPane(true, false); + } else { + addBookPane(typeF, true); + } + pane.setVisible(true); + } else { + helper.createMenu(false); + validate(); + + String err = lib.getLibraryName() + "\n"; + switch (status) { + case INVALID: + err += "Library not valid"; + break; + + case UNAUTORIZED: + err += "You are not allowed to access this library"; + break; + + case UNAVAILABLE: + err += "Library currently unavailable"; + break; + + default: + err += "An error occured when contacting the library"; + break; + } + + error(err, "Library error", null); + } + } + }); } }); } @@ -277,7 +283,8 @@ class GuiReaderMainPanel extends JPanel { /** * Add a new {@link GuiReaderGroup} on the frame to display the books of the * selected type or author. - * + *
+ * Will invalidate the layout. * * @param value * the author or the type, or NULL to get all the @@ -293,11 +300,8 @@ class GuiReaderMainPanel extends JPanel { books.put(value, bookPane); - this.invalidate(); pane.invalidate(); pane.add(bookPane); - pane.validate(); - this.validate(); bookPane.setActionListener(new BookActionListener() { @Override @@ -321,18 +325,19 @@ class GuiReaderMainPanel extends JPanel { /** * Clear the pane from any book that may be present, usually prior to adding * new ones. + *
+ * Will invalidate the layout. */ public void removeBookPanes() { books.clear(); pane.invalidate(); - this.invalidate(); pane.removeAll(); - pane.validate(); - this.validate(); } /** * Refresh the list of {@link GuiReaderBook}s from disk. + *
+ * Will validate the layout, as it is a "refresh" operation. */ public void refreshBooks() { BasicLibrary lib = helper.getReader().getLibrary(); @@ -356,8 +361,7 @@ class GuiReaderMainPanel extends JPanel { bookPane.refreshBooks(words); } - pane.repaint(); - this.repaint(); + this.validate(); } /** @@ -368,7 +372,7 @@ class GuiReaderMainPanel extends JPanel { */ public void openBook(final GuiReaderBook book) { final Progress pg = new Progress(); - outOfUi(pg, new Runnable() { + outOfUi(pg, false, new Runnable() { @Override public void run() { try { @@ -397,18 +401,26 @@ class GuiReaderMainPanel extends JPanel { * * @param progress * the {@link ProgressBar} or NULL + * @param refreshBooks + * TRUE to refresh the books after * @param run * the action to run */ - public void outOfUi(Progress progress, final Runnable run) { + public void outOfUi(Progress progress, final boolean refreshBooks, + final Runnable run) { final Progress pg = new Progress(); final Progress reload = new Progress("Reload books"); + if (progress == null) { progress = new Progress(); } - pg.addProgress(progress, 90); - pg.addProgress(reload, 10); + if (refreshBooks) { + pg.addProgress(progress, 100); + } else { + pg.addProgress(progress, 90); + pg.addProgress(reload, 10); + } invalidate(); pgBar.setProgress(pg); @@ -420,7 +432,9 @@ class GuiReaderMainPanel extends JPanel { public void run() { try { run.run(); - refreshBooks(); + if (refreshBooks) { + refreshBooks(); + } } finally { reload.done(); if (!pg.isDone()) { @@ -432,6 +446,31 @@ class GuiReaderMainPanel extends JPanel { }, "outOfUi thread").start(); } + /** + * Process the given action in the main Swing UI thread. + *
+ * The code will make sure the current thread is the main UI thread and, if + * not, will switch to it before executing the runnable. + *
+ * Synchronous operation. + * + * @param run + * the action to run + */ + public void inUi(final Runnable run) { + if (EventQueue.isDispatchThread()) { + run.run(); + } else { + try { + EventQueue.invokeAndWait(run); + } catch (InterruptedException e) { + Instance.getTraceHandler().error(e); + } catch (InvocationTargetException e) { + Instance.getTraceHandler().error(e); + } + } + } + /** * Import a {@link Story} into the main {@link LocalLibrary}. *
@@ -481,6 +520,8 @@ class GuiReaderMainPanel extends JPanel { * the {@link Story} to import by {@link URL} * @param onSuccess * Action to execute on success + * @param onSuccessPgName + * the name to use for the onSuccess progress bar */ public void imprt(final String url, final StoryRunnable onSuccess, String onSuccessPgName) { @@ -490,7 +531,7 @@ class GuiReaderMainPanel extends JPanel { pg.addProgress(pgImprt, 95); pg.addProgress(pgOnSuccess, 5); - outOfUi(pg, new Runnable() { + outOfUi(pg, true, new Runnable() { @Override public void run() { Exception ex = null;