Changeset 1102 for trunk/src/org/expeditee/actions/JfxBrowserActions.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/actions/JfxBrowserActions.java (modified) (9 diffs)

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

@@ -22 +22 @@
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 
-import org.expeditee.gui.Browser;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
@@ -42 +38 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.JfxBrowser;
-import org.expeditee.settings.exploratorysearch.ExploratorySearchSettings;
 import org.expeditee.settings.network.NetworkSettings;
 import org.json.simple.JSONObject;
@@ -83 +78 @@
                 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());
+                wt.setParent(DisplayController.getCurrentFrame());                      // set parent of text source for InteractiveWidget.createWidget()
+                wt.setXY(DisplayController.getMouseX(), DisplayController.getMouseY());
                 
                 // create widget from text item
-                JfxBrowser browser = (JfxBrowser) InteractiveWidget.createWidget(wt);
+                JfxBrowser browser = (JfxBrowser) Widget.createWidget(wt);
                         
-                FrameMouseActions.pickup(browser.getItems());           // attach browser widget to mouse
+                StandardGestureActions.pickup(browser.getItems());              // attach browser widget to mouse
         }
         
@@ -109 +104 @@
                 // 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(), 
+                        text = DisplayController.getCurrentFrame().addText(DisplayController.getMouseX(), DisplayController.getMouseY(), 
                                         NetworkSettings.HomePage.get(), null);
-                        text.setParent(DisplayIO.getCurrentFrame());    // set parent of text source for InteractiveWidget.createWidget()
-                        FrameMouseActions.pickup(text);                                 // Attach new text link to cursor
+                        text.setParent(DisplayController.getCurrentFrame());    // set parent of text source for InteractiveWidget.createWidget()
+                        StandardGestureActions.pickup(text);                                    // Attach new text link to cursor
                 }
                 
@@ -123 +118 @@
                 Text wt = frame.addText(0, 0, "@iw: org.expeditee.items.widgets.JfxBrowser " 
                                 + ("--anchorLeft 0 --anchorRight 0 --anchorTop 0 --anchorBottom 0 ")
-                                + Browser._theBrowser.getContentPane().getWidth() +  " " + Browser._theBrowser.getContentPane().getHeight() 
+                                + EcosystemManager.getGraphicsManager().getWindowSize().getWidth() +  " " + EcosystemManager.getGraphicsManager().getWindowSize().getHeight() 
                                 + " : " + text.getText(), null);
                 
-                InteractiveWidget.createWidget(wt);
+                Widget.createWidget(wt);
                 
                 FrameIO.SaveFrame(frame);                                                       // save frame to disk
@@ -179 +174 @@
 
                 // Create widget via text annotation
-                frame.addText(10, 10, "@iw: org.expeditee.items.widgets.JfxBrowser " + (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.9) + " "
-                                + (int) (FrameGraphics.getMaxFrameSize().getHeight() * 0.9) + " : " + url, null);
+                frame.addText(10, 10, "@iw: org.expeditee.items.widgets.JfxBrowser " + (int) (DisplayController.getFramePaintArea().getWidth() * 0.9) + " "
+                                + (int) (DisplayController.getFramePaintArea().getHeight() * 0.9) + " : " + url, null);
 
                 FrameIO.SaveFrame(frame);
@@ -294 +289 @@
 
                                         if (!picSource.equals("")) {
-                                                pic = WebParser.getImageFromUrl(picSource, null, DisplayIO.getCurrentFrame(), 0, 0, 50, null, null,
+                                                pic = WebParser.getImageFromUrl(picSource, null, DisplayController.getCurrentFrame(), 0, 0, 50, null, null,
                                                                 null, null, null, 0, 0);
                                                 items.add(pic);
@@ -300 +295 @@
                                         }
 
-                                        titleItem.setPosition(FrameMouseActions.getPosition());
+                                        titleItem.setPosition(DisplayController.getMousePosition());
                                         mainTextItem.setPosition(titleItem.getX(), titleItem.getY() + titleItem.getBoundsHeight());
                                         sourceItem.setPosition(mainTextItem.getX(), mainTextItem.getY() + mainTextItem.getBoundsHeight());
@@ -313 +308 @@
                                         items.add(sourceItem);
                                         items.add(ddgLink);
-                                        FrameMouseActions.pickup(items);
+                                        StandardGestureActions.pickup(items);
                                 } catch (IOException e) {
                                         MessageBay.displayMessage("Problem loading results");