X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=620df26075159b7560977bc65d8733733d692d9b;hb=1ee6709558f5e1a6200dd6ec20c0f206c22797cc;hp=9f2fd3dad1056c6ba4635a70856e2983f330fad0;hpb=31e28683c108bb5903864c58b0cc06bfa258fbfc;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 9f2fd3d..620df26 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 
 import javax.swing.JEditorPane;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.event.HyperlinkEvent;
@@ -106,10 +107,11 @@ class GuiReader extends BasicReader {
 
 	@Override
 	public void browse(String type) {
+		final Boolean[] done = new Boolean[] { false };
+
 		// TODO: improve presentation of update message
 		final VersionCheck updates = VersionCheck.check();
 		StringBuilder builder = new StringBuilder();
-		final Boolean[] done = new Boolean[] { false };
 
 		final JEditorPane updateMessage = new JEditorPane("text/html", "");
 		if (updates.isNewVersionAvailable()) {
@@ -165,22 +167,21 @@ class GuiReader extends BasicReader {
 					}
 				}
 
-				try {
-					GuiReaderFrame gui = new GuiReaderFrame(GuiReader.this,
-							typeFinal);
-					gui.addWindowListener(new WindowAdapter() {
-						@Override
-						public void windowClosing(WindowEvent e) {
-							super.windowClosing(e);
+				new Thread(new Runnable() {
+					@Override
+					public void run() {
+						try {
+							GuiReaderFrame gui = new GuiReaderFrame(
+									GuiReader.this, typeFinal);
+							sync(gui);
+						} catch (Exception e) {
+							Instance.getTraceHandler().error(e);
+						} finally {
 							done[0] = true;
 						}
-					});
 
-					gui.setVisible(true);
-				} catch (Exception e) {
-					Instance.getTraceHandler().error(e);
-					done[0] = true;
-				}
+					}
+				}).start();
 			}
 		});
 
@@ -267,10 +268,19 @@ class GuiReader extends BasicReader {
 	void read(String luid, boolean sync, Progress pg) throws IOException {
 		File file = cacheLib.getFile(luid, pg);
 
-		// TODO: show a special page for the chapter?
-		// We could also implement an internal viewer, both for image and
-		// non-image documents
-		openExternal(getLibrary().getInfo(luid), file, sync);
+		GuiReaderTextViewer viewer = new GuiReaderTextViewer(cacheLib,
+				cacheLib.getStory(luid, null));
+
+		// TODO: testing text viewer:
+		if (false) {
+			if (sync) {
+				sync(viewer);
+			} else {
+				viewer.setVisible(true);
+			}
+		} else {
+			openExternal(getLibrary().getInfo(luid), file, sync);
+		}
 	}
 
 	/**
@@ -327,4 +337,56 @@ class GuiReader extends BasicReader {
 			Instance.getTraceHandler().error(e);
 		}
 	}
+
+	/**
+	 * Start a frame and wait until it is closed before returning.
+	 * 
+	 * @param frame
+	 *            the frame to start
+	 */
+	static private void sync(final JFrame frame) {
+		if (EventQueue.isDispatchThread()) {
+			throw new IllegalStateException(
+					"Cannot call a sync method in the dispatch thread");
+		}
+
+		final Boolean[] done = new Boolean[] { false };
+		try {
+			Runnable run = new Runnable() {
+				@Override
+				public void run() {
+					try {
+						frame.addWindowListener(new WindowAdapter() {
+							@Override
+							public void windowClosing(WindowEvent e) {
+								super.windowClosing(e);
+								done[0] = true;
+							}
+						});
+
+						frame.setVisible(true);
+					} catch (Exception e) {
+						done[0] = true;
+					}
+				}
+			};
+
+			if (EventQueue.isDispatchThread()) {
+				run.run();
+			} else {
+				EventQueue.invokeLater(run);
+			}
+		} catch (Exception e) {
+			Instance.getTraceHandler().error(e);
+			done[0] = true;
+		}
+
+		// This action must be synchronous, so wait until the frame is closed
+		while (!done[0]) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+			}
+		}
+	}
 }