Changeset 544 for trunk/src/org/expeditee/items/widgets

Timestamp:

11/27/13 15:29:04 (11 years ago)

Author:

jts21

Message:

Updated JfxBrowser to use search engine variable, and also fixed some logic errors in it

File:

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

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

@@ -19 +19 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.UserSettings;
 import org.expeditee.items.Text;
 
@@ -292 +293 @@
                         // 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)
+                                // check if it's a search
                                 int firstSpace = text.indexOf(" ");
                                 int firstDot = text.indexOf(".");
-                                if(firstSpace != -1 && firstSpace < firstDot) {
+                                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 = "https://duckduckgo.com/?q=" + text;
+                                        text = UserSettings.searchEngine + text;
                                 } else {
                                         // add the missing protocol