Changeset 547

Timestamp:

11/27/13 16:41:14 (10 years ago)

Author:

jts21

Message:

Fix bugs in URL validation logic

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (1 diff)

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

@@ -295 +295 @@
                         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
+                        int firstSQ;
+                        if(firstSlash == -1) {
+                                firstSQ = firstQuestion;
+                        } else if(firstQuestion == -1) {
+                                firstSQ = firstSlash;
+                        } else {
+                                firstSQ = -1;
+                        }
+                        if(firstDot <= 0 ||                                        // no '.' or starts with '.' -> search
+                                (firstSpace != -1 && firstSpace < firstDot + 1) || // ' ' before '.'            -> search
+                                (firstSpace != -1 && firstSpace < firstSQ)) {      // no '/' or '?'             -> search
                                 // make it a search
                                 actualURL = UserSettings.searchEngine + url;