Changeset 1102 for trunk/src/org/expeditee/actions/Misc.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/Misc.java (modified) (50 diffs)

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

@@ -19 +19 @@
 package org.expeditee.actions;
 
-import java.awt.Color;
-import java.awt.Desktop;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.awt.image.VolatileImage;
 import java.io.BufferedReader;
 import java.io.File;
@@ -31 +26 @@
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -39 +32 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 
-import javax.imageio.ImageIO;
-
+import org.expeditee.core.Colour;
+import org.expeditee.core.Image;
+import org.expeditee.core.Point;
+import org.expeditee.gio.EcosystemManager;
+import org.expeditee.gio.gesture.StandardGestureActions;
 import org.expeditee.gui.AttributeUtils;
-import org.expeditee.gui.Browser;
 import org.expeditee.io.Conversion;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.io.ExpReader;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameKeyboardActions;
-import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
@@ -63 +54 @@
 import org.expeditee.gui.Reminders;
 import org.expeditee.gui.TimeKeeper;
-import org.expeditee.importer.FrameDNDTransferHandler;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -69 +59 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.XRayable;
-import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.Widget;
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
@@ -83 +73 @@
 import org.nfunk.jep.ParseException;
 
-import com.lowagie.text.Font;
-
 
 
 /**
- * A list of miscellaneous Actions and Actions specific to Expeditee
+ * A list of miscellaneous Actions specific to Expeditee
  * 
  */
@@ -96 +84 @@
          * Causes the system to beep
          */
