Changeset 181 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

08/01/08 16:38:58 (16 years ago)

Author:

ra33

Message:

Work on Bridging the Gap between SimpleStatements and Actions/Agents

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (27 diffs)

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
 
 import javax.imageio.ImageIO;
 
-import org.expeditee.gui.AttributeUtils;
-import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -25 +20 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.TimeKeeper;
@@ -37 +31 @@
 import org.expeditee.stats.TreeStats;
 import org.nfunk.jep.Node;
-import org.nfunk.jep.Variable;
 
 /**
@@ -47 +40 @@
          * Causes the system to beep
          */
-        public static void Beep() {
+        public static void beep() {
                 java.awt.Toolkit.getDefaultToolkit().beep();
         }
@@ -54 +47 @@
          * Forces a repaint of the current Frame
          */
-        public static void Display() {
-                FrameGraphics.ForceRepaint();
+        public static void display() {
+                FrameGraphics.refresh(false);
         }
 
@@ -62 +55 @@
          * hard disk
          */
-        public static void Restore() {
+        public static void restore() {
                 FrameIO.Reload();
                 // MessageBay.displayMessage("Restoration complete.");
@@ -70 +63 @@
          * Toggles AudienceMode on or off
          */
-        public static void ToggleAudienceMode() {
+        public static void toggleAudienceMode() {
                 FrameGraphics.ToggleAudienceMode();
         }
@@ -77 +70 @@
          * Toggles TwinFrames mode on or off
          */
-        public static void ToggleTwinFramesMode() {
+        public static void toggleTwinFramesMode() {
                 DisplayIO.ToggleTwinFrames();
         }
@@ -88 +81 @@
          *            The Item to read the Actions from
          */
-        public static void RunCurrentItem(Item current) {
+        public static void runItem(Item current) throws Exception {
                 if (current instanceof Text) {
                         List<String> actions = ((Text) current).getTextList();
                         for (String action : actions) {
-                                if (!action.equalsIgnoreCase("runcurrentitem")) {
+                                if (!action.equalsIgnoreCase("runitem")) {
                                         Actions.PerformAction(DisplayIO.getCurrentFrame(), current,
                                                         action);
@@ -152 +145 @@
          *            from.
          */
-        public static void GetItemFromChildFrame(Item current) {
-                getFromChildFrame(current, false);
+        public static Item GetItemFromChildFrame(Item current) {
+                return getFromChildFrame(current, false);
         }
 
@@ -169 +162 @@
          *            from.
          */
-        public static void GetTextFromChildFrame(Item current) {
-                getFromChildFrame(current, true);
-        }
-
-        private static void getFromChildFrame(Item current, boolean textOnly) {
+        public static Item GetTextFromChildFrame(Item current) {
+                return getFromChildFrame(current, true);
+        }
+
+        private static Item getFromChildFrame(Item current, boolean textOnly) {
                 Item item = getFirstBodyItemOnChildFrame(current, textOnly);
                 // if no item was found
-                if (item == null) {
-                        return;
-                }
-
-                // copy the item and switch
-                item = item.copy();
-                item.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
-                item.setParent(null);
-                FrameMouseActions.pickup(item);
-                FrameGraphics.Repaint();
+                if (item != null) {
+                        // copy the item and switch
+                        item = item.copy();
+                        item.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
+                }
+                return item;
         }
 
@@ -218 +207 @@
          *            The Color to give the Item.
          */
-        public static void SetCurrentItemBackgroundColor(Item toChange, Color toUse) {
+        public static void SetItemBackgroundColor(Item toChange, Color toUse) {
                 if (toChange == null)
                         return;
@@ -235 +224 @@
          *            The Color to give the Item.
          */
-        public static void SetCurrentItemColor(Item toChange, Color toUse) {
+        public static void SetItemColor(Item toChange, Color toUse) {
                 if (toChange == null)
                         return;
@@ -255 +244 @@
          * Creates a new Text Object containing statistics for the current tree.
          */
-        public static void GetCometStats(Frame frame) {
+        public static String GetCometStats(Frame frame) {
                 TimeKeeper timer = new TimeKeeper();
                 MessageBay.displayMessage("Computing comet stats...");
-
                 CometStats cometStats = new CometStats(frame);
-                attachStatsToCursor(cometStats.toString());
+                String result = cometStats.toString();
                 MessageBay.overwriteMessage("Comet stats time: "
                                 + timer.getElapsedStringSeconds());
-        }
-
-        public static void GetTreeStats(Frame frame) {
+                return result;
+        }
+
+        public static String GetTreeStats(Frame frame) {
                 TimeKeeper timer = new TimeKeeper();
                 MessageBay.displayMessage("Computing tree stats...");
 
                 TreeStats treeStats = new TreeStats(frame);
-                attachStatsToCursor(treeStats.toString());
+                String result = treeStats.toString();
                 MessageBay.overwriteMessage("Tree stats time: "
                                 + timer.getElapsedStringSeconds());
+                return result;
+
         }
 
@@ -302 +293 @@
          * then attached to the cursor via FrameMouseActions.pickup(Item)
          */
-        public static void GetItemStats() {
-                attachStatsToCursor(SessionStats.getItemStats());
+        public static String getItemStats() {
+                return SessionStats.getItemStats();
         }
 
@@ -312 +303 @@
          * FrameMouseActions.pickup(Item)
          */
-        public static void GetEventStats() {
-                attachStatsToCursor(SessionStats.getEventStats());
+        public static String getEventStats() {
+                return SessionStats.getEventStats();
         }
 
@@ -320 +311 @@
          * file.
          */
-        public static void GetCurrentFrameFile() {
-                Frame current = DisplayIO.getCurrentFrame();
-                attachStatsToCursor(FrameIO.ForceSaveFrame(current));
+        public static String getFrameFile(Frame frame) {
+                return FrameIO.ForceSaveFrame(frame);
         }
 
@@ -328 +318 @@
          * Creates a new Text Object containing the available fonts.
          */
-        public static void getFontNames() {
-
+        public static String getFontNames() {
                 Collection<String> availableFonts = Actions.getFonts().values();
                 StringBuilder fontsList = new StringBuilder();
@@ -337 +326 @@
                 fontsList.deleteCharAt(fontsList.length() - 1);
 
-                attachStatsToCursor(fontsList.toString());
-        }
-
-        public static void getUnicodeCharacters(int start, int finish) {
+                return fontsList.toString();
+        }
+
+        public static String getUnicodeCharacters(int start, int finish) {
                 if (start < 0 && finish < 0) {
                         throw new RuntimeException("Parameters must be non negative");
@@ -364 +353 @@
                         }
                 }
-                attachTextToCursor(charList.toString());
+                return charList.toString();
         }
 
@@ -373 +362 @@
          *            the start of the block
          */
-        public static void getUnicodeCharacters(int start) {
-                getUnicodeCharacters(start, start + 256);
-        }
-
-        public static void getMathSymbols() {
-                getUnicodeCharacters('\u2200', '\u2300');
+        public static String getUnicodeCharacters(int start) {
+                return getUnicodeCharacters(start, start + 256);
+        }
+
+        public static String getMathSymbols() {
+                return getUnicodeCharacters('\u2200', '\u2300');
         }
 
@@ -384 +373 @@
          * Resets the statistics back to zero.
          */
-        public static void ResetStats() {
+        public static void repaint() {
                 StatsLogger.WriteStatsFile();
                 SessionStats.resetStats();
@@ -395 +384 @@
          *            The name of the Frame to save
          */
-        public static void JpegFrame(String framename) {
+        public static void jpegFrame(String framename) {
                 ImageFrame(framename, "JPEG");
         }
@@ -403 +392 @@
          * JpegFrame(currentFrame.getName())
          */
-        public static void JpegFrame() {
+        public static void jpegFrame() {
                 ImageFrame(DisplayIO.getCurrentFrame().getName(), "JPEG");
         }
 
-        public static void JPGFrame() {
-                JpegFrame();
+        public static void jpgFrame() {
+                jpegFrame();
         }
 
@@ -455 +444 @@
                 assert (frame != null);
 
-                FrameGraphics.UpdateBuffer(frame, false);
-
+                Image oldBuffer = frame.getBuffer();
+                frame.setBuffer(null);
+                // Jpeg only works properly with volitile 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
+                // screen
+                frame.setBuffer(oldBuffer);
                 BufferedImage screen = null;
-                Image frameBuffer = frame.getBuffer();
-                if (frame.getBuffer() instanceof BufferedImage) {
-                        screen = (BufferedImage) frameBuffer;
-                } else if (frameBuffer instanceof VolatileImage) {
+
+                if (frameBuffer instanceof VolatileImage) {
+                        // If its the current frame it will be a volitive image
                         screen = ((VolatileImage) frameBuffer).getSnapshot();
                 } else {
-                        assert (false);
+                        assert (frameBuffer instanceof BufferedImage);
+                        screen = (BufferedImage) frameBuffer;
                 }
                 return SaveImage(screen, format, directory, frame.getExportFileName());
@@ -491 +487 @@
                                                 + format + " format");
                         // if the frame was not loaded successfully, alert the user
-                } else
+                } else {
                         MessageBay.displayMessage("Frame '" + framename
                                         + "' could not be found.");
+                }
         }
 
@@ -744 +741 @@
                 }
         }
+
+        /**
+         * Attach an item to the cursor.
+         * 
+         * @param item
+         */
+        public static void attachToCursor(Item item) {
+                item.setParent(null);
+                FrameMouseActions.pickup(item);
+                FrameGraphics.Repaint();
+        }
 }