X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=b1e980215953a0b4f3cddbea3e88d4cd50b874af;hb=47b1710c92c1a14188a00c433879b94c7c3e7ea1;hp=55701b1ad7b727d94470c449c368569e2aac3c5f;hpb=12b9873f37c28e7f68b2bd1e03c1380f63cbe3ab;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 55701b1..b1e9802 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -107,6 +107,8 @@ 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();
@@ -165,15 +167,31 @@ class GuiReader extends BasicReader {
 					}
 				}
 
-				try {
-					GuiReaderFrame gui = new GuiReaderFrame(GuiReader.this,
-							typeFinal);
-					sync(gui);
-				} catch (Exception e) {
-					Instance.getTraceHandler().error(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;
+						}
+
+					}
+				}).start();
 			}
 		});
+
+		// This action must be synchronous, so wait until the frame is closed
+		while (!done[0]) {
+			try {
+				Thread.sleep(100);
+			} catch (InterruptedException e) {
+			}
+		}
 	}
 
 	@Override
@@ -250,9 +268,18 @@ 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
+		GuiReaderTextViewer viewer = new GuiReaderTextViewer(cacheLib,
+				cacheLib.getStory(luid, null));
+
+		// TODO: testing text viewer:
+		if (false) {
+			if (sync) {
+				sync(viewer);
+			} else {
+				viewer.setVisible(true);
+			}
+		}
+
 		openExternal(getLibrary().getInfo(luid), file, sync);
 	}
 
@@ -318,11 +345,14 @@ class GuiReader extends BasicReader {
 	 *            the frame to start
 	 */
 	static private void sync(final JFrame frame) {
-		final Boolean[] done = new Boolean[1];
-		done[0] = false;
+		if (EventQueue.isDispatchThread()) {
+			throw new IllegalStateException(
+					"Cannot call a sync method in the dispatch thread");
+		}
 
+		final Boolean[] done = new Boolean[] { false };
 		try {
-			EventQueue.invokeLater(new Runnable() {
+			Runnable run = new Runnable() {
 				@Override
 				public void run() {
 					try {
@@ -339,7 +369,13 @@ class GuiReader extends BasicReader {
 						done[0] = true;
 					}
 				}
-			});
+			};
+
+			if (EventQueue.isDispatchThread()) {
+				run.run();
+			} else {
+				EventQueue.invokeLater(run);
+			}
 		} catch (Exception e) {
 			Instance.getTraceHandler().error(e);
 			done[0] = true;