Changeset 898

Timestamp:

02/16/14 14:28:45 (10 years ago)

Author:

ngw8

Message:

Added an extremely basic 'stop' function to the web parser, so conversions can be cancelled. There's no button, as the JFX thread is occupied with running Javascript most of the time (which has to be done on the JFX thread), meaning it's blocked from receiving clicks. Instead it's using a Swing event handler, listening for the escape key being released anywhere over the widget. (the escape now also stops loading the page)

Location:

trunk/src/org/expeditee

Files:

• io/WebParser.java (modified) (4 diffs)
• items/widgets/JfxBrowser.java (modified) (6 diffs)

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

@@ -513 +513 @@
                                         
                                                 // Using Javascript to get an array of all the text nodes in the document so they can be wrapped in spans. Have to
-                                                // loop through twice (once to build the array and once actually going through the array, otherwise when the
+                                                // loop through twice (once here to build the array and once later actually going through the array, otherwise when the
                                                 // textnode is removed from the document items end up being skipped)
-                                                JSObject textNodes = (JSObject) webEngine.executeScript(""
-                                                        + "function getTextNodes(rootNode){" 
-                                                                + "var node;" 
-                                                                + "var textNodes=[];"
-                                                                + "var walk = document.createTreeWalker(rootNode, NodeFilter.SHOW_TEXT);" 
-                                                                + "while(node=walk.nextNode()) {" 
+                                                webEngine.executeScript("" 
+                                                                        + "var node;" 
+                                                                        + "var textNodes=[];"
+                                                                        + "var walk = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT);"
+                                                                        );                                      
+                                                
+                                                while(webEngine.executeScript("node=walk.nextNode()") != null && browserWidget.isParserRunning()) {
+                                                        
+                                                        webEngine.executeScript(""
                                                                         + "if((node.textContent.trim().length > 0)) { "
                                                                                 + "textNodes.push(node);" 
-                                                                        + "}" 
-                                                                + "}" 
-                                                                + "return textNodes;" 
-                                                        + "}; " 
-                                                        + "getTextNodes(document.body)"
+                                                                        + "}"
                                                         );
-                                                
+                                                }
+                                                
+                                                JSObject textNodes = (JSObject) webEngine.executeScript("textNodes");
+                        
                                                 int nodesLength = (Integer) textNodes.getMember("length");
 
                                                 // Looping through all the text nodes in the document
-                                                for (int j = 0; j < nodesLength; j++) {
+                                                for (int j = 0; j < nodesLength && browserWidget.isParserRunning(); j++) {
                                                         Node currentNode = (Node) textNodes.getSlot(j);
 
@@ -608 +610 @@
 
                         // Loop that scrolls the page horizontally
-                        for(int i = 0; i < pagesHorizontal.getValue(); i++) {
+                        for(int i = 0; i < pagesHorizontal.getValue() && browserWidget.isParserRunning(); i++) {
                                                                 
                                 Platform.runLater(new Runnable() {
@@ -627 +629 @@
                                 
                                 // Loop that scrolls the page vertically (for each horizontal scroll position)
-                                for(int j = 0; j < pagesVertical.getValue(); j++) {
+                                for(int j = 0; j < pagesVertical.getValue()  && browserWidget.isParserRunning(); j++) {
                                         
                                         try {
@@ -682 +684 @@
                         }
 
-                        progressBar.set(100);
+                        if(browserWidget.isParserRunning()) {
+                                progressBar.set(100);
+                        } else {
+                                MessageBay.displayMessage("Web page conversion cancelled");
+                        }
+                        
+                        browserWidget.parserFinished();
 
                         Platform.runLater(new Runnable() {

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

@@ -10 +10 @@
  */
 import java.awt.Point;
+import java.awt.event.KeyListener;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -105 +106 @@
         private StackPane _overlay;
         
+        private boolean _parserRunning;
+        
         private MouseButton _buttonDownId = MouseButton.NONE;
         private MouseEvent _backupEvent = null;
@@ -129 +132 @@
 
                 _panel = (JFXPanel) _swingComponent;
+
+                // Quick & easy way of having a cancel function for the web parser.
+                // Can't just have a JFX button, as the JFX thread is occupied with running JavaScript so it wouldn't receive the click event straight away
+                _swingComponent.addKeyListener(new KeyListener() {
+                        
+                        @Override
+                        public void keyReleased(java.awt.event.KeyEvent e) {
+                                if(e.getKeyCode() == java.awt.event.KeyEvent.VK_ESCAPE) {
+                                        JfxBrowser.this.cancel();
+                                }
+                        }
+                        
+                        @Override
+                        public void keyPressed(java.awt.event.KeyEvent e) {                             
+                        }
+                        
+                        @Override
+                        public void keyTyped(java.awt.event.KeyEvent e) {                               
+                        }
+                });
                 
                 Platform.runLater(new Runnable() {
@@ -838 +861 @@
 
         public void getFrameNew() {
-                // this.setSize(1000, 1000);
-                // this._browser.setBounds(getX(), getY(), getWidth(), getHeight());
-                // this.layout(this._browser);
-
+
+                this._parserRunning = true;
+                
                 try {
                         // hack to make sure we don't try parsing the page from within the JavaFX thread,
@@ -852 +874 @@
                 } catch (Exception e) {
                         e.printStackTrace();
+                        this._parserRunning = false;
                 }
         }
@@ -1106 +1129 @@
                 return (urlLower.startsWith("http://") || url.startsWith("https://") || urlLower.startsWith("ftp://") || urlLower.startsWith("file://"));
         }
+        
+        /**
+         * @return Whether the parser is running. If this is true then the parser is running, 
+         *  however even if it is false, the parser may still be running (but it has been requested to stop)
+         */
+        public boolean isParserRunning() {
+                return this._parserRunning;
+        }
+        
+        /**
+         * Should be called when the web parser has finished converting a page
+         */
+        public void parserFinished() {
+                this._parserRunning = false;
+        }
+        
+        /**
+         * Cancels the current action being performed by the browser, such as loading a page or converting a page
+         */
+        public void cancel() {
+                if(isParserRunning()) {
+                        this._parserRunning = false;
+                } else {
+                        Platform.runLater(new Runnable() {
+                                
+                                @Override
+                                public void run() {
+                                        JfxBrowser.this._webEngine.getLoadWorker().cancel();                                    
+                                }
+                        });
+                }
+        }
 }