Changeset 548

Timestamp:

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

Author:

csl14

Message:

added back and forward functionality for JfxBrowser

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (6 diffs)
• items/widgets/JfxBrowser.java (modified) (5 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);
                 

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

@@ -10 +10 @@
 import java.io.File;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -34 +35 @@
  */
 public class JfxBrowser extends DataFrameWidget {
+        
+        private static final String BACK = "back";
+        private static final String FORWARD = "forward";
+        private static final String REFRESH = "refresh";
+        
         private WebBrowserPanel _browser;
 
@@ -56 +62 @@
         static Method WebEngineGetLocation;
         static Method WebEngineGetLoadWorker;
+        static Method WebEngineGetHistory;
+        static Method WebEngineReload;
+
+        static Class WebHistory;
+        static Method WebHistoryGo;
 
         static Class Worker;
@@ -105 +116 @@
                         WebEngineGetLocation = WebEngine.getMethod("getLocation");
                         WebEngineGetLoadWorker = WebEngine.getMethod("getLoadWorker");
+                        WebEngineGetHistory = WebEngine.getMethod("getHistory");
+                        WebEngineReload = WebEngine.getMethod("reload");
+                        
+                        WebHistory = classLoader.loadClass("javafx.scene.web.WebHistory");
+                        WebHistoryGo = WebHistory.getMethod("go", int.class);
 
                         Worker = classLoader.loadClass("javafx.concurrent.Worker");
@@ -332 +348 @@
         }
 
+        /**
+         * Navigates JfxBrowser back through history. If end of history reached the user is notified via the MessageBay.
+         * Max size of history is 100 by default.
+         */
+        public void navigateBack() {
+                try {
+                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(WebViewGetEngine.invoke(this._browser.webview)), -1);
+                        FreeItems.getInstance().clear();
+                } catch (InvocationTargetException e) {
+                        MessageBay.displayMessage("End of History");
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        
+        /**
+         * Navigates JfxBrowser forward through history. If end of history reached the user is notified via the MessageBay.
+         * Max size of history is 100 by default.
+         */
+        public void navigateForward() {
+                try {
+                        WebHistoryGo.invoke(WebEngineGetHistory.invoke(WebViewGetEngine.invoke(this._browser.webview)), 1);
+                        FreeItems.getInstance().clear();
+                } catch (InvocationTargetException e) {
+                        MessageBay.displayMessage("End of History");
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        
+        /**
+         * Refreshes page in webview.
+         */
+        public void refresh() {
+                try {
+                        //WebEngineReload.invoke(WebViewGetEngine.invoke(this._browser.webview));
+                        MessageBay.displayMessage("Page Refreshed");
+                        FreeItems.getInstance().clear();
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        
         @Override
         public boolean ItemsLeftClickDropped() {
                 Text carried = null;
-                if ((carried = FreeItems.getTextAttachedToCursor()) != null) {
+                if ((carried = FreeItems.getTextAttachedToCursor()) == null) {
+                        return false;
+                }
+                
+                if(carried.getText().toLowerCase().equals(BACK)) {
+                        navigateBack();
+                } else if(carried.getText().toLowerCase().equals(FORWARD)) {
+                        navigateForward();
+                } else if(carried.getText().toLowerCase().equals(REFRESH)) {
+                        refresh();
+                } else {
                         String text = carried.getText().trim();
                         this.navigate(text);
                         FreeItems.getInstance().clear();
-                        return true;
-                }
-                return false;
+                }
+                
+                return true;
         }