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

Timestamp:

06/27/08 16:44:21 (16 years ago)

Author:

ra33

Message:

Heaps of changes!!!!
Added circles...
Better drawing of lines etc etc

File:

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

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

@@ -4 +4 @@
 import java.awt.Point;
 import java.awt.event.InputEvent;
+import java.awt.geom.Point2D;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -188 +189 @@
         private String _frameset;
 
-        private boolean _verbose;
+        private static boolean _verbose = false;
 
         public Simple(String frameset, boolean verbose) {
@@ -216 +217 @@
                         if (nextFrame == null)
                                 continue;
-                        Item frameTitle = nextFrame.getTitleItem();
+                        Text frameTitle = nextFrame.getTitleItem();
                         if (frameTitle == null)
                                 continue;
                         // Run the frames with the RunFrame action on the title
-                        Item title = frameTitle.copy();
+                        Text title = frameTitle.copy();
                         List<String> actions = title.getAction();
                         if (actions == null || title.isAnnotation())
@@ -235 +236 @@
                                         _KeyStrokes.clear();
                                         _programsRunning++;
-                                        RunFrameAndReportError(title, new Context());
+                                        Context context = new Context();
+                                        RunFrameAndReportError(title, context);
                                         _programsRunning--;
                                         // if the throws exception annotation is on the frame then
@@ -306 +308 @@
         }
 
