Changeset 548 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

11/27/13 16:57:30 (11 years ago)

Author:

csl14

Message:

added back and forward functionality for JfxBrowser

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (6 diffs)

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

@@ -1061 +1061 @@
                 }
                 
-                Frame frame = FrameIO.CreateNewFrame(text);                                                             // create new frame for browser
-                frame.addText(0, 50, "@iw:org.expeditee.items.widgets.Browser", 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
+                // Create new frame and text item for browser widget and parse created frame; loads browser widget
+                Frame frame = FrameIO.CreateNewFrame(text);
+                frame.addText(0, 50, "@iw:org.expeditee.items.widgets.Browser", null);
+                FrameUtils.Parse(frame);
+                
+                for(InteractiveWidget iw : frame.getInteractiveWidgets()) {     // may be other widgets on frame
                         if(iw instanceof org.expeditee.items.widgets.Browser) {
                                 // Set browser to 'full screen'
-                                iw.setSize(-1, -1, -1, -1, Browser._theBrowser.getWidth(), Browser._theBrowser.getHeight() - MessageBay.MESSAGE_BUFFER_HEIGHT - 80);
+                                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
@@ -1078 +1080 @@
                                         ((org.expeditee.items.widgets.Browser)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.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
+                                        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
+                FrameIO.SaveFrame(frame);                                                                       // save frame to disk
         }
         
@@ -1107 +1109 @@
                 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
+                if(FreeItems.textOnlyAttachedToCursor()) {                      // navigates to url specified by the text item
                         wt.appendText(":" + text.getText());
                 } else {
@@ -1113 +1115 @@
                 }
                 
-                FreeItems.getInstance().clear();                                                                        // remove url text from cursor
-                
-                wt.setParent(DisplayIO.getCurrentFrame());                                                      // set parent of text source for InteractiveWidget.createWidget()
+                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());
                 // create widget from text item
                 JfxBrowser browser = (JfxBrowser) InteractiveWidget.createWidget(wt);
                         
-                FrameMouseActions.pickup(browser.getItems());                                           // attach browser widget to mouse
+                FrameMouseActions.pickup(browser.getItems());           // attach browser widget to mouse
         }
         
@@ -1139 +1141 @@
                 }
                 
-                // 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 no text with url is passed to action create a new text item with http://www.waikato.ac.nz for a default url
                 if(!FreeItems.textOnlyAttachedToCursor()) {
-                        text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), "http://www.waikato.ac.nz", null);
+                        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
@@ -1150 +1153 @@
                 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);
+                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);