Changeset 898 for trunk/src/org/expeditee/items/widgets/JfxBrowser.java

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)

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (6 diffs)

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();                                    
+                                }
+                        });
+                }
+        }
 }