-        private static void RunFrame(Item current, boolean acceptKeyboardInput,
+        private static void RunFrame(Text current, boolean acceptKeyboardInput,
                         boolean step, int pause, Color color) {
                 try {
@@ -321 +323 @@
                         // an item without a link signals to run the current frame
                         if (current.getLink() == null) {
+                                //Make a copy but hide it
                                 current = current.copy();
                                 current.setLink(DisplayIO.getCurrentFrame().getName());
@@ -334 +337 @@
         }
 
-        public static void RunFrame(Item current, boolean acceptKeyboardInput) {
+        public static void RunFrame(Text current, boolean acceptKeyboardInput) {
                 RunFrame(current, acceptKeyboardInput, false, 0, null);
         }
 
-        public static void RunFrame(Item current) {
+        public static void RunFrame(Text current) {
                 RunFrame(current, false);
         }
@@ -348 +351 @@
          * @param pause
          */
-        public static void DebugFrame(Item current, float pause, Color color) {
+        public static void DebugFrame(Text current, float pause, Color color) {
+                if(isProgramRunning()){
+                        stop();
+                }
                 RunFrame(current, false, true, Math.round(pause * 1000), color);
         }
@@ -359 +365 @@
          *            the time to pause between
          */
-        public static void DebugFrame(Item current, float pause) {
+        public static void DebugFrame(Text current, float pause) {
                 DebugFrame(current, pause, null);
         }
 
-        public static void DebugFrame(Item current) {
+        public static void DebugFrame(Text current) {
                 DebugFrame(current, -1.0F, null);
         }
@@ -391 +397 @@
                 Frame child = FrameIO.LoadFrame(current.getAbsoluteLink());
 
+                // Create frame variables for each linked annotation item on the frame
+                // which has a single word of text corresponding to the variable name
+                for (Text text : child.getAnnotationItems()) {
+                        String link = text.getAbsoluteLink();
+                        if (link == null)
+                                continue;
+                        Frame frame = FrameIO.LoadFrame(link);
+                        if (frame == null)
+                                continue;
+                        // Now save the frame as a variable
+                        String varName = text.getText().substring(1).trim();
+                        if (varName.indexOf(' ') > 0)
+                                continue;
+                        context.getPointers().setObject(SPointer.framePrefix + varName,
+                                        frame);
+                        context.getPrimitives().add(SString.prefix + varName,
+                                        new SString(frame.getName()));
+                }
+
                 if (_step) {
                         if (child != DisplayIO.getCurrentFrame()) {
@@ -419 +444 @@
                                 Color oldColor = item.getBackgroundColor();
                                 if (_step) {
-                                        if (item.getLink() != null) {
-                                                pause(item);
-                                                item.setSelectedMode(Item.SelectedMode.Normal,
-                                                                _stepColor);
-                                        } else {
-                                                item.setBackgroundColor(_stepColor);
-                                        }
-                                        FrameGraphics.Repaint();
+                                        pause(item);
                                 }
                                 lastItemStatus = RunItem(item, context, lastItemStatus);
@@ -432 +450 @@
                                         if (item.getLink() == null) {
                                                 item.setBackgroundColor(oldColor);
-                                                pause(item);
                                         } else {
                                                 item.setSelectedMode(Item.SelectedMode.None);
@@ -464 +481 @@
                 if (_step) {
                         DisplayIO.removeFromBack();
-                        DisplayIO.setCurrentFrame(current.getParent());
+                        if(DisplayIO.getCurrentFrame() != current.getParent())
+                                DisplayIO.setCurrentFrame(current.getParent());
                 }
 
@@ -776 +794 @@
                                 assertExactParametreCount(tokens, 3);
 
-                                Map map = (Map) context.getPointers().getVariable(tokens[1])
+                                Map<String,String> map = (Map<String,String>) context.getPointers().getVariable(tokens[1])
                                                 .getValue();
                                 String attribute = context.getPrimitives().getStringValue(
@@ -812 +830 @@
                                 // attribute without the value in the same item
                                 if (!found && attributeItem != null) {
-                                        Point endPoint = attributeItem.getEndParagraphPosition();
+                                        Point2D.Float endPoint = attributeItem
+                                                        .getEndParagraphPosition();
 
                                         for (Text text : targetFrame.getBodyTextItems(true)) {
@@ -1050 +1069 @@
                                         // attribute without the value in the same item
                                         if (!found && attributeItem != null) {
-                                                Point endPoint = attributeItem
+                                                Point2D.Float endPoint = attributeItem
                                                                 .getEndParagraphPosition();
 
@@ -1112 +1131 @@
                                                         .getValue();
                                         t.setText(log);
+                                } else if (tokens[0].equals("getframeitemcount")) {
+                                        String frameVar = DEFAULT_FRAME;
+                                        String countVar = DEFAULT_INTEGER;
+                                        if (tokens.length > 1) {
+                                                assertExactParametreCount(tokens, 2);
+                                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                                frameVar = tokens[1];
+                                                countVar = tokens[2];
+                                        }
+                                        Frame frame = (Frame) context.getPointers().getVariable(
+                                                        frameVar).getValue();
+                                        Integer count = frame.getItems(true).size();
+                                        context.getPrimitives().setValue(countVar,
+                                                        new SInteger(count));
                                 }
                         } else if (tokens[0].equals("getassociation")) {
@@ -1189 +1222 @@
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                                         // assertPrimitiveType(tokens[2], 2);
-                                        Integer size = ((Item) context.getPointers().getVariable(
-                                                        tokens[1]).getValue()).getSize();
+                                        Integer size = (int) ((Item) context.getPointers()
+                                                        .getVariable(tokens[1]).getValue()).getSize();
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SInteger(size));
@@ -1402 +1435 @@
                         String codeText = getMessage(tokens, context, code.toString(), " ",
                                         1);
-                        Text dynamicCode = new Text(1, codeText);
+                        Text dynamicCode = new Text(codeText);
                         RunItem(dynamicCode, context, Status.OK);
                 } else if (tokens[0].equals("runoscommand")) {
@@ -1682 +1715 @@
                         try {
                                 success = FrameIO.DeleteFrame(frame);
-                                if (!success)
+                                if (!success && _verbose)
                                         FrameGraphics.WarningMessage(errorMessage);
                         } catch (Exception e) {
                                 // If an exception is thrown then success is false
-                                FrameGraphics
-                                                .WarningMessage(errorMessage
-                                                                + (e.getMessage() != null ? ". "
-                                                                                + e.getMessage() : ""));
+                                if (_verbose) {
+                                        FrameGraphics.WarningMessage(errorMessage
+                                                        + (e.getMessage() != null ? ". " + e.getMessage()
+                                                                        : ""));
+                                }
                         }
                         if (tokens.length > 2) {
@@ -1700 +1734 @@
                                         tokens[1]);
                         boolean success = FrameIO.DeleteFrameset(framesetName);
-                        if (!success)
+                        if (!success && _verbose) {
                                 FrameGraphics.WarningMessage("Error deleting " + framesetName);
+                        }
                         if (tokens.length > 2) {
                                 context.getPrimitives().setValue(tokens[2],
@@ -1722 +1757 @@
                         boolean success = FrameIO.CopyFrameset(framesetToCopy,
                                         copiedFrameset);
-                        if (!success)
+                        if (!success && _verbose)
                                 FrameGraphics.WarningMessage("Error copying " + framesetToCopy);
                         if (tokens.length > 3) {
@@ -1746 +1781 @@
                         context.getPointers().setObject(tokens[2], freshCopy);
                         String fileContents = FrameIO.ForceSaveFrame(freshCopy);
+                        FrameIO.ResumeCache();
+                        // Need to add the new copy to the cache in case it is edited by
+                        // other simple statements
+                        FrameIO.addToCache(freshCopy);
                         boolean success = fileContents != null;
-                        if (!success)
+                        if (!success && _verbose)
                                 FrameGraphics.WarningMessage("Error copying "
                                                 + frameToCopy.getName());
-                        FrameIO.ResumeCache();
                         if (tokens.length > 4) {
                                 context.getPrimitives().setValue(tokens[4],
@@ -2014 +2052 @@
                                 count = countCharsInString(((Text) item).getText(), pattern);
                         context.getPrimitives().setValue(tokens[3], new SInteger(count));
+                } else if (tokens[0].equals("clearframe")) {
+                        String frameVar = DEFAULT_FRAME;
+                        if (tokens.length > 1) {
+                                assertMinParametreCount(tokens, 1);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                frameVar = tokens[1];
+                        }
+                        boolean success = true;
+                        try {
+                                Frame frameToClear = (Frame) context.getPointers().getVariable(
+                                                frameVar).getValue();
+                                frameToClear.clear(false);
+                                assert (frameToClear.getItems().size() <= 1);
+                        } catch (Exception e) {
+                                success = false;
+                        }
+                        if (tokens.length > 2) {
+                                assertExactParametreCount(tokens, 2);
+                                context.getPrimitives().setValue(tokens[2],
+                                                new SBoolean(success));
+                        }
                 } else if (tokens[0].equals("parseframename")) {
                         assertExactParametreCount(tokens, 4);
@@ -2026 +2085 @@
                         } catch (Exception e) {
                                 success = false;
-                                FrameGraphics.WarningMessage("Error parsing " + frameName);
+                                if (_verbose)
+                                        FrameGraphics.WarningMessage("Error parsing " + frameName);
                         }
                         // assertPrimitiveType(tokens[2], 2);
@@ -2491 +2551 @@
                 FrameGraphics.DisplayMessage("Running SimpleProgram...", Color.BLUE);
         }
+
+        public static boolean isVerbose() {
+                return _verbose;
+        }
 }