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

Timestamp:

05/09/08 09:31:42 (16 years ago)

Author:

ra33

Message:

 

File:

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

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

@@ -4 +4 @@
 import java.awt.Point;
 import java.awt.event.InputEvent;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.expeditee.agents.WriteTree;
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.DisplayIO;
@@ -880 +883 @@
                                         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);
-                                        }
+                                        // 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;
@@ -1028 +1031 @@
                                 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);
-                                }
+                                // 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;
@@ -1123 +1126 @@
                         Text dynamicCode = new Text(1, codeText);
                         RunItem(dynamicCode, context, Status.OK);
+                        return Status.OK;
+                } else if (tokens[0].equals("runoscommand")) {
+                        String command = getMessage(tokens, context, code.toString(), " ",
+                                        1);
+                        Runtime.getRuntime().exec(command);
+                        return Status.OK;
+                } else if (tokens[0].equals("executeoscommand")) {
+                        String command = getMessage(tokens, context, code.toString(), " ",
+                                        1);
+                        Process p = Runtime.getRuntime().exec(command);
+                        FrameGraphics.DisplayMessage(command, Color.darkGray);
+                        
+                        BufferedReader stdInput = new BufferedReader(new InputStreamReader(
+                                        p.getInputStream()));
+                        BufferedReader stdError = new BufferedReader(new InputStreamReader(
+                                        p.getErrorStream()));
+                        String message = "";
+                        while ((message = stdInput.readLine()) != null) {
+                                FrameGraphics.DisplayMessage(message);
+                        }
+                        while ((message = stdError.readLine()) != null) {
+                                FrameGraphics.ErrorMessage(message);
+                        }
                         return Status.OK;
                 } else if (tokens[0].startsWith("else")) {
@@ -1279 +1305 @@
                         Item item = (Item) context.getPointers().getVariable(itemVar)
                                         .getValue();
+                        item
+                                        .setPosition(FrameMouseActions.MouseX,
+                                                        FrameMouseActions.MouseY);
                         FrameMouseActions.pickup(item);
                         return Status.OK;
@@ -1291 +1320 @@
                         Frame frame = DisplayIO.getCurrentFrame();
                         Text item = frame.createNewText(s);
+                        item
+                                        .setPosition(FrameMouseActions.MouseX,
+                                                        FrameMouseActions.MouseY);
                         FrameMouseActions.pickup(item);
                         // DisplayIO.repaint();
@@ -1333 +1365 @@
                         frame.addItem(new Line(dot1, dot2, frame.getNextItemID()));
                         return Status.OK;
-                } else if (tokens[0].equals("createitem")) {
+                } else if (tokens[0].equals("createitem")
+                                || tokens[0].equals("createtext")) {
                         assertMinParametreCount(tokens, 4);
                         assertVariableType(tokens[1], 1, SPointer.framePrefix);
@@ -1352 +1385 @@
                                 }
                                 newItem = frame.addText(x, y, newText, newAction);
-                        } else
-                                // create a point if the optional params are not provided
-                                newItem = frame.addDot(x, y);
+                        } else {
+                                if (tokens[0].equals("createtext")) {
+                                        newItem = frame.createNewText();
+                                        newItem.setPosition(x, y);
+                                } else {
+                                        // create a point if the optional params are not provided
+                                        newItem = frame.addDot(x, y);
+                                }
+                        }
                         context.getPointers().setObject(tokens[4], newItem);
 
@@ -1639 +1678 @@
                         }
                         context.createFrameset(framesetName, successVar);
+                        return Status.OK;
+                } else if (tokens[0].equals("writetree")) {
+                        assertMinParametreCount(tokens, 3);
+                        assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                        Frame source = (Frame) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
+                        String format = context.getPrimitives().getStringValue(tokens[2]);
+                        String fileName = context.getPrimitives().getStringValue(tokens[3]);
+                        WriteTree wt = new WriteTree(format, fileName);
+                        if (wt.initialise(source)){
+                                wt.setStartFrame(source);
+                                wt.run();
+                        }
                         return Status.OK;
                 } else if (tokens[0].equals("concatstr")) {