Changeset 733

Timestamp:

01/21/14 17:16:40 (10 years ago)

Author:

ngw8

Message:

Started work on v2 of webparser, currently adds snapshot of page on linked frames

Location:

trunk/src/org/expeditee

Files:

• io/WebParser.java (modified) (7 diffs)
• items/widgets/InteractiveWidget.java (modified) (1 diff)
• items/widgets/JfxBrowser.java (modified) (6 diffs)
• reflection/JavaFX.java (modified) (3 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Font;
-import java.awt.FontMetrics;
+import java.awt.Graphics;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -14 +14 @@
 
 import javax.imageio.ImageIO;
+import javax.swing.JComponent;
 
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameCreator;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
@@ -25 +27 @@
 import org.expeditee.items.Text;
 import org.expeditee.reflection.JavaFX;
-import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.html.HTMLBodyElement;
@@ -214 +215 @@
                                                                         + "currentNode.parentElement.removeChild(currentNode);"
                                                                         
-                                                                        + "for (var i = 0; i < words.length; i++) {" + "                addToSpan(words[i]);"
+                                                                        + "for (var i = 0; i < words.length; i++) {" 
+                                                                        + "             addToSpan(words[i]);"
                                                                         + "}"
                                                                         
@@ -221 +223 @@
                                                                         + "             par.removeChild(prevSpan);"
                                                                         + "}"
-);
+                                                                        );
 
                                                         // Will never reach 100% here, as the processing is not quite finished - progress is set to 100% at the end of
@@ -261 +263 @@
                 }
     }
+
+        /**
+         * Converts a loaded page to Expeditee frame(s)
+         * 
+         * @param webEngine
+         *            The JavaFX WebEngine in which the page to be converted is loaded
+         * @param frame
+         *            The Expeditee frame to output the converted page to
+         */
+        public static void parsePageSimple(final Object webEngine, final Object webView, final JComponent jfxPanel, final Frame frame) {
+                try {
+                        final Object notifier = new Object();
+                        final MutableBool notAtBottom = new MutableBool(true);
+
+                        JavaFX.PlatformRunLater.invoke(null, new Runnable() {
+                                @Override
+                                public void run() {
+                                        try {
+                                                // Initializing the counter used when scrolling the page
+                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, "var scrollCounter = 0");
+                                        } catch (Exception ex) {
+                                                ex.printStackTrace();
+                                        }
+
+                                        synchronized (notifier) {
+                                                notifier.notify();
+                                        }
+                                }
+                        });
+
+                        synchronized (notifier) {
+                                try {
+                                        // Waiting for the JavaFX thread to finish
+                                        notifier.wait();
+                                } catch (InterruptedException e) {
+                                        // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                }
+                        }
+
+                                int tick = 0;
+                                Frame frameToAddTo = frame;
+
+                        while (notAtBottom.getValue()) {
+                                JavaFX.PlatformRunLater.invoke(null, new Runnable() {
+                                        @Override
+                                        public void run() {
+                                                try {
+                                                        // Scrolling down the page
+                                                        JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                                        + "window.scrollTo(0, scrollCounter * window.innerHeight);"
+                                                                        + "scrollCounter = scrollCounter+1;");
+                        
+                                                        notAtBottom.setValue((boolean) JavaFX.WebEngineExecuteScript.invoke(webEngine, "(window.pageYOffset + window.innerHeight < document.documentElement.scrollHeight)"));
+
+                                                        synchronized (notifier) {
+                                                                notifier.notify();
+                                                        }
+
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                });
+
+                                synchronized (notifier) {
+                                        try {
+                                                // Waiting for the JavaFX thread to finish
+                                                notifier.wait();
+                                        } catch (InterruptedException e) {
+                                                // TODO Auto-generated catch block
+                                                e.printStackTrace();
+                                        }
+                                }
+
+                                BufferedImage image = new BufferedImage(jfxPanel.getWidth(), jfxPanel.getHeight(), BufferedImage.TYPE_INT_ARGB);
+
+                                Graphics graphics = image.createGraphics();
+
+                                // Drawing the JfxPanel (containing the webview) to the image
+                                jfxPanel.paint(graphics);
+
+                                try {
+                                        int hashcode = Arrays.hashCode(image.getData().getPixels(0, 0, image.getWidth(), image.getHeight(), (int[]) null));
+
+                                        File out = new File(FrameIO.IMAGES_PATH + "webpage-" + Integer.toHexString(hashcode) + ".png");
+                                        out.mkdirs();
+                                        ImageIO.write(image, "png", out);
+
+                                        Text link = new Text("Next");
+                                        link.setPosition(500, 20);
+                                        frameToAddTo.addItem(link);
+
+                                        frameToAddTo = FrameIO.CreateFrame(frame.getFramesetName(), Integer.toHexString(hashcode), null);
+
+                                        link.setLink(frameToAddTo.getName());
+
+                                        // Adding the image
+                                        frameToAddTo.addText(0, 0, "@i: " + out.getName(), null);
+
+                                        // Button to go to the next page
+                                        Text nextButton = (Text) FrameCreator.createButton("Next", null, null, 10F, 10F);
+                                        nextButton.setID(frameToAddTo.getNextItemID());
+                                        nextButton.addAction("next");
+                                        frameToAddTo.addItem(nextButton);
+
+                                        FrameIO.SaveFrame(frameToAddTo);
+
+                                } catch (IOException e) {
+                                        e.printStackTrace();
+                                }
+                                graphics.dispose();
+                                image.flush();
+
+                                System.out.println("C");
+
+                                synchronized (notifier) {
+                                        notifier.notify();
+                                }
+
+                                tick = 0;
+
+                        }
+
+                } catch (Exception ex) {
+                        ex.printStackTrace();
+                }
+
+
+
+        }
 
         /**
@@ -755 +888 @@
                 pic.getSource().anchor();
         }
+
+        private static class MutableBool {
+                private boolean value;
+
+                public MutableBool(boolean value) {
+                        this.value = value;
+                }
+
+                public boolean getValue() {
+                        return value;
+                }
+
+                public void setValue(boolean value) {
+                        this.value = value;
+                }
+        }
 }

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -1121 +1121 @@
          * @param parent
          */
-        private void layout(Component parent) {
+        protected void layout(Component parent) {
 
                 parent.validate();

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -20 +20 @@
 
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -92 +93 @@
                                 toolBar.setFloatable(false);
 
-
                                 JButton backButton = new JButton("Back");
                                 toolBar.add(backButton);
@@ -105 +105 @@
                                 toolBar.add(convertButton);
 
+                                JButton convertButtonNew = new JButton("Convert (New Method)");
+                                toolBar.add(convertButtonNew);
+
                                 backButton.addActionListener(new ActionListener() {
                                         @Override
@@ -123 +126 @@
                                         public void actionPerformed(ActionEvent arg0) {
                                                 owner.getFrame();
+                                        }
+                                });
+
+                                convertButtonNew.addActionListener(new ActionListener() {
+                                        @Override
+                                        public void actionPerformed(ActionEvent arg0) {
+                                                owner.getFrameNew();
                                         }
                                 });
@@ -408 +418 @@
                 // Initial page is either the page stored in the arguments (if there is one stored) or the homepage
                 super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : NetworkSettings.HomePage.get()), -1, 500, -1, -1, 300, -1);
+
                 _browser = (WebBrowserPanel) _swingComponent;
                 _browser.owner = this;
@@ -555 +566 @@
         }
 
