Changeset 811

Timestamp:

02/03/14 12:29:36 (10 years ago)

Author:

ngw8

Message:

Switched new webparser method to use a loop when adding elements to the page, since there was no longer any reason to use a recursive function

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (6 diffs)

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

@@ -336 +336 @@
                                                         int visibleHeight = (Integer) webEngine.executeScript("window.innerHeight");
 
-                                                        WebParser.addTextToFrame(doc, visibleWidth, visibleHeight, window, webEngine, frameToAddTo);
+                                                        WebParser.addTextToFrame(visibleWidth, visibleHeight, window, webEngine, frameToAddTo);
                                                         System.out.println("added text");
                                                         FrameIO.SaveFrame(frameToAddTo);
@@ -431 +431 @@
                                 public void run() {
                                         try {
+                                                JSObject window = (JSObject) webEngine.executeScript("window");
+
                                                 webEngine.executeScript(""
                                                                 // Initializing the counter used when scrolling the page
@@ -443 +445 @@
                                                                 + "cssHide.appendChild(document.createTextNode(style));"
                                                                 + "document.getElementsByTagName('head')[0].appendChild(cssHide);");
-                                                
-                                                HTMLBodyElement doc = (HTMLBodyElement) webEngine.executeScript("document.body");
-
-                                                JSObject window = (JSObject) webEngine.executeScript("window");
-
-                                                frame.setBackgroundColor(rgbStringToColor((String) ((JSObject) (window.call("getComputedStyle", new Object[] { doc }))).call("getPropertyValue",
-                                                                new Object[] { "background-color" })));
-                                                
+
                                                 // Functions to be used later in JavaScript
                                                 webEngine.executeScript(""
@@ -1144 +1139 @@
          * @throws IllegalAccessException
          */
-        private static void addTextToFrame(Node rootElement, int visibleWidth, int visibleHeight, JSObject window, WebEngine webEngine, Frame frame) throws InvocationTargetException,
+        private static void addTextToFrame(int visibleWidth, int visibleHeight, JSObject window, WebEngine webEngine, Frame frame) throws InvocationTargetException,
                         IllegalAccessException, IllegalArgumentException {
 
-                Node currentNode = rootElement;
-
-                if (currentNode.getNodeType() == Node.TEXT_NODE) {
-
+                webEngine.executeScript("var walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT, null, false);");
+                
+                Node currentNode;
+                
+                while ((currentNode = (Node) webEngine.executeScript("walker.nextNode()")) != null) {   
                         JSObject style;
                         JSObject bounds;
@@ -1160 +1156 @@
                         bounds = (JSObject) ((JSObject) currentNode.getParentNode()).call("getBoundingClientRect", new Object[] {});
 
-
-                        // Bounding rectangle position is relative to the current view, so scroll position must be added to x/y
-                        // TODO: This doesn't check if an element or any of its parent elements have position:fixed set - the only
-                        // way to check seems to be to walking through the element's parents until the document root is reached
+                        // TODO: This doesn't check if an element or any of its parent elements have position:fixed set - the only way to check seems to be to walking through the element's parents until the document root is reached (or a recursive function)
                         float x = Float.valueOf(bounds.getMember("left").toString());
                         float y = Float.valueOf(bounds.getMember("top").toString());
@@ -1324 +1317 @@
                                 }
                         }
-
-                } else if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
-                        Node childNode = currentNode.getFirstChild();
-
-                        while (childNode != null) {
-                                addTextToFrame(childNode, visibleWidth, visibleHeight, window, webEngine, frame);
-                                childNode = childNode.getNextSibling();
-                        }
                 }
         }