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

Timestamp:

06/06/08 12:42:25 (16 years ago)

Author:

ra33

Message:

Added getTreeStats

File:

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

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

@@ -239 +239 @@
                                         // if the throws exception annotation is on the frame then
                                         // it passes only if an exception is thrown
-                                        if (title.getParentOrCurrentFrame().hasAnnotation("ThrowsException")) {
+                                        if (title.getParentOrCurrentFrame().hasAnnotation(
+                                                        "ThrowsException")) {
                                                 errorMessage = "Expected exception " + title.toString();
                                                 passed = false;
@@ -245 +246 @@
                                 } catch (Exception e) {
                                         _programsRunning--;
-                                        if (!title.getParentOrCurrentFrame().hasAnnotation("ThrowsException")) {
+                                        if (!title.getParentOrCurrentFrame().hasAnnotation(
+                                                        "ThrowsException")) {
                                                 errorMessage = e.getMessage();
                                                 passed = false;
@@ -390 +392 @@
 
                 if (_step) {
-                        DisplayIO.setCurrentFrame(child);
+                        if (child != DisplayIO.getCurrentFrame()) {
+                                DisplayIO.setCurrentFrame(child);
+                        }
                         DisplayIO.addToBack(child);
                 }
@@ -437 +441 @@
                                         if (lastItemStatus != Status.TrueIf
                                                         && lastItemStatus != Status.FalseIf) {
+                                                if (_step) {
+                                                        DisplayIO.removeFromBack();
+                                                }
                                                 return lastItemStatus;
                                         }
@@ -456 +463 @@
 
                 if (_step) {
+                        DisplayIO.removeFromBack();
                         DisplayIO.setCurrentFrame(current.getParent());
-                        DisplayIO.removeFromBack();
                 }
 
@@ -525 +532 @@
                 ArrayList<String> tokens = new ArrayList<String>();
 
-                //At the moment annotation items are ignored by the interpreter
-//              // Check special annotation tags for programs
-//              if (statement.length() > 0 && statement.charAt(0) == '@') {
-//                      statement = statement.toLowerCase();
-//                      // Flags the next unit test as being required to throw an exception
-//                      if (statement.equals("@throwsexception")) {
-//                              code.getParentOrCurrentFrame().setThrowsException(true);
-//                      }
-//                      return null;
-//              }
+                // At the moment annotation items are ignored by the interpreter
+                // // Check special annotation tags for programs
+                // if (statement.length() > 0 && statement.charAt(0) == '@') {
+                // statement = statement.toLowerCase();
+                // // Flags the next unit test as being required to throw an exception
+                // if (statement.equals("@throwsexception")) {
+                // code.getParentOrCurrentFrame().setThrowsException(true);
+                // }
+                // return null;
+                // }
 
                 for (int i = 0; i < statement.length(); i++) {