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

Timestamp:

05/21/08 09:40:52 (16 years ago)

Author:

ra33

Message:

Made LOTS of changes...
Added DisplayComet
A whole bunch more stats for items and events
Changed lots of stuff for drawing better especially using text as line endpoints

File:

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

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

@@ -218 +218 @@
                 if (testsFailed > 0)
                         FrameGraphics.DisplayMessage("Failed: " + testsFailed, Color.RED);
-                //Remove items from the cursor...
+                // Remove items from the cursor...
                 Frame.FreeItems.clear();
         }
@@ -570 +570 @@
                                 }
                         } else if (tokens[0].equals("setframevalue")) {
-                                assertMinParametreCount(tokens, 4);
+                                assertMinParametreCount(tokens, 3);
                                 assertVariableType(tokens[1], 1, SPointer.framePrefix);
 
@@ -613 +613 @@
 
                                 // Set the values of the output parametres
-                                context.getPrimitives()
-                                                .setValue(tokens[4], new SBoolean(found));
-                                if (tokens.length > 5) {
-                                        context.getPointers().setObject(tokens[5], attributeItem);
-                                        if (tokens.length > 6) {
-                                                context.getPointers().setObject(tokens[6], valueItem);
+                                if (tokens.length > 4) {
+                                        context.getPrimitives().setValue(tokens[4],
+                                                        new SBoolean(found));
+                                        if (tokens.length > 5) {
+                                                context.getPointers().setObject(tokens[5],
+                                                                attributeItem);
+                                                if (tokens.length > 6) {
+                                                        context.getPointers().setObject(tokens[6],
+                                                                        valueItem);
+                                                }
                                         }
                                 }
@@ -806 +810 @@
                         if (tokens[0].startsWith("getframe")) {
                                 if (tokens[0].equals("getframevalue")) {
-                                        assertMinParametreCount(tokens, 4);
+                                        assertMinParametreCount(tokens, 3);
                                         assertVariableType(tokens[1], 1, SPointer.framePrefix);
 
@@ -852 +856 @@
                                         context.getPrimitives().setValue(tokens[3],
                                                         new SString(value));
-                                        context.getPrimitives().setValue(tokens[4],
-                                                        new SBoolean(found));
-                                        if (tokens.length > 5) {
-                                                context.getPointers().setObject(tokens[5],
-                                                                attributeItem);
-                                                if (tokens.length > 6) {
-                                                        context.getPointers().setObject(tokens[6],
-                                                                        valueItem);
+                                        if (tokens.length > 4) {
+                                                context.getPrimitives().setValue(tokens[4],
+                                                                new SBoolean(found));
+                                                if (tokens.length > 5) {
+                                                        context.getPointers().setObject(tokens[5],
+                                                                        attributeItem);
+                                                        if (tokens.length > 6) {
+                                                                context.getPointers().setObject(tokens[6],
+                                                                                valueItem);
+                                                        }
                                                 }
                                         }