Changeset 439

Timestamp:

02/10/12 11:30:49 (12 years ago)

Author:

davidb

Message:

Hooks to link Simple to the additional actions added:

getItemAtPosition and getItemContainingData

File:

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

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

@@ -15 +15 @@
 import java.util.Random;
 import java.util.regex.Pattern;
+
+import junit.framework.Assert;
+
+import org.expeditee.actions.Misc;
 
 import org.expeditee.agents.Agent;
@@ -321 +325 @@
                                 throw new RuntimeException(frameset + " failed");
                         }
+                        
                 }
 
         }
 
-        private static void RunFrame(Frame frame, Text current,
+        //Have changed parameters, so it takes an Item, not just a Text item.
+        private static void RunFrame(Frame frame, Item current,
                         boolean acceptKeyboardInput, boolean step, int pause, Color color) {
                 try {
@@ -370 +376 @@
                 RunFrame(frame, current, acceptKeyboardInput, false, 0, null);
         }
+        
+        /**
+         * Same as RunFrame method above, except that it takes in
+         * any Item, not just a Text item. -kgas1
+         * @param frame - frame to run
+         * @param current - item selected
+         * @param acceptKeyboardInput
+         */
+        public static void RunFrame(Frame frame, Item current,
+                        boolean acceptKeyboardInput){
+                RunFrame(frame, current, acceptKeyboardInput, false, 0, null);
+                
+        }
 
         public static void RunFrame(Frame frame, Text current) {
+                RunFrame(frame, current, false);
+        }
+        
+        /**
+         * Same as runframe method above, except it takes 
+         * any Item as a parameter; not just Text Items. -kgas1
+         * @param frame
+         * @param current
+         */
+        public static void RunFrame(Frame frame, Item current){
                 RunFrame(frame, current, false);
         }
@@ -658 +687 @@
                 // This makes the call and signature tokens counts match
                 String procedureTitle = procedure.getTitleItem().getFirstLine();
+                
                 if (!procedureTitle.toLowerCase().startsWith("call "))
                         procedureTitle = "call " + procedureTitle;
@@ -802 +832 @@
                         // Check if the user wants to display a message
                         // Check for set statements
-                } else if (tokens[0].startsWith("calculatestring")) {
+                } 
+                else if (tokens[0].startsWith("calculatestring")) {
                         assertMinParametreCount(tokens, 1);
                         String toCalculate = context.getPrimitives().getStringValue(
@@ -814 +845 @@
                                 Node equation = myParser.parse(toCalculate);
                                 String value = myParser.evaluate(equation, false);
+                                
                                 // Add a new variable if its an assignment statement
                                 String newVar = SReal.prefix + myParser.getNewVariable();
@@ -1141 +1173 @@
                                                         .stringValue());
                                 } else if (tokens[0].equals("setitemdata")) {
+                                        
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                                         // assertPrimitiveType(tokens[2], 2);
                                         Item item = (Item) context.getPointers().getVariable(
                                                         tokens[1]).getValue();
-                                        item.setData(context.getPrimitives().getVariable(tokens[2])
-                                                        .stringValue());
+                                        
+                                        item.setData(context.getPrimitives().getVariable(tokens[2]).stringValue());
+                                        //TODO: should there be a difference between setting and appending??
+                                        //item.addToData(context.getPrimitives().getVariable(tokens[2]).stringValue());
+                                        
                                 } else if (tokens[0].equals("setitemaction")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
@@ -1172 +1208 @@
                                         item.setColor((Color) Conversion.Convert(Color.class,
                                                         stringColor, item.getColor()));
+                                        
                                 } else if (tokens[0].equals("setitemtext")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
@@ -1180 +1217 @@
                                                         tokens[1]).getValue();
                                         textItem.setText(newText, true);
-                                } else
+                                } 
+                                else
                                         throw new Exception("Unsupported setItem command: "
                                                         + code.toString());
