Changeset 549

Timestamp:

11/27/13 17:05:42 (10 years ago)

Author:

jts21

Message:

Fix back/forward/refresh functions, and allow ​ftp:// URLs

File:

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

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

@@ -304 +304 @@
                 String urlLower = url.toLowerCase();
                 // check if protocol is missing
-                // TODO: can/should we support other protocols such as ftp ???
-                if(!(urlLower.startsWith("http://") || url.startsWith("https://"))) {
+                if(!(urlLower.startsWith("http://") || url.startsWith("https://") || urlLower.startsWith("ftp://"))) {
                         // check if it's a search
                         int firstSpace = url.indexOf(" ");
@@ -354 +353 @@
         public void navigateBack() {
                 try {
-                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(WebViewGetEngine.invoke(this._browser.webview)), -1);
+                        final Object webEngine = WebViewGetEngine.invoke(this._browser.webview);
+                        try {
+                                PlatformRunLater.invoke(null, new Runnable() {
+                                        @Override
+                                        public void run() {
+                                                try {
+                                                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(webEngine), -1);
+                                                } catch (InvocationTargetException e) {
+                                                        MessageBay.displayMessage("End of History");
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                });
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                        
                         FreeItems.getInstance().clear();
-                } catch (InvocationTargetException e) {
-                        MessageBay.displayMessage("End of History");
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -369 +383 @@
         public void navigateForward() {
                 try {
-                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(WebViewGetEngine.invoke(this._browser.webview)), 1);
+                        final Object webEngine = WebViewGetEngine.invoke(this._browser.webview);
+                        try {
+                                PlatformRunLater.invoke(null, new Runnable() {
+                                        @Override
+                                        public void run() {
+                                                try {
+                                                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(webEngine), 1);
+                                                } catch (InvocationTargetException e) {
+                                                        MessageBay.displayMessage("End of History");
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                });
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
                         FreeItems.getInstance().clear();
-                } catch (InvocationTargetException e) {
-                        MessageBay.displayMessage("End of History");
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -383 +411 @@
         public void refresh() {
                 try {
-                        //WebEngineReload.invoke(WebViewGetEngine.invoke(this._browser.webview));
+                        final Object webEngine = WebViewGetEngine.invoke(this._browser.webview);
+                        try {
+                                PlatformRunLater.invoke(null, new Runnable() {
+                                        @Override
+                                        public void run() {
+                                                try {
+                                                        WebEngineReload.invoke(webEngine);
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                });
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
                         MessageBay.displayMessage("Page Refreshed");
                         FreeItems.getInstance().clear();