-        public static void beep() {
-                java.awt.Toolkit.getDefaultToolkit().beep();
+        public static void beep()
+        {
+                EcosystemManager.getMiscManager().beep();
         }
         
@@ -161 +150 @@
          * Treats a string as a URL and attempts to open it
          */
-        public static void openURL(String siteURL){
-                
-                try {
-                        URL check = new URL(siteURL);                   
-                        Desktop.getDesktop().browse(new URI(siteURL));
-                        
-                } catch (IOException| URISyntaxException e) {
-                
-                        MessageBay.displayMessage("'" + siteURL + "' is not a valid URL");
-                }               
+        public static void openURL(String siteURL)
+        {
+                boolean success = EcosystemManager.getMiscManager().browse(siteURL);
+                
+                if (!success) MessageBay.displayMessage("'" + siteURL + "' is not a valid URL");        
         }
         /**
@@ -177 +161 @@
         public static void setRestorePoint()
         {
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 current.change();
                 FrameIO.SaveFrameAsRestore(current, true, true);                
@@ -185 +169 @@
          */
         public static void display() {
-                FrameGraphics.refresh(false);
+                DisplayController.requestRefresh(false);
         }
         
         public static String getWindowSize() {
-                return Browser.getWindows()[0].getSize().toString();
+                return EcosystemManager.getGraphicsManager().getWindowSize().toString();
         }
 
@@ -205 +189 @@
          */
         public static void toggleAudienceMode() {
-                FrameGraphics.ToggleAudienceMode();
+                DisplayController.ToggleAudienceMode();
         }
 
@@ -212 +196 @@
          */
         public static void toggleTwinFramesMode() {
-                DisplayIO.ToggleTwinFrames();
+                DisplayController.toggleTwinFrames();
         }
 
@@ -227 +211 @@
                         for (String action : actions) {
                                 if (!action.equalsIgnoreCase("runitem")) {
-                                        Actions.PerformAction(DisplayIO.getCurrentFrame(), current,
+                                        Actions.PerformAction(DisplayController.getCurrentFrame(), current,
                                                         action);
                                 }
@@ -249 +233 @@
                         String deletedFrameName = FrameIO.DeleteFrame(toDelete);
                         if (deletedFrameName != null) {
-                                DisplayIO.Back();
+                                DisplayController.Back();
                                 // Remove any links on the previous frame to the one being
                                 // deleted
-                                Frame current = DisplayIO.getCurrentFrame();
+                                Frame current = DisplayController.getCurrentFrame();
                                 for (Item i : current.getItems())
                                         if (i.getLink() != null
@@ -312 +296 @@
                         // copy the item and switch
                         item = item.copy();
-                        item.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
+                        item.setPosition(DisplayController.getMousePosition());
                 }
                 return item;
@@ -327 +311 @@
                 Collection<Item> copies = ItemUtils.CopyItems(items);
                 Item first = items.iterator().next();
-                float deltaX = DisplayIO.getMouseX() - first.getX();
-                float deltaY = FrameMouseActions.getY() - first.getY();
+                float deltaX = DisplayController.getMouseX() - first.getX();
+                float deltaY = DisplayController.getMouseY() - first.getY();
                 for (Item i : copies) {
                         if (i.isVisible())
@@ -334 +318 @@
                         i.setParent(null);
                 }
-                FrameMouseActions.pickup(copies);
-                FrameGraphics.Repaint();
+                StandardGestureActions.pickup(copies);
+                DisplayController.requestRefresh(true);
         }
         
@@ -347 +331 @@
          *            The Color to give the Item.
          */
-        public static void SetItemBackgroundColor(Item toChange, Color toUse) {
+        public static void SetItemBackgroundColor(Item toChange, Colour toUse) {
                 if (toChange == null)
                         return;
 
                 toChange.setBackgroundColor(toUse);
-                FrameGraphics.Repaint();
+                DisplayController.requestRefresh(true);
         }
 
@@ -364 +348 @@
          *            The Color to give the Item.
          */
-        public static void SetItemColor(Item toChange, Color toUse) {
+        public static void SetItemColor(Item toChange, Colour toUse) {
                 if (toChange == null)
                         return;
 
                 toChange.setColor(toUse);
-                FrameGraphics.Repaint();
+                DisplayController.requestRefresh(true);
         }
 
@@ -428 +412 @@
         public static void attachStatsToCursor(String itemText) {
                 SessionStats.CreatedText();
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 Item text = current.getStatsTextItem(itemText);
-                FrameMouseActions.pickup(text);
-                FrameGraphics.Repaint();
+                StandardGestureActions.pickup(text);
+                DisplayController.requestRefresh(true);
         }
 
         public static void attachTextToCursor(String itemText) {
                 SessionStats.CreatedText();
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 Item text = current.getTextItem(itemText);
-                FrameMouseActions.pickup(text);
-                FrameGraphics.Repaint();
+                StandardGestureActions.pickup(text);
+                DisplayController.requestRefresh(true);
         }
         
@@ -494 +478 @@
                 }
 
-                for (Entry<String, java.awt.Font> entry: Text.FONT_WHEEL_ADDITIONAL_LOOKUP.entrySet()){
+                for (Entry<String, org.expeditee.core.Font> entry: Text.FONT_WHEEL_ADDITIONAL_LOOKUP.entrySet()){
                         
                         String fontName = entry.getKey();
@@ -585 +569 @@
          */
         public static void jpegFrame() {
-                ImageFrame(DisplayIO.getCurrentFrame().getName(), "JPEG");
+                ImageFrame(DisplayController.getCurrentFrame().getName(), "JPEG");
         }
 
@@ -610 +594 @@
         }
 
-        public static String SaveImage(BufferedImage screen, String format,
+        public static String SaveImage(Image screen, String format,
                         String directory, String fileName) {
                 String suffix = "." + format.toLowerCase();
@@ -633 +617 @@
 
                         // If the image is successfully written out return the fileName
-                        if (ImageIO.write(screen, format, out))
+                        if (screen.writeToDisk(format, out))
                                 return fileName;
 
@@ -647 +631 @@
                 Image oldBuffer = frame.getBuffer();
                 frame.setBuffer(null);
-                // Jpeg only works properly with volitile frames
+                // Jpeg only works properly with volatile frames
                 // Png transparency only works with bufferedImage form
-                Image frameBuffer = FrameGraphics.getBuffer(frame, false, format
-                                .equalsIgnoreCase("jpeg"));
-                // Make sure overlay stuff doesnt disapear on the frame visible on the
+                Image frameBuffer = FrameGraphics.getFrameImage(frame, null, null, false, format.equalsIgnoreCase("jpeg"));
+                // Make sure overlay stuff doesnt disappear on the frame visible on the
                 // screen
                 frame.setBuffer(oldBuffer);
-                BufferedImage screen = null;
-
-                if (frameBuffer instanceof VolatileImage) {
-                        // If its the current frame it will be a volitive image
-                        screen = ((VolatileImage) frameBuffer).getSnapshot();
-                } else {
-                        assert (frameBuffer instanceof BufferedImage);
-                        screen = (BufferedImage) frameBuffer;
-                }
-                return SaveImage(screen, format, directory, frame.getExportFileName());
+                
+                return SaveImage(frameBuffer, format, directory, frame.getExportFileName());
         }
 
@@ -842 +817 @@
                 current.setActions(null);
 
-                FrameGraphics.Repaint();
+                DisplayController.requestRefresh(true);
         }
 
@@ -932 +907 @@
                                 text.setFormula(formulaFullCase);
                                 if (text.isFloating()) {
-                                        text.setPosition(FrameMouseActions.MouseX,
-                                                        FrameMouseActions.MouseY);
-                                        FrameMouseActions.resetOffset();
+                                        Point cursorPos = EcosystemManager.getInputManager().getCursorPosition();
+                                        text.setPosition(cursorPos.x, cursorPos.y);
+                                        StandardGestureActions.resetOffset();
                                 } else {
                                         text.getParentOrCurrentFrame().change();
@@ -956 +931 @@
         public static void attachToCursor(Item item) {
                 item.setParent(null);
-                FrameMouseActions.pickup(item);
-                FrameGraphics.Repaint();
+                StandardGestureActions.pickup(item);
+                DisplayController.requestRefresh(true);
         }
 
@@ -965 +940 @@
                         i.invalidateAll();
                 }
-                FrameMouseActions.pickup(items);
+                StandardGestureActions.pickup(items);
                 // TODO figure out why this isnt repainting stuff immediately
                 // All of text item doesnt repaint until the cursor is moved
-                FrameGraphics.requestRefresh(true);
+                DisplayController.requestRefresh(true);
         }
 
@@ -980 +955 @@
                 }
                 try {
-                        FrameDNDTransferHandler.getInstance().importFileList(files,
-                                        FrameMouseActions.getPosition());
+                        EcosystemManager.getDragAndDropManager().importFileList(files, EcosystemManager.getInputManager().getCursorPosition());
                 } catch (Exception e) {
                 }
@@ -990 +964 @@
                 if (file.exists()) {
                         try {
-                                FrameDNDTransferHandler.getInstance().importFile(file,
-                                                FrameMouseActions.getPosition());
+                                EcosystemManager.getDragAndDropManager().importFile(file, EcosystemManager.getInputManager().getCursorPosition());
                         } catch (Exception e) {
                                 e.printStackTrace();
@@ -1021 +994 @@
                 }
 
-                float curX = FrameMouseActions.MouseX;
-                float curY = FrameMouseActions.MouseY;
+                Point cursorPos = DisplayController.getMousePosition();
+                float curX = cursorPos.x;
+                float curY = cursorPos.y;
 
                 Collection<Item> newItems = new LinkedList<Item>();
                 Item[] d = new Item[sides];
                 // create dots
-                Frame current = DisplayIO.getCurrentFrame();
+                Frame current = DisplayController.getCurrentFrame();
                 for (int i = 0; i < d.length; i++) {
                         d[i] = current.createDot();
@@ -1053 +1027 @@
                 }
 
-                Color newColor = item.getColor();
+                Colour newColor = item.getColor();
                 if (newColor != null) {
                         d[0].setColor(item.getColor());
@@ -1068 +1042 @@
 
                 ItemUtils.EnclosedCheck(newItems);
-                FrameGraphics.refresh(false);
+                DisplayController.requestRefresh(false);
 
                 return d[0];
@@ -1077 +1051 @@
         }
 
-        public static void print(String file) {
-                try {
-                        if (Browser._theBrowser.isMinimumVersion6()) {
-                                if (Desktop.isDesktopSupported()) {
-                                        Desktop.getDesktop().print(new File(file));
-                                }
-                        }
-                } catch (Exception e) {
-                        MessageBay.errorMessage("Printing error: " + e.getMessage());
-                }
+        public static void print(String file)
+        {       
+                String errorMessage = EcosystemManager.getMiscManager().print(file);
+                
+                if (errorMessage != null) MessageBay.errorMessage("Printing error: " + errorMessage);
         }
 
@@ -1129 +1098 @@
          * @throws Exception
          */
-        public static void startLoboBrowser(Item text) throws Exception {
+/*      public static void startLoboBrowser(Item text) throws Exception {
                 if (!(text instanceof Text)) {
                         MessageBay.errorMessage("Must be a text item.");
@@ -1154 +1123 @@
                         
                 FrameMouseActions.pickup(browser.getItems());                                   // attach browser widget to mouse
-        }
+        }*/
         
         /**
@@ -1161 +1130 @@
          * @throws Exception
          */
-        public static void startLoboBrowserNewFrame(Item text) throws Exception {
+        public static void startLoboBrowserNewFrame(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.");
@@ -1176 +1147 @@
                 FrameUtils.Parse(frame);
                 
-                for(InteractiveWidget iw : frame.getInteractiveWidgets()) {     // may be other widgets on frame
+                for(Widget 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, DisplayController.getFramePaintArea().getWidth(), DisplayController.getFramePaintArea().getHeight() - 80);
                                 
                                 // If there is a text item attached to cursor use it as url for browser
-                                if(FreeItems.textOnlyAttachedToCursor()) {
+                                if (FreeItems.textOnlyAttachedToCursor()) {
                                         text.setLink("" + frame.getNumber());
                                         ((org.expeditee.items.widgets.Browser)iw).navigate(text.getText());
@@ -1190 +1160 @@
                                         ((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.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());
+                                        t.setParent(DisplayController.getCurrentFrame());               // set parent of text source for InteractiveWidget.createWidget()
+                                        t.setXY(DisplayController.getFloatMouseX(), DisplayController.getFloatMouseY());
                                         t.setLink("" + frame.getNumber());                              // link url text to new browser frame
-                                        FrameMouseActions.pickup(t);                                    // Attach new text link to cursor
+                                        StandardGestureActions.pickup(t);                                       // Attach new text link to cursor
                                 }
                         }
@@ -1201 +1171 @@
         }
         
-        private static boolean startWidget(String name) throws Exception {
+        private static boolean startWidget(String name) throws Exception
+        {
                 String fullName = Actions.getClassName(name);
                 if(fullName == null) {
@@ -1210 +1181 @@
                 FreeItems.getInstance().clear();
                 Text wt = new Text("@iw:" + fullName);                                                  // create new text item for browser widget
-                wt.setParent(DisplayIO.getCurrentFrame());                                              // set parent of text source for InteractiveWidget.createWidget()
-                wt.setXY(FrameMouseActions.getX(), FrameMouseActions.getY());   // move to the mouse cursor
-                InteractiveWidget widget = InteractiveWidget.createWidget(wt);
-                FrameMouseActions.pickup(widget.getItems());
+                wt.setParent(DisplayController.getCurrentFrame());                                              // set parent of text source for InteractiveWidget.createWidget()
+                wt.setXY(DisplayController.getMouseX(), DisplayController.getMouseY()); // move to the mouse cursor
+                Widget widget = Widget.createWidget(wt);
+                StandardGestureActions.pickup(widget.getItems());
                 
                 return true;
@@ -1223 +1194 @@
                 }
                 
-                Actions.PerformAction(DisplayIO.getCurrentFrame(), null, command);
+                Actions.PerformAction(DisplayController.getCurrentFrame(), null, command);
         }
         
@@ -1241 +1212 @@
                 if(name == "action" || name == "agent") {
                         if(args.length() > 0) {
-                                Actions.PerformAction(DisplayIO.getCurrentFrame(), null, args);
+                                Actions.PerformAction(DisplayController.getCurrentFrame(), null, args);
                         } else {
                                 MessageBay.displayMessage("Please specify an action/agent name");
@@ -1324 +1295 @@
                         if (i instanceof WidgetEdge || i instanceof WidgetCorner) {
                                 continue;
-                        } 
-                        else {
+                        } else {
                                 int new_x = i.getX();
                                 int new_y = i.getY();
@@ -1345 +1315 @@
                         }
                         // update the polygon, otherwise stuff moves but leaves it's outline behind
-                        i.updatePolygon();
-                }
-
-                for (InteractiveWidget iw : frame.getInteractiveWidgets()) {
+                        i.invalidateBounds();
+                }
+
+                for (Widget iw : frame.getInteractiveWidgets()) {
 
                         int new_x = iw.getX();
@@ -1368 +1338 @@
                 frame.change();
                 // redraw everything
-                FrameKeyboardActions.Refresh();
+                StandardGestureActions.Refresh();
         }
         
@@ -1505 +1475 @@
     public static void GitPushFrame() {
 
-        FrameKeyboardActions.Save();
-        
-        Frame current = DisplayIO.getCurrentFrame();
+        StandardGestureActions.Save();
+        
+        Frame current = DisplayController.getCurrentFrame();
         String userName = UserSettings.ProfileName.get();
 
@@ -1544 +1514 @@
 
     public static void GitPullFrame() {
-        Frame current = DisplayIO.getCurrentFrame();
+        Frame current = DisplayController.getCurrentFrame();
 
         List<String> cmd_array = new ArrayList<String>();
@@ -1554 +1524 @@
         
         FrameIO.Reload();
-        FrameKeyboardActions.Refresh();
+        StandardGestureActions.Refresh();
     }