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

Timestamp:

05/16/08 10:25:28 (16 years ago)

Author:

ra33

Message:

A whole day of big changes.
Adding the ability to have Text at the end of Lines.
Also a lot of refactoring to improve the quality of code relating to constraints and lines

File:

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

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

@@ -9 +9 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 import org.expeditee.agents.DisplayTree;
@@ -26 +27 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
+import org.expeditee.items.Item.SelectedMode;
 import org.expeditee.simple.BelowMinParametreCountException;
 import org.expeditee.simple.Context;
@@ -206 +208 @@
                         }
                 }
-
+                // The statement below assumes there are no other programs running at
+                // the same time
+                assert (_programsRunning == 0);
                 // Report the number of test passed and failed
                 FrameGraphics.DisplayMessage("Total tests: "
@@ -239 +243 @@
 
         private static void FlagError(Item item) {
-                // item.setColor(Color.CYAN);
                 FrameUtils.DisplayFrame(item.getParent().getFrameName(), true);
+                item.setSelectedMode(SelectedMode.Normal);
                 item.setSelectionColor(Color.CYAN);
                 FrameIO.SaveFrame(item.getParent());
@@ -349 +353 @@
                                                                 endOfToken + 1));
                                         } else {
-                                                throw new Exception("Expected matching \" "
-                                                                + code.toString());
+                                                throw new RuntimeException("Expected matching \" ");
                                         }
                                         break;
@@ -745 +748 @@
                                         throw new UnitTestFailedException("false", "true");
                                 return Status.OK;
+                        }
+                        if (tokens[0].equals("assertfail")) {
+                                assertExactParametreCount(tokens, 0);
+                                throw new UnitTestFailedException("pass", "fail");
                         } else if (tokens[0].equals("assertnull")) {
                                 assertExactParametreCount(tokens, 1);
@@ -1042 +1049 @@
 
                                 return Status.OK;
+                        } else if (tokens[0].equals("getrandominteger")) {
+                                assertExactParametreCount(tokens, 3);
+                                int lowerBound = (int) context.getPrimitives().getIntegerValue(
+                                                tokens[1]);
+                                int upperBound = (int) context.getPrimitives().getIntegerValue(
+                                                tokens[2]);
+                                Random random = new Random();
+                                long result = Math.abs(random.nextInt())
+                                                % (upperBound - lowerBound) + lowerBound;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SInteger(result));
+                                return Status.OK;
+                        } else if (tokens[0].equals("getrandomreal")) {
+                                assertExactParametreCount(tokens, 3);
+                                double lowerBound = context.getPrimitives().getDoubleValue(
+                                                tokens[1]);
+                                double upperBound = context.getPrimitives().getDoubleValue(
+                                                tokens[2]);
+                                Random random = new Random();
+                                double result = random.nextDouble() * (upperBound - lowerBound)
+                                                + lowerBound;
+                                context.getPrimitives().setValue(tokens[3], new SReal(result));
+                                return Status.OK;
+                        } else if (tokens[0].equals("getrandomtextitem")) {
+                                assertExactParametreCount(tokens, 2);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                                List<Text> items = ((Frame) context.getPointers().getVariable(
+                                                tokens[1]).getValue()).getBodyTextItems(false);
+                                Random random = new Random();
+                                int itemIndex = random.nextInt(items.size());
+                                context.getPointers()
+                                                .setObject(tokens[2], items.get(itemIndex));
+                                return Status.OK;
                         }
                 } else if (tokens[0].equals("or")) {
@@ -1136 +1177 @@
                         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);
+                        try {
+                                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);
+                                }
+                        } catch (Exception e) {
+                                throw new RuntimeException(e.getMessage());
                         }
                         return Status.OK;
@@ -1666 +1711 @@
                                         DisplayIO.setCurrentFrame(frame);
                                         pause(thisFramesPause);
-                                        
+
                                         long freeMemory = runtime.freeMemory();
-                                        if(freeMemory < DisplayTree.GARBAGE_COLLECTION_THRESHOLD){
+                                        if (freeMemory < DisplayTree.GARBAGE_COLLECTION_THRESHOLD) {
                                                 runtime.gc();
-                                                FrameGraphics.DisplayMessage("Force Garbage Collection!");
+                                                FrameGraphics
+                                                                .DisplayMessage("Force Garbage Collection!");
                                         }
                                 }
@@ -1693 +1739 @@
                         String fileName = context.getPrimitives().getStringValue(tokens[3]);
                         WriteTree wt = new WriteTree(format, fileName);
-                        if (wt.initialise(source)){
+                        if (wt.initialise(source)) {
                                 wt.setStartFrame(source);
                                 wt.run();