Implement a text story viewer

[fanfix.git] / src / be / nikiroo / fanfix / reader / ui / GuiReader.java

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 02f153cdf82d47dc8f2486f7e3a72cff94a75903..b1e980215953a0b4f3cddbea3e88d4cd50b874af 100644 (file)
--- 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,21 +167,21 @@ class GuiReader extends BasicReader {
                                        }
                                }
 
-                               try {
-                                       GuiReaderFrame gui = new GuiReaderFrame(GuiReader.this,
-                                                       typeFinal);
-                                       gui.setVisible(true);
-                                       gui.addWindowListener(new WindowAdapter() {
-                                               @Override
-                                               public void windowClosed(WindowEvent e) {
-                                                       super.windowClosed(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;
                                                }
-                                       });
-                               } catch (Exception e) {
-                                       Instance.getTraceHandler().error(e);
-                                       done[0] = true;
-                               }
+
+                                       }
+                               }).start();
                        }
                });
 
@@ -266,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);
        }
 
@@ -292,4 +303,90 @@ class GuiReader extends BasicReader {
                        Instance.getTraceHandler().error(e);
                }
        }
+
+       /**
+        * Change the title of the given {@link Story}.
+        * 
+        * @param luid
+        *            the luid of the {@link Story} to change
+        * @param newTitle
+        *            the new title
+        */
+       void changeTitle(String luid, String newTitle) {
+               try {
+                       cacheLib.changeTitle(luid, newTitle, null);
+               } catch (IOException e) {
+                       Instance.getTraceHandler().error(e);
+               }
+       }
+
+       /**
+        * Change the author of the given {@link Story}.
+        * <p>
+        * The author can be a new one, it needs not exist before hand.
+        * 
+        * @param luid
+        *            the luid of the {@link Story} to change
+        * @param newAuthor
+        *            the new author
+        */
+       void changeAuthor(String luid, String newAuthor) {
+               try {
+                       cacheLib.changeAuthor(luid, newAuthor, null);
+               } catch (IOException e) {
+                       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) {
+                       }
+               }
+       }
 }