@@ -1289 +1327 @@
                         Navigation.Goto(frameName);
                 } else if (tokens[0].startsWith("get")) {
-                        if (tokens[0].startsWith("getframe")) {
+                                else if (tokens[0].startsWith("getframe")) {
                                 if (tokens[0].equals("getframevalue")) {
                                         assertMinParametreCount(tokens, 3);
@@ -1460 +1498 @@
                                 }
                         } else if (tokens[0].startsWith("getitem")) {
-                                if (tokens[0].equals("getitemposition")) {
+                                
+                                //used to return an item containing a particular piece of data.
+                        if(tokens[0].equals("getitemcontainingdata")) {
+                                
+                                assertVariableType(tokens[1],1,SPointer.itemPrefix);
+                
+                String data;
+                Item getItem;
+                String getFrameName;
+               
+                if(tokens.length == 3) {
+                    data = context.getPrimitives().getVariable(tokens[2]).stringValue();
+                   
+                    //no frame specified by user so use current frame.
+                    getFrameName = DisplayIO.getCurrentFrame().getName();
+                    getItem = Misc.getItemContainingData(data, FrameUtils.getFrame(getFrameName));
+                }
+                else if(tokens.length == 4) {
+                    
+                        getFrameName = context.getPrimitives().getStringValue(tokens[2]);
+                    data = context.getPrimitives().getVariable(tokens[3]).stringValue();
+                    getItem = Misc.getItemContainingData(data, FrameUtils.getFrame(getFrameName));
+                }
+                else {
+                    getItem = null;
+                }
+                
+                context.getPointers().setObject(tokens[1], getItem);
+               
+                // System.out.println(getItem.getText());
+                                
+                        }       //used to get an item at a specified position,
+                        //will lessen the amount of looping and if statements
+                        //I have to do when writing SIMPLE code - kgas1 23/01/2012 
+                        else if(tokens[0].equals("getitematposition")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
-                                        // assertPrimitiveType(tokens[2], 2);
-                                        // assertPrimitiveType(tokens[3], 3);
-                                        Point pos = ((Item) context.getPointers().getVariable(
-                                                        tokens[1]).getValue()).getPosition();
-                                        Integer x = pos.x;
-                                        Integer y = pos.y;
-                                        context.getPrimitives()
-                                                        .setValue(tokens[2], new SInteger(x));
-                                        context.getPrimitives()
-                                                        .setValue(tokens[3], new SInteger(y));
+                                        
+                                        Integer x;
+                                        Integer y;
+                                        Item getItem;
+                                        String getFrameName;
+        
+                                        //use 3 parameter version.
+                                        if(tokens.length == 4)
+                                        {
+                                                x = context.getPrimitives()
+                                                                .getVariable(tokens[2]).integerValue().intValue();
+                                                y = context.getPrimitives()
+                                                                .getVariable(tokens[3]).integerValue().intValue();
+                                                
+                                                //no frame specified by user so use current frame.
+                                                getFrameName = DisplayIO.getCurrentFrame().getName();
+                                                getItem = Misc.getItemAtPosition(x, y, FrameUtils.getFrame(getFrameName));
+                                        }
+                                        else if(tokens.length == 5)     //use 4 parameter version.
+                                        {
+                                                getFrameName = context.getPrimitives()
+                                                                .getStringValue(tokens[2]);
+                                                x = context.getPrimitives()
+                                                                .getVariable(tokens[3]).integerValue().intValue();
+                                                y = context.getPrimitives()
+                                                                .getVariable(tokens[4]).integerValue().intValue();
+                                                
+                                                getItem = Misc.getItemAtPosition(x, y, FrameUtils.getFrame(getFrameName));
+                                        }
+                                        else {
+                                                getItem = null;
+                                        }
+                                        
+                                        context.getPointers().setObject(tokens[1], getItem);
+                                }                               
+                                else if (tokens[0].equals("getitemposition")) {
+                                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+
+                                                Point pos = ((Item) context.getPointers().getVariable(
+                                                                tokens[1]).getValue()).getPosition();
+                                                Integer x = pos.x;
+                                                Integer y = pos.y;
+                                                context.getPrimitives()
+                                                                .setValue(tokens[2], new SInteger(x));
+                                                context.getPrimitives()
+                                                                .setValue(tokens[3], new SInteger(y));
+                                                                
+                                        
                                 } else if (tokens[0].equals("getitemthickness")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
@@ -1486 +1596 @@
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SInteger(width));
-                                } else if (tokens[0].equals("getitemsize")) {
+                                } else if(tokens[0].equals("getitemheight")) {
+                                        //added in by kgas1
+                                        
+                                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                                        
+                                        Integer height = ((Item) context.getPointers().getVariable(
+                                                        tokens[1]).getValue()).getHeight();
+                                        context.getPrimitives().setValue(tokens[2],
+                                                        new SInteger(height));
+                                }                               
+                                else if (tokens[0].equals("getitemsize")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                                         // assertPrimitiveType(tokens[2], 2);
@@ -1518 +1638 @@
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SString(action));
-                                } else if (tokens[0].equals("getitemfillcolor")) {
+                                } 
+                                else if (tokens[0].equals("getitemfillcolor")) {
                                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                                         // assertPrimitiveType(tokens[2], 2);
@@ -1543 +1664 @@
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SString(item.getText()));
+                                } else if(tokens[0].equals("getitemid")) {
+                                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                                        Item item = ((Item) context.getPointers().getVariable(
+                                                        tokens[1]).getValue());
+                                        context.getPrimitives().setValue(tokens[2], new SInteger(item.getID()));                                                        
+                                        
                                 } else
                                         throw new Exception("Unsupported getItem command: "
@@ -2716 +2843 @@
                         assertVariableType(tokens[1], 1, SPointer.filePrefix);
                         context.closeReadFile(tokens[1]);
-                } else if (tokens[0].startsWith("foreach")) {
+                } 
+
+                else if (tokens[0].startsWith("foreach")) {
                         if (tokens[0].equals("foreachassociation")) {
                                 assertExactParametreCount(tokens, 3);
@@ -2736 +2865 @@
                                                 break;
                                 }
-                        } else {
+                        } 
+                        else {
                                 Class itemType = Object.class;
                                 String type = tokens[0].substring("foreach".length());
@@ -2782 +2912 @@
                         int y = (int) context.getPrimitives().getIntegerValue(tokens[2]);
                         DisplayIO.setCursorPosition(x, y);
+                        
+                        
                 } else {
                         // Check the available actions