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

Timestamp:

05/08/08 14:30:09 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -38 +38 @@
 import org.expeditee.simple.UnitTestFailedException;
 import org.expeditee.stats.AgentStats;
+import org.expeditee.stats.SessionStats;
 
 public class Simple {
@@ -236 +237 @@
                 // item.setColor(Color.CYAN);
                 FrameUtils.DisplayFrame(item.getParent().getFrameName(), true);
-                item.showHighlight(true, Color.CYAN);
+                item.setSelectionColor(Color.CYAN);
                 FrameIO.SaveFrame(item.getParent());
         }
@@ -312 +313 @@
                 Frame frame = i.getParent();
 
-                if (i == frame.getTitle() || i == frame.getFrameNameItem() || i.isAnnotation()) {
+                if (i == frame.getTitle() || i == frame.getFrameNameItem()
+                                || i.isAnnotation()) {
                         return false;
                 }
@@ -576 +578 @@
                                 for (Text text : targetFrame.getBodyTextItems(true)) {
                                         String s = text.getTextNoList().toLowerCase();
-                                        
+
                                         if (s.startsWith(targetAttribute)) {
                                                 attributeItem = text;
@@ -847 +849 @@
                                                 }
                                         }
-
                                         return Status.OK;
                                 } else if (tokens[0].startsWith("getframename")) {
@@ -872 +873 @@
                                                         frameName);
                                         context.getPrimitives().setValue(tokens[2], filePath);
+                                        return Status.OK;
+                                } else if (tokens[0].equals("getframelog")) {
+                                        assertExactParametreCount(tokens, 1);
+                                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+
+                                        String log = SessionStats.getFrameEventList();
+                                        Text t;
+                                        try {
+                                                t = (Text) context.getPointers().getVariable(tokens[1])
+                                                                .getValue();
+                                                t.setText(log);
+                                        } catch (Exception e) {
+                                                t = new Text(-1, log);
+                                                context.getPointers().setObject(tokens[1], t);
+                                        }
+
                                         return Status.OK;
                                 }
@@ -1005 +1022 @@
                                                 FrameIO.getFramesetList());
                                 return Status.OK;
+                        } else if (tokens[0].equals("getsessionstats")) {
+                                assertExactParametreCount(tokens, 1);
+                                assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+
+                                String stats = SessionStats.getCurrentStats();
+                                Text t;
+                                try {
+                                        t = (Text) context.getPointers().getVariable(tokens[1])
+                                                        .getValue();
+                                        t.setText(stats);
+                                } catch (Exception e) {
+                                        t = new Text(-1, stats);
+                                        context.getPointers().setObject(tokens[1], t);
+                                }
+
+                                return Status.OK;
                         }
                 } else if (tokens[0].equals("or")) {
@@ -1060 +1093 @@
                                 || tokens[0].equals("errorln") || tokens[0].equals("errorline")) {
                         String message = getMessage(tokens, context, code.toString(),
-                                        tokens[0].endsWith("nospaces") ? "" : " ");
+                                        tokens[0].endsWith("nospaces") ? "" : " ", 1);
 
                         if (tokens[0].equals("errorln") || tokens[0].equals("errorline"))
@@ -1067 +1100 @@
                                 FrameGraphics.DisplayMessageAlways(message);
                         return Status.OK;
-                } else if (tokens[0].equals("typein")
-                                || tokens[0].equals("typeinnospaces")) {
+                } else if (tokens[0].equals("typeatrate")) {
+                        assertMinParametreCount(tokens, 1);
+                        double delay = context.getPrimitives().getDoubleValue(tokens[1]);
+                        String s = getMessage(tokens, context, code.toString(), " ", 2);
+                        for (int i = 0; i < s.length(); i++) {
+                                FrameKeyboardActions.processChar(s.charAt(i));
+                                Thread.sleep((int) (delay * 1000));
+                        }
+                        return Status.OK;
+                } else if (tokens[0].equals("type") || tokens[0].equals("typenospaces")) {
 
                         String s = getMessage(tokens, context, code.toString(), tokens[0]
-                                        .equals("typein") ? " " : "");
+                                        .equals("type") ? " " : "", 1);
                         for (int i = 0; i < s.length(); i++) {
                                 FrameKeyboardActions.processChar(s.charAt(i));
                                 Thread.sleep(25);
                         }
+                        return Status.OK;
+                } else if (tokens[0].equals("runstring")) {
+                        String codeText = getMessage(tokens, context, code.toString(), " ",
+                                        1);
+                        Text dynamicCode = new Text(1, codeText);
+                        RunItem(dynamicCode, context, Status.OK);
                         return Status.OK;
                 } else if (tokens[0].startsWith("else")) {
@@ -1345 +1392 @@
                 } else if (tokens[0].equals("copyitem")) {
                         assertMinParametreCount(tokens, 2);
-                        assertVariableType(tokens[1],1,SPointer.itemPrefix);
-                        assertVariableType(tokens[2],2,SPointer.itemPrefix);
-                        Item item = (Item)context.getPointers().getVariable(tokens[1]).getValue();
+                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                        assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                        Item item = (Item) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
                         Item copy = item.copy();
                         context.getPointers().setObject(tokens[2], copy);
 
                         return Status.OK;
-                }else if (tokens[0].equals("copyframeset")) {
+                } else if (tokens[0].equals("copyframeset")) {
                         assertMinParametreCount(tokens, 2);
                         String framesetToCopy = context.getPrimitives().getStringValue(
@@ -1369 +1417 @@
                 } else if (tokens[0].equals("copyframe")) {
                         assertMinParametreCount(tokens, 2);
-                        assertVariableType(tokens[1],1,SPointer.framePrefix);
-                        assertVariableType(tokens[2],2,SPointer.framePrefix);
+                        assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                        assertVariableType(tokens[2], 2, SPointer.framePrefix);
                         Frame frameToCopy = (Frame) context.getPointers().getVariable(
                                         tokens[1]).getValue();
@@ -2063 +2111 @@
 
         private static String getMessage(String[] tokens, Context context,
-                        String code, String separator) throws Exception {
+                        String code, String separator, int firstStringIndex)
+                        throws Exception {
                 StringBuilder message = new StringBuilder();
-                if (tokens.length == 1) {
+                if (tokens.length == firstStringIndex) {
                         message.append(context.getPrimitives().getVariable(DEFAULT_STRING)
                                         .stringValue());
                 } else {
-                        for (int i = 1; i < tokens.length; i++) {
+                        for (int i = firstStringIndex; i < tokens.length; i++) {
                                 if (Primitives.isPrimitive(tokens[i])) {
                                         message.append(context.getPrimitives().getVariable(