Changeset 546

Timestamp:

11/27/13 16:23:34 (10 years ago)

Author:

jts21

Message:

Move URL validation to navigate() method

File:

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

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

@@ -284 +284 @@
         }
 
-        public void navigate(final String url) {
-                System.out.println(url);
+        public void navigate(String url) {
+                final String actualURL;
+                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://"))) {
+                        // check if it's a search
+                        int firstSpace = url.indexOf(" ");
+                        int firstDot = url.indexOf(".");
+                        int firstSlash = url.indexOf('/');
+                        int firstQuestion = url.indexOf('?');
+                        if(firstDot == -1 ||                                        // no '.' and no protocol -> search
+                                (firstSpace != -1 && firstSpace <= firstDot + 1) || // ' ' before '.'         -> search
+                                (firstSlash == -1 && firstQuestion == -1)) {        // no '/' or '?'          -> search
+                                // make it a search
+                                actualURL = UserSettings.searchEngine + url;
+                        } else {
+                                // add the missing protocol
+                                actualURL = "http://" + url;
+                        }
+                } else {
+                        actualURL = url;
+                }
+                System.out.println(actualURL);
                 try {
                         PlatformRunLater.invoke(null, new Runnable() {
@@ -291 +313 @@
                                 public void run() {
                                         try {
-                                                WebEngineLoad.invoke(WebViewGetEngine.invoke(JfxBrowser.this._browser.webview), url);
+                                                WebEngineLoad.invoke(WebViewGetEngine.invoke(JfxBrowser.this._browser.webview), actualURL);
                                         } catch (Exception e) {
                                                 e.printStackTrace();
@@ -307 +329 @@
                 if ((carried = FreeItems.getTextAttachedToCursor()) != null) {
                         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
-                                int firstSpace = text.indexOf(" ");
-                                int firstDot = text.indexOf(".");
-                                int firstSlash = text.indexOf('/');
-                                int firstQuestion = text.indexOf('?');
-                                if(firstDot == -1 ||                                        // no '.' and no protocol -> search
-                                        (firstSpace != -1 && firstSpace <= firstDot + 1) || // ' ' before '.'         -> search
-                                        (firstSlash == -1 && firstQuestion == -1)) {        // no '/' or '?'          -> search
-                                        // make it a search
-                                        text = UserSettings.searchEngine + text;
-                                } else {
-                                        // add the missing protocol
-                                        text = "http://" + text;
-                                }
-                        }
                         this.navigate(text);
                         FreeItems.getInstance().clear();