import java.awt.BorderLayout;
import java.awt.Color;
+import java.awt.EventQueue;
import java.awt.Frame;
import java.awt.Toolkit;
import java.awt.datatransfer.DataFlavor;
import java.awt.event.MouseEvent;
import java.io.File;
import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import javax.swing.BoxLayout;
import javax.swing.JFileChooser;
class GuiReaderMainPanel extends JPanel {
private static final long serialVersionUID = 1L;
private FrameHelper helper;
- private Map<GuiReaderGroup, String> booksByType;
- private Map<GuiReaderGroup, String> booksByAuthor;
+ private Map<String, GuiReaderGroup> books;
+ private GuiReaderGroup bookPane; // for more "All"
private JPanel pane;
private Color color;
private ProgressBar pgBar;
private JMenuBar bar;
private GuiReaderBook selectedBook;
private boolean words; // words or authors (secondary info on books)
+ private boolean currentType; // type/source or author mode (All and Listing)
/**
* An object that offers some helper methods to access the frame that host
/**
* Create the main menu bar.
+ * <p>
+ * 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
/**
* Create a popup menu for a {@link GuiReaderBook} that represents a
- * source/type (no LUID).
+ * source/type or an author.
*
* @return the popup menu to display
*/
- public JPopupMenu createSourcePopup();
+ public JPopupMenu createSourceAuthorPopup();
}
/**
/**
* 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
*/
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();
}
});
- booksByType = new HashMap<GuiReaderGroup, String>();
- booksByAuthor = new HashMap<GuiReaderGroup, String>();
+ books = new TreeMap<String, GuiReaderGroup>();
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);
+ }
+ }
+ });
}
});
}
+ public boolean getCurrentType() {
+ return currentType;
+ }
+
/**
* Add a new {@link GuiReaderGroup} on the frame to display all the
* sources/types or all the authors, or a listing of all the books sorted
* get one icon per source or author
*/
public void addBookPane(boolean type, boolean listMode) {
+ this.currentType = type;
BasicLibrary lib = helper.getReader().getLibrary();
if (type) {
if (!listMode) {
/**
* Add a new {@link GuiReaderGroup} on the frame to display the books of the
* selected type or author.
+ * <p>
+ * Will invalidate the layout.
*
* @param value
* the author or the type, or NULL to get all the
* authors-or-types
* @param type
* TRUE for type/source, FALSE for author
- *
*/
public void addBookPane(String value, boolean type) {
+ this.currentType = type;
+
GuiReaderGroup bookPane = new GuiReaderGroup(helper.getReader(), value,
color);
- if (type) {
- booksByType.put(bookPane, value);
- } else {
- booksByAuthor.put(bookPane, value);
- }
- this.invalidate();
+ books.put(value, bookPane);
+
pane.invalidate();
pane.add(bookPane);
- pane.validate();
- this.validate();
bookPane.setActionListener(new BookActionListener() {
@Override
/**
* Clear the pane from any book that may be present, usually prior to adding
* new ones.
+ * <p>
+ * Will invalidate the layout.
*/
public void removeBookPanes() {
- booksByType.clear();
- booksByAuthor.clear();
+ books.clear();
pane.invalidate();
- this.invalidate();
pane.removeAll();
- pane.validate();
- this.validate();
}
/**
* Refresh the list of {@link GuiReaderBook}s from disk.
+ * <p>
+ * Will validate the layout, as it is a "refresh" operation.
*/
public void refreshBooks() {
BasicLibrary lib = helper.getReader().getLibrary();
- for (GuiReaderGroup group : booksByType.keySet()) {
+ for (String value : books.keySet()) {
List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
- for (MetaData meta : lib.getListBySource(booksByType.get(group))) {
+
+ List<MetaData> metas;
+ if (currentType) {
+ metas = lib.getListBySource(value);
+ } else {
+ metas = lib.getListByAuthor(value);
+ }
+ for (MetaData meta : metas) {
infos.add(GuiReaderBookInfo.fromMeta(meta));
}
- group.refreshBooks(infos, words);
+
+ books.get(value).refreshBooks(infos, words);
}
- for (GuiReaderGroup group : booksByAuthor.keySet()) {
- List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
- for (MetaData meta : lib.getListByAuthor(booksByAuthor.get(group))) {
- infos.add(GuiReaderBookInfo.fromMeta(meta));
- }
- group.refreshBooks(infos, words);
+ if (bookPane != null) {
+ bookPane.refreshBooks(words);
}
- pane.repaint();
- this.repaint();
+ this.validate();
}
/**
*/
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 {
*
* @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);
public void run() {
try {
run.run();
- refreshBooks();
+ if (refreshBooks) {
+ refreshBooks();
+ }
} finally {
reload.done();
if (!pg.isDone()) {
}, "outOfUi thread").start();
}
+ /**
+ * Process the given action in the main Swing UI thread.
+ * <p>
+ * The code will make sure the current thread is the main UI thread and, if
+ * not, will switch to it before executing the runnable.
+ * <p>
+ * 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}.
* <p>
* 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) {
pg.addProgress(pgImprt, 95);
pg.addProgress(pgOnSuccess, 5);
- outOfUi(pg, new Runnable() {
+ outOfUi(pg, true, new Runnable() {
@Override
public void run() {
Exception ex = null;
bar.setEnabled(b);
}
- for (GuiReaderGroup group : booksByType.keySet()) {
- group.setEnabled(b);
- }
- for (GuiReaderGroup group : booksByAuthor.keySet()) {
+ for (GuiReaderGroup group : books.values()) {
group.setEnabled(b);
}
super.setEnabled(b);
GuiReader reader = helper.getReader();
BasicLibrary lib = reader.getLibrary();
- GuiReaderGroup bookPane = new GuiReaderGroup(reader, name, color);
+ bookPane = new GuiReaderGroup(reader, name, color);
List<GuiReaderBookInfo> infos = new ArrayList<GuiReaderBookInfo>();
for (String value : values) {
@Override
public void popupRequested(GuiReaderBook book, MouseEvent e) {
- JPopupMenu popup = helper.createSourcePopup();
+ JPopupMenu popup = helper.createSourceAuthorPopup();
popup.show(e.getComponent(), e.getX(), e.getY());
}
git://git.nikiroo.be / fanfix.git / blobdiff