Changeset 540

Timestamp:

11/27/13 12:06:02 (10 years ago)

Author:

csl14

Message:

Fixed startBrowserNewFrame action

Location:

trunk/src/org/expeditee

Files:

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

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

@@ -1104 +1104 @@
                         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
+                
+                if(FreeItems.textOnlyAttachedToCursor()) {                                                      // navigates to url specified by the text item
+                        wt.appendText(":" + text.getText());
+                } else {
+                        wt.appendText(":http://www.waikato.ac.nz");
+                }
+                
+                FreeItems.getInstance().clear();                                                                        // remove url text from cursor
+                
                 wt.setParent(DisplayIO.getCurrentFrame());                                                      // set parent of text source for InteractiveWidget.createWidget()
                 wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
@@ -1113 +1120 @@
                 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
         }
@@ -1133 +1134 @@
                         return;
                 }
-                if(text.getLink() != null) {                                                                                            // text item can't already have a link
+                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
+                // If no text with url is passed to the action create a new text item with http://www.waikato.ac.nz for the default url
+                if(!FreeItems.textOnlyAttachedToCursor()) {
+                        text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), "http://www.waikato.ac.nz", null);
+                        text.setParent(DisplayIO.getCurrentFrame());    // set parent of text source for InteractiveWidget.createWidget()
+                        FrameMouseActions.pickup(text);                                 // Attach new text link to cursor
+                }
+                
+                // Create JfxBrowser widget on a new frame
+                Frame frame = FrameIO.CreateNewFrame(text);                     // create new frame for browser
+                text.setLink("" + frame.getNumber());                           // link this text item to new frame
+                // Create widget via text annotation
+                Text wt = frame.addText(0, 50, "@iw: org.expeditee.items.widgets.JfxBrowser "+ Browser._theBrowser.getWidth() + " " + (Browser._theBrowser.getHeight() - 50) + " : ".concat(text.getText()), null);
+                InteractiveWidget.createWidget(wt);
+                
+                FrameIO.SaveFrame(frame);                                                       // save frame to disk
         }
         

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

@@ -209 +209 @@
         public JfxBrowser(Text source, String[] args) {
                 // Initial page is either the page stored in the arguments (if there is one stored) or Google
-                super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : "http://google.com"), -1, 500, -1, -1, 300, -1);
-
+                //super(source, new WebBrowserPanel((args != null && args.length > 0) ? args[0] : "http://google.com"), -1, 500, -1, -1, 300, -1);
+                super(source, new WebBrowserPanel(args[0]), -1, 500, -1, -1, 300, -1);
                 _browser = (WebBrowserPanel) _swingComponent;
         }