Changeset 534

Timestamp:

11/26/13 11:54:04 (10 years ago)

Author:

csl14

Message:

startBrowser and startBrowserNewFrame now create JfxBrowser widget instead of the lobobrowser widget

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• actions/Misc.java (modified) (4 diffs)
• items/widgets/JfxBrowser.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Actions.java

@@ -1019 +1019 @@
         if (params.length() == 0)
             return null;
-
+        
         // remove leading and trailing spaces
         params = params.trim();

trunk/src/org/expeditee/actions/Misc.java

@@ -35 +35 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.JfxBrowser;
 import org.expeditee.math.ExpediteeJEP;
 import org.expeditee.simple.SString;
@@ -1018 +1019 @@
          * @throws Exception
          */
-        public static void startBrowser(Item text) throws Exception {
-                if (text instanceof Text) {
-                        FreeItems.getInstance().clear();                                                                // remove url text from cursor
+        public static void startLoboBrowser(Item text) throws Exception {
+                if (!(text instanceof Text)) {
+                        MessageBay.errorMessage("Must be a text item.");
+                        return;
+                }
+                if(text.getLink() != null) {
+                        MessageBay.errorMessage("Text item cannot have link.");
+                        return;
+                }
+                
+                FreeItems.getInstance().clear();                                                                // remove url text from cursor
                         
-                        Text wt = new Text("@iw:org.expeditee.items.widgets.Browser");  // create new text item for browser widget
-                        wt.setParent(DisplayIO.getCurrentFrame());                                              // set parent of text source for InteractiveWidget.createWidget()
-                        wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
-                        // create widget from text item
-                        org.expeditee.items.widgets.Browser browser = (org.expeditee.items.widgets.Browser) InteractiveWidget.createWidget(wt);
+                Text wt = new Text("@iw:org.expeditee.items.widgets.Browser");  // create new text item for browser widget
+                wt.setParent(DisplayIO.getCurrentFrame());                                              // set parent of text source for InteractiveWidget.createWidget()
+                wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                // create widget from text item
+                org.expeditee.items.widgets.Browser browser = (org.expeditee.items.widgets.Browser) InteractiveWidget.createWidget(wt);
                         
-                        if(FreeItems.textOnlyAttachedToCursor()) {                                              // navigates to url specified by the text item
-                                browser.navigate(text.getText());
-                        } else {
-                                browser.navigate("http://www.waikato.ac.nz");
-                        }
+                if(FreeItems.textOnlyAttachedToCursor()) {                                              // navigates to url specified by the text item
+                        browser.navigate(text.getText());
+                } else {
+                        browser.navigate("http://www.waikato.ac.nz");
+                }
                         
-                        FrameMouseActions.pickup(browser.getItems());                                   // attach browser widget to mouse
-                } else {
-                        MessageBay.errorMessage("Must be a text item.");
-                }
+                FrameMouseActions.pickup(browser.getItems());                                   // attach browser widget to mouse
         }
         
@@ -1045 +1051 @@
          * @throws Exception
          */
-        public static void startBrowserNewFrame(Item text) throws Exception {
-                System.out.println("test");
+        public static void startLoboBrowserNewFrame(Item text) throws Exception {
                 if (!(text instanceof Text)) {
                         MessageBay.errorMessage("Must be a text item.");
@@ -1084 +1089 @@
         }
         
+        /**
+         * Launches items.widgets.JfxBrowser and uses Text item as URL.
+         * Note: currently doesn't work
+         * @param text Text item which passes contents as URL for browser.
+         * @throws Exception
+         */
+        public static void startBrowser(Item text) throws Exception {
+                if (!(text instanceof Text)) {
+                        MessageBay.errorMessage("Must be a text item.");
+                        return;
+                }
+                if(text.getLink() != null) {
+                        MessageBay.errorMessage("Text item cannot have link.");
+                        return;
+                }
+                
+                FreeItems.getInstance().clear();                                                                        // remove url text from cursor
+                        
+                Text wt = new Text("@iw:org.expeditee.items.widgets.JfxBrowser");       // create new text item for browser widget
+                wt.setParent(DisplayIO.getCurrentFrame());                                                      // set parent of text source for InteractiveWidget.createWidget()
+                wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                // create widget from text item
+                JfxBrowser browser = (JfxBrowser) InteractiveWidget.createWidget(wt);
+                        
+                if(FreeItems.textOnlyAttachedToCursor()) {                                                      // navigates to url specified by the text item
+                        //browser.navigate(text.getText());
+                } else {
+                        //browser.navigate("http://www.waikato.ac.nz");
+                }
+                        
+                FrameMouseActions.pickup(browser.getItems());                                           // attach browser widget to mouse
+        }
+        
+        /**
+         * Text item becomes link to new frame containing items.widgets.JfxBrowser and uses Text item as URL for browser.
+         * Note: currently doesn't work
+         * @param text Text item which passes contents as URL for browser and becomes link to the browser's new frame.
+         * @throws Exception
+         */
+        public static void startBrowserNewFrame(Item text) throws Exception {
+                if (!(text instanceof Text)) {
+                        MessageBay.errorMessage("Must be a text item.");
+                        return;
+                }
+                if(text.getLink() != null) {                                                                                            // text item can't already have a link
+                        MessageBay.errorMessage("Text item already has link.");
+                        return;
+                }
+                
+                Frame frame = FrameIO.CreateNewFrame(text);                                                                     // create new frame for browser
+                frame.addText(0, 50, "@iw:org.expeditee.items.widgets.JfxBrowser", null);       // create new text item for browser widget
+                FrameUtils.Parse(frame);                                                                                                        // parse created frame; loads browser widget
+                
+                for(InteractiveWidget iw : frame.getInteractiveWidgets()) {                                     // may be other widgets on frame
+                        if(iw instanceof JfxBrowser) {
+                                // Set browser to 'full screen'
+                                iw.setSize(-1, -1, -1, -1, Browser._theBrowser.getWidth(), Browser._theBrowser.getHeight() - MessageBay.MESSAGE_BUFFER_HEIGHT - 80);
+                                
+                                // If there is a text item attached to cursor use it as url for browser
+                                if(FreeItems.textOnlyAttachedToCursor()) {
+                                        text.setLink("" + frame.getNumber());
+                                        //((JfxBrowser)iw).navigate(text.getText());
+                                } else {
+                                        // Navigate to www.waikato.ac.nz by default if no url supplied and create new text item to be the link
+                                        //((JfxBrowser)iw).navigate("http://www.waikato.ac.nz");
+                                        Text t = new Text("http://www.waikato.ac.nz");
+                                        t.setParent(DisplayIO.getCurrentFrame());                                               // set parent of text source for InteractiveWidget.createWidget()
+                                        t.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                                        t.setLink("" + frame.getNumber());                                                              // link url text to new browser frame
+                                        FrameMouseActions.pickup(t);                                                                    // Attach new text link to cursor
+                                }
+                        }
+                }
+                
+                FrameIO.SaveFrame(frame);                                                                                                       // save frame to disk
+        }
+        
         private static boolean startWidget(String name) throws Exception {
                 String fullName = Actions.getClassName(name);

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

@@ -217 +217 @@
         }
 
-        public void navigate(String url) {
+        public void navigate(final String url) {
                 try {
                         WebEngineLoad.invoke(WebViewGetEngine.invoke(this._browser.webview), url);
+                        
                 } catch (IllegalAccessException e) {
                         e.printStackTrace();