Changeset 748 for trunk/src/org/expeditee/actions

Timestamp:

01/24/14 11:32:31 (10 years ago)

Author:

ngw8

Message:

Changed JFX files to no longer use reflection (as some new features were impossible via reflection) and just import javafx instead. This will probably cause Eclipse to complain if you're using a Java version <= 7, but building/running Expeditee will still work (using Eclipse or Ant).
Have also added an Ant target that builds without ant JFX stuff. See the comments near the top of JfxBrowser.java or WebParser.java for details

Location:

trunk/src/org/expeditee/actions

Files:

• JfxBrowserActions.java (added)
• Misc.java (modified) (8 diffs)

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

@@ -4 +4 @@
 import java.awt.Desktop;
 import java.awt.Image;
-import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
@@ -23 +22 @@
 
 import javax.imageio.ImageIO;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 
 import org.expeditee.gui.AttributeUtils;
@@ -42 +38 @@
 import org.expeditee.gui.TimeKeeper;
 import org.expeditee.importer.FrameDNDTransferHandler;
-import org.expeditee.io.WebParser;
-import org.expeditee.io.flowlayout.XGroupItem;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -50 +44 @@
 import org.expeditee.items.XRayable;
 import org.expeditee.items.widgets.InteractiveWidget;
-import org.expeditee.items.widgets.JfxBrowser;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
 import org.expeditee.math.ExpediteeJEP;
-import org.expeditee.settings.Settings;
 import org.expeditee.settings.UserSettings;
-import org.expeditee.settings.network.NetworkSettings;
 import org.expeditee.simple.SString;
 import org.expeditee.stats.CometStats;
@@ -1111 +1102 @@
         }
         
-        /**
-         * Launches items.widgets.JfxBrowser and uses Text item as URL.
-         * Note: currently doesn't work
-         * @param text Text item which passes contents as URL for browser.
-         * @throws Exception
-         */
-        public static void startBrowser(Item text) throws Exception {
-                if (!(text instanceof Text)) {
-                        MessageBay.errorMessage("Must be a text item.");
-                        return;
-                }
-                if(text.getLink() != null) {
-                        MessageBay.errorMessage("Text item cannot have link.");
-                        return;
-                }
-                        
-                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
-                        wt.appendText(":" + text.getText());
-                } else {
-                        wt.appendText(":http://www.waikato.ac.nz");
-                }
-                
-                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
-        }
-        
-        /**
-         * Text item becomes link to new frame containing items.widgets.JfxBrowser and uses Text item as URL for browser.
-         * Note: currently doesn't work
-         * @param text Text item which passes contents as URL for browser and becomes link to the browser's new frame.
-         * @throws Exception
-         */
-        public static void startBrowserNewFrame(Item text) throws Exception {
-                if (!(text instanceof Text)) {
-                        MessageBay.errorMessage("Must be a text item.");
-                        return;
-                }
-                if(text.getLink() != null) {                                            // text item can't already have a link
-                        MessageBay.errorMessage("Text item already has link.");
-                        return;
-                }
-                
-                // 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(), 
-                                        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
-                }
-                
-                // Create JfxBrowser widget on a new frame
-                Frame frame = FrameIO.CreateNewFrame(text);                     // create new frame for browser
-                text.setLink("" + frame.getNumber());                           // link this text item to new frame
-                // Create widget via text annotation
-                Text wt = frame.addText(0, JfxBrowser.VERT_OFFSET, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 
-                                 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP) + " : ".concat(text.getText()), null);
-                InteractiveWidget.createWidget(wt);
-                
-                FrameIO.SaveFrame(frame);                                                       // save frame to disk
-        }
-        
         private static boolean startWidget(String name) throws Exception {
                 String fullName = Actions.getClassName(name);
@@ -1245 +1167 @@
         }
         
-        public static void parsePage(Item text) throws Exception {
-                if (!(text instanceof Text) || !FreeItems.textOnlyAttachedToCursor()) {
-                        MessageBay.errorMessage("Must provide a text item.");
-                        return;
-                }
-                if(text.getLink() != null) {                                            // text item can't already have a link
-                        MessageBay.errorMessage("Text item already has link.");
-                        return;
-                }
-                
-                // Create JfxBrowser widget on a new frame
-                Frame frame = FrameIO.CreateNewFrame(text);                     // create new frame for browser
-                text.setLink("" + frame.getNumber());                           // link this text item to new frame
-                frame.addText(100, 100, "test", null);
-                
-                WebParser.parseURL(text.getText(), frame);
-                System.out.println(text.getText());
-        }
-        
         /**
          * Rebuilds the home frame restoring its original presentation.
@@ -1274 +1177 @@
                 FrameUtils.CreateDefaultProfile(UserSettings.UserName.get(), homeFrame);
         }
-        
-        /**
-         * Adds a text item to the cursor which is linked to a new frame with the web browser active overlay and a JavaFX browser.
-         * @param text The text item attached to the cursor.
-         */
-        public static void startBrowserSession(Text text) {
-                try {
-                        if (!(text instanceof Text)) {
-                                MessageBay.errorMessage("Must be a text item.");
-                                return;
-                        }
-                        
-                        if(text.getLink() != null) {                                            // text item can't already have a link
-                                MessageBay.errorMessage("Text item already has link.");
-                                return;
-                        }
-                        
-                        String url = "";
-                        
-                        // If no text with url is passed to action create a new text item
-                        if(!FreeItems.textOnlyAttachedToCursor()) {
-                                url = NetworkSettings.HomePage.get();                                   // use home page specified by settings
-                                text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), 
-                                                "Web Browser Session", null);
-                                text.setParent(DisplayIO.getCurrentFrame());
-                                FrameMouseActions.pickup(text);
-                        } else {
-                                url = text.getText();                                                   // get url from text attached to cursor if possible
-                        }
-                        
-                        // Set text to session id. TODO: set session id.
-                        text.setText("Web Browser Session");
-                        
-                        // Create new frame
-                        Frame frame = FrameIO.CreateNewFrame(text);
-                        text.setLink("" + frame.getNumber());                           // link this text item to new frame
-                        
-                        // Remove everything from new page
-                        frame.removeAllItems(frame.getItems());
-                        
-                        // Add web browser active overlay
-                        frame.addText(1100, 50, "@ao: 2", null, "overlayset2");
-                        // Add @old
-                        frame.addText(1100, 20, "@old", null);
-                        
-                        // Create widget via text annotation
-                        Text wt = frame.addText(0, 80, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 
-                                         " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP) + " : ".concat(url), null);
-                        InteractiveWidget.createWidget(wt);
-                        
-                        FrameIO.SaveFrame(frame);                                                       // save frame to disk
-                } catch(Exception e) {
-                        e.printStackTrace();
-                }
-        }
-        
+
         /**
          * Adds a text item to the cursor which is linked to a new frame with the mindmap active overlay.
@@ -1463 +1311 @@
         }
         
-        public static void gotoURL(Text link, String URL) {
-                Frame frame = FrameIO.CreateNewFrame(link);
-                link.setAction(null);
-                link.setLink("" + frame.getNumber());
-                
-                WebParser.parseURL(URL, frame);
-                
-                frame.change();
-                
-                FrameIO.SaveFrame(frame);
-        }
-        
         public static void testProgress() {
                 new Thread(new Runnable() {