+        public void getFrameNew() {
+                // this.setSize(1000, 100000);
+                // this._browser.setBounds(getX(), getY(), getWidth(), getHeight());
+
+                // this.layout(this._browser);
+                try {
+                        WebParser.parsePageSimple(JavaFX.WebViewGetEngine.invoke(this._browser.webview), this._browser.webview, (JComponent) this._browser.jfxPanel, DisplayIO.getCurrentFrame());
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+
         /**
          * Used to drop text items onto JfxBrowser widget. Does nothing if a text item is not attached to cursor. <br>

trunk/src/org/expeditee/reflection/JavaFX.java

@@ -26 +26 @@
         public static Method WebViewGetEngine;
         public static Method WebViewSetContextMenuEnabled;
+        public static Method WebViewSnapshot;
+
+        public static Class<?> SnapshotParameters;
+        public static Class<?> WritableImage;
+
+        public static Class<?> Image;
+
+        public static Class<?> SwingFXUtils;
+        public static Method SwingFXUtilsFromFXImage;
 
         public static Class<?> WebEngine;
@@ -95 +104 @@
                         SceneConstructor = Scene.getConstructor(classLoader.loadClass("javafx.scene.Parent"));
 
+                        SnapshotParameters = classLoader.loadClass("javafx.scene.SnapshotParameters");
+                        WritableImage = classLoader.loadClass("javafx.scene.image.WritableImage");
+
                         WebView = classLoader.loadClass("javafx.scene.web.WebView");
                         JFXPanelSetScene = JFXPanel.getMethod("setScene", Scene);
@@ -100 +112 @@
                         WebViewGetEngine = WebView.getMethod("getEngine");
                         WebViewSetContextMenuEnabled = WebView.getMethod("setContextMenuEnabled", boolean.class);
+                        WebViewSnapshot = WebView.getMethod("snapshot", SnapshotParameters, WritableImage);
+
+                        Image = classLoader.loadClass("javafx.scene.image.Image");
+
+                        SwingFXUtils = classLoader.loadClass("javafx.embed.swing.SwingFXUtils");
+                        SwingFXUtilsFromFXImage = SwingFXUtils.getMethod("fromFXImage", Image, java.awt.image.BufferedImage.class);
 
                         WebEngine = classLoader.loadClass("javafx.scene.web.WebEngine");