Changeset 557

Timestamp:

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

Author:

csl14

Message:

started getFrame method for JfxBrowser - gets html as expeditee frame

Location:

trunk

Files:

• releases/jars/licenses (modified) (1 diff)
• src/org/expeditee/items/widgets/JfxBrowser.java (modified) (11 diffs)

trunk/releases/jars/licenses

@@ -12 +12 @@
 Java Core (?)                                   activation.jar, mail.jar, ext/javafxrt.jar, ext/javafxc.jar, ext/jlfgr-1_0.jar, ext/Scenario-0.5.jar
 Commercial trial (?)                            JEP.jar
+MIT License                             jsoup-1.7.3.jar

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

@@ -49 +49 @@
         private static final String FORWARD = "forward";
         private static final String REFRESH = "refresh";
+        private static final String GETFRAME = "getframe";
         
         private WebBrowserPanel _browser;
@@ -74 +75 @@
         static Method WebEngineGetHistory;
         static Method WebEngineReload;
+        //static Method WebEngineGetDocument;
 
         static Class WebHistory;
@@ -507 +509 @@
                                                 try {
                                                         WebHistoryGo.invoke(WebEngineGetHistory.invoke(webEngine), -1);
+                                                        FreeItems.getInstance().clear();
                                                 } catch (InvocationTargetException e) {
                                                         MessageBay.displayMessage("Start of History");
@@ -517 +520 @@
                                 e.printStackTrace();
                         }
-                        
-                        FreeItems.getInstance().clear();
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -537 +538 @@
                                                 try {
                                                         WebHistoryGo.invoke(WebEngineGetHistory.invoke(webEngine), 1);
+                                                        FreeItems.getInstance().clear();
                                                 } catch (InvocationTargetException e) {
                                                         MessageBay.displayMessage("End of History");
@@ -547 +549 @@
                                 e.printStackTrace();
                         }
-                        FreeItems.getInstance().clear();
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -554 +555 @@
         
         /**
-         * Refreshes page in webview.
+         * Refreshes webview by reloading the page.
          */
         public void refresh() {
@@ -565 +566 @@
                                                 try {
                                                         WebEngineReload.invoke(webEngine);
+                                                        FreeItems.getInstance().clear();
+                                                        MessageBay.displayMessage("Page Refreshing");
                                                 } catch (Exception e) {
                                                         e.printStackTrace();
@@ -573 +576 @@
                                 e.printStackTrace();
                         }
-                        MessageBay.displayMessage("Page Refreshed");
-                        FreeItems.getInstance().clear();
                 } catch (Exception e) {
                         e.printStackTrace();
@@ -580 +581 @@
         }
         
+        /**
+         * Traverses DOM an turns elements into expeditee items.
+         */
+        public void getFrame() {
+                MessageBay.displayMessage("I haven't been implemented yet");
+                try {
+                        final Object webEngine = WebViewGetEngine.invoke(this._browser.webview);
+                        
+                        try {
+                                PlatformRunLater.invoke(null, new Runnable() {
+                                        @Override
+                                        public void run() {
+                                                try {
+                                                        // TODO: parse html to get expeditee frame
+                                                } catch (Exception e) {
+                                                        e.printStackTrace();
+                                                }
+                                        }
+                                });
+                        } catch (Exception e) {
+                                e.printStackTrace();
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        
+        /**
+         * Used to drop text items onto JfxBrowser widget. Does nothing if a text item is not attached to cursor.
+         *              "back"          -> navigates back a page in browser's session history
+         *              "forward"       -> navigates forward a page in browser's session history
+         *              "refresh"       -> reloads current page
+         *              "getFrame"      -> attempts to parse page into an expeditee frame
+         *               url            -> all other text is assumed to be a url which browser attempts to navigate to 
+         * return Whether a JfxBrowser specific event is run.
+         */
         @Override
         public boolean ItemsLeftClickDropped() {
                 Text carried = null;
-                if ((carried = FreeItems.getTextAttachedToCursor()) == null) {
+                if ((carried = FreeItems.getTextAttachedToCursor()) == null) {  // fails if no text is attached to cursor.
                         return false;
                 }
@@ -593 +630 @@
                 } else if(carried.getText().toLowerCase().equals(REFRESH)) {
                         refresh();
+                } else if(carried.getText().toLowerCase().equals(GETFRAME)) {
+                        getFrame();
                 } else {
                         String text = carried.getText().trim();