Changeset 185 for trunk/src/org/expeditee/actions/Simple.java

Timestamp:

08/04/08 12:42:11 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/actions/Simple.java (modified) (6 diffs)

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

@@ -325 +325 @@
         }
 
-        private static void RunFrame(Text current, boolean acceptKeyboardInput,
+        private static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput,
                         boolean step, int pause, Color color) {
                 try {
@@ -336 +336 @@
                         _step = step;
                         _consumeKeyboardInput = acceptKeyboardInput;
-                        FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), true);
+                        FrameIO.SaveFrame(frame, true);
 
                         // an item without a link signals to run the current frame
@@ -342 +342 @@
                                 // Make a copy but hide it
                                 current = current.copy();
-                                current.setLink(DisplayIO.getCurrentFrame().getName());
+                                current.setLink(frame.getName());
                         }
 
@@ -354 +354 @@
         }
 
-        public static void RunFrame(Text current, boolean acceptKeyboardInput) {
-                RunFrame(current, acceptKeyboardInput, false, 0, null);
-        }
-
-        public static void RunFrame(Text current) {
-                RunFrame(current, false);
+        public static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput) {
+                RunFrame(frame, current, acceptKeyboardInput, false, 0, null);
+        }
+
+        public static void RunFrame(Frame frame, Text current) {
+                RunFrame(frame, current, false);
         }
 
@@ -368 +368 @@
          * @param pause
          */
-        public static void DebugFrame(Text current, float pause, Color color) {
+        public static void DebugFrame(Frame frame, Text current, float pause, Color color) {
                 if (isProgramRunning()) {
                         stop();
                 }
-                RunFrame(current, false, true, Math.round(pause * 1000), color);
+                RunFrame(frame, current, false, true, Math.round(pause * 1000), color);
         }
 
@@ -382 +382 @@
          *            the time to pause between
          */
-        public static void DebugFrame(Text current, float pause) {
-                DebugFrame(current, pause, null);
-        }
-
-        public static void DebugFrame(Text current) {
-                DebugFrame(current, -1.0F, null);
+        public static void DebugFrame(Frame frame, Text current, float pause) {
+                DebugFrame(frame, current, pause, null);
+        }
+
+        public static void DebugFrame(Frame frame, Text current) {
+                DebugFrame(frame, current, -1.0F, null);
         }