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

Timestamp:

07/25/08 09:24:45 (16 years ago)

Author:

ra33

Message:

Added calculate action

File:

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

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

@@ -24 +24 @@
 import org.expeditee.agents.WriteTree;
 import org.expeditee.gui.AttributeUtils;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -312 +313 @@
                         t.start();
                 } else {
-                        assert (testSuite.runSuite());
+                        if (!testSuite.runSuite()){
+                                throw new RuntimeException(frameset + " failed");
+                        }
                 }
 
@@ -826 +829 @@
                                                 .getVariable(tokens[1]).getValue();
                                 boolean bFound = false;
-                                for (Text itemToSearch : frameToSearch.getBodyTextItems(true,
-                                                true)) {
+                                for (Text itemToSearch : frameToSearch.getTextItems()) {
                                         bFound = context.searchItem(itemToSearch, context
                                                         .getPrimitives().getStringValue(tokens[2]),
@@ -862 +864 @@
                                                 tokens[2]);
                                 SearchAgent searchAgent = new SearchFrameset();
-                                searchAgent.initialise(frameset, resultsFrameset,
+                                searchAgent.initialise(null, null, frameset, resultsFrameset,
                                                 replacementString, pattern);
                                 _agent = searchAgent;
@@ -899 +901 @@
                                 SearchAgent searchAgent = new SearchTree();
                                 _agent = searchAgent;
-                                searchAgent.initialise(topFrameName, resultsFrameset,
+                                searchAgent.initialise(null, null, topFrameName, resultsFrameset,
                                                 replacementString, pattern);
                                 searchAgent.run();
@@ -962 +964 @@
                                 Item valueItem = null;
                                 // Begin the search
-                                for (Text text : targetFrame.getBodyTextItems(true)) {
+                                for (Text text : targetFrame.getTextItems()){
                                         String s = text.getText().toLowerCase();
 
@@ -978 +980 @@
                                                         .getParagraphEndPosition();
 
-                                        for (Text text : targetFrame.getBodyTextItems(true)) {
+                                        for (Text text : targetFrame.getTextItems()) {
                                                 Point startPoint = text.getPosition();
                                                 if (Math.abs(startPoint.y - endPoint.y) < 10
@@ -1196 +1198 @@
                                         Item valueItem = null;
                                         // Begin the search
-                                        for (Text text : targetFrame.getBodyTextItems(true)) {
+                                        for (Text text : targetFrame.getTextItems()) {
                                                 String s = text.getText().toLowerCase();
                                                 if (s.startsWith(targetAttribute)) {
@@ -1213 +1215 @@
                                                                 .getParagraphEndPosition();
 
-                                                for (Text text : targetFrame.getBodyTextItems(true)) {
+                                                for (Text text : targetFrame.getTextItems()) {
                                                         Point startPoint = text.getPosition();
                                                         if (Math.abs(startPoint.y - endPoint.y) < 10
@@ -1254 +1256 @@
                                         context.getPrimitives().setValue(frameNameVar,
                                                         frame.getName());
-                                } else if (tokens[0].startsWith("getframefilepath")) {
+                                } else if (tokens[0].startsWith("getframetitle")) {
+                                        String frameTitleVar = DEFAULT_ITEM;
+                                        String frameVar = DEFAULT_FRAME;
+
+                                        if (tokens.length > 1) {
+                                                assertExactParametreCount(tokens, 2);
+                                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                                                frameTitleVar = tokens[2];
+                                                frameVar = tokens[1];
+                                        }
+                                        Frame frame = (Frame) context.getPointers().getVariable(
+                                                        frameVar).getValue();
+                                        context.getPointers().setObject(frameTitleVar,
+                                                        frame.getTitleItem());
+                                }else if (tokens[0].startsWith("getframefilepath")) {
                                         assertExactParametreCount(tokens, 2);
                                         String frameName = context.getPrimitives().getStringValue(
@@ -1371 +1388 @@
                                         // assertPrimitiveType(tokens[2], 2);
                                         String link = ((Item) context.getPointers().getVariable(
-                                                        tokens[1]).getValue()).getLink();
+                                                        tokens[1]).getValue()).getAbsoluteLink();
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SString(link));
@@ -1645 +1662 @@
                         } else if (ifStatement.equals("ifdefined")) {
                                 result = context.isDefined(tokens[1]);
-                        } else if (ifStatement.equals("ifnotdef")) {
+                        } else if (ifStatement.equals("ifnotdefined")) {
                                 result = !context.isDefined(tokens[1]);
                         } else if (ifStatement.equals("ifzero")) {
@@ -1982 +1999 @@
                         } else
                                 context.readFrame(frameName, frameVar, null);
-                } else if (tokens[0].equals("readkbdcond")) {
+                }else if (tokens[0].equals("exitexpeditee")) {
+                        Browser._theBrowser.exit();
+                }else if (tokens[0].equals("readkbdcond")) {
 
                         String nextCharVarName = DEFAULT_CHAR;