Changeset 539

Timestamp:

11/27/13 10:58:55 (10 years ago)

Author:

jts21

Message:

Override that event in JfxBrowser to allow navigation to a new URL

Location:

trunk/src/org/expeditee

Files:

• gui/FrameMouseActions.java (modified) (2 diffs)
• items/widgets/InteractiveWidget.java (modified) (2 diffs)
• items/widgets/JfxBrowser.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -30 +30 @@
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.ItemAppearence;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
-import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.UserAppliedPermission;
 import org.expeditee.items.XRayable;
-import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.WidgetCorner;
@@ -732 +732 @@
                         if (iw != null) {
 
+                                // Handle dropping items on widgets
+                                if(iw.ItemsLeftClickDropped()) {
+                                        return;
+                                }
+                                
                                 // Note: musten't directly use source for handling the link
                                 // because all link operations will by-pass the widgets special

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

@@ -30 +30 @@
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.ItemUtils;
+import org.expeditee.items.Text;
 import org.expeditee.items.UserAppliedPermission;
-import org.expeditee.items.Text;
 
 /**
@@ -1722 +1722 @@
         }
         
+        /**
+         * Event called when the widget is left clicked while there are items attached to the FreeItems buffer
+         * 
+         * @return true if event was handled (no pass through), otherwise false
+         */
+        public boolean ItemsLeftClickDropped() {
+                return false;
+        }
+        
 }

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

@@ -17 +17 @@
 import javax.swing.JPanel;
 
+import org.expeditee.gui.FreeItems;
 import org.expeditee.items.Text;
 
@@ -214 +215 @@
 
         public void navigate(final String url) {
+                System.out.println(url);
                 try {
-                        WebEngineLoad.invoke(WebViewGetEngine.invoke(this._browser.webview), url);
-                } catch (IllegalAccessException e) {
-                        e.printStackTrace();
-                } catch (IllegalArgumentException e) {
-                        e.printStackTrace();
-                } catch (InvocationTargetException e) {
-                        e.printStackTrace();
-                }
+                        PlatformRunLater.invoke(null, new Runnable() {
+                                @Override
+                                public void run() {
+                                        try {
+                                                WebEngineLoad.invoke(WebViewGetEngine.invoke(JfxBrowser.this._browser.webview), url);
+                                        } catch (Exception e) {
+                                                e.printStackTrace();
+                                        }
+                                }
+                        });
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
+        }
+        
+        @Override
+        public boolean ItemsLeftClickDropped() {
+                Text carried = null;
+                if((carried = FreeItems.getTextAttachedToCursor()) != null) {
+                        this.navigate(carried.getText());
+                        return true;
+                }
+                return false;
         }