Changeset 543

Timestamp:

11/27/13 14:33:22 (10 years ago)

Author:

jts21

Message:

Add correction for missing URL protocol, and detection of search URLs to JfxBrowser

File:

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

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

@@ -112 +112 @@
                         State = classLoader.loadClass("javafx.concurrent.Worker$State");
                         StateConstants = Arrays.asList(State.getEnumConstants());
-                        System.out.println(StateConstants);
 
                 } catch (Exception e) {
@@ -149 +148 @@
                                         }
                                 });
-                        } catch (IllegalAccessException e) {
-                                e.printStackTrace();
-                        } catch (IllegalArgumentException e) {
-                                e.printStackTrace();
-                        } catch (InvocationTargetException e) {
-                                e.printStackTrace();
-                        } catch (InstantiationException e) {
+                        } catch (Exception e) {
                                 e.printStackTrace();
                         }
@@ -233 +226 @@
 
                                 WebEngineLoad.invoke(WebViewGetEngine.invoke(this.webview), url);
-                        } catch (IllegalAccessException e) {
-                                e.printStackTrace();
-                        } catch (IllegalArgumentException e) {
-                                e.printStackTrace();
-                        } catch (InvocationTargetException e) {
-                                e.printStackTrace();
-                        } catch (InstantiationException e) {
-                                e.printStackTrace();
-                        } catch (SecurityException e) {
+                        } catch (Exception e) {
                                 e.printStackTrace();
                         }
@@ -261 +246 @@
                                 try {
                                         WebViewSetPrefSize.invoke(this.webview, this.getWidth(), this.getHeight());
-                                } catch (IllegalAccessException e1) {
-                                        e1.printStackTrace();
-                                } catch (IllegalArgumentException e1) {
-                                        e1.printStackTrace();
-                                } catch (InvocationTargetException e1) {
-                                        e1.printStackTrace();
-                                } catch (SecurityException e1) {
+                                } catch (Exception e1) {
                                         e1.printStackTrace();
                                 }
@@ -308 +287 @@
                 Text carried = null;
                 if ((carried = FreeItems.getTextAttachedToCursor()) != null) {
-                        this.navigate(carried.getText());
+                        String text = carried.getText().trim();
+                        String textLower = text.toLowerCase();
+                        // check if protocol is missing
+                        // TODO: can/should we support other protocols such as ftp ???
+                        if(!(textLower.startsWith("http://") || text.startsWith("https://"))) {
+                                // check if it's a search (will be a search if there is a ' ' before the first '.')
+                                // TODO: maybe support changing the default search engine (using a settings frame like the proxy settings frame)
+                                int firstSpace = text.indexOf(" ");
+                                int firstDot = text.indexOf(".");
+                                if(firstSpace != -1 && firstSpace < firstDot) {
+                                        // make it a search
+                                        text = "https://duckduckgo.com/?q=" + text;
+                                } else {
+                                        // add the missing protocol
+                                        text = "http://" + text;
+                                }
+                        }
+                        this.navigate(text);
+                        FreeItems.getInstance().clear();
                         return true;
                 }
@@ -320 +317 @@
                         try {
                                 r = new String[] { (String) WebEngineGetLocation.invoke(WebViewGetEngine.invoke(this._browser.webview)) };
-                        } catch (IllegalAccessException e) {
+                        } catch (Exception e) {
                                 e.printStackTrace();
-                        } catch (IllegalArgumentException e) {
-                                e.printStackTrace();
-                        } catch (InvocationTargetException e) {
-                                e.printStackTrace();
-                        } catch (SecurityException e) {
-                                e.printStackTrace();
                         }
                 }