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

Timestamp:

01/07/09 19:46:05 (15 years ago)

Author:

ra33

Message:

Fixed problems with ghost items being created when ranging

File:

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

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

@@ -255 +255 @@
                                         // if the throws exception annotation is on the frame then
                                         // it passes only if an exception is thrown
-                                        if (title.getParentOrCurrentFrame().hasAnnotation(
-                                                        "ThrowsException")) {
+                                        assert (title.getParent() != null);
+                                        if (title.getParent().hasAnnotation("ThrowsException")) {
                                                 errorMessage = "Expected exception " + title.toString();
                                                 passed = false;
@@ -499 +499 @@
                         } catch (ArrayIndexOutOfBoundsException e) {
                                 FlagError(item);
-                                throw new IncorrectUseOfStatementException("Too few parametres: " + item.toString(), item.getStatement());
+                                throw new IncorrectUseOfStatementException(
+                                                "Too few parametres: " + item.toString(), item
+                                                                .getStatement());
                         } catch (NullPointerException e) {
                                 FlagError(item);
@@ -506 +508 @@
                         } catch (RuntimeException e) {
                                 FlagError(item);
-                                throw new IncorrectUseOfStatementException(e.getMessage() + " " + item.toString(), item.getStatement());
+                                throw new IncorrectUseOfStatementException(e.getMessage() + " "
+                                                + item.toString(), item.getStatement());
                         } catch (Exception e) {
                                 throw new Exception(e.getMessage());
@@ -1700 +1703 @@
                                         1);
                         Runtime.getRuntime().exec(command);
-                } else if (tokens[0].equals("executeoscommand") || tokens[0].equals("runoscommandwithoutput")) {
+                } else if (tokens[0].equals("executeoscommand")
+                                || tokens[0].equals("runoscommandwithoutput")) {
                         String command = getMessage(tokens, context, code.toString(), " ",
                                         1);
                         try {
                                 Process p = Runtime.getRuntime().exec(command);
-                                //Process p = Runtime.getRuntime().exec(new String[]{"date", ">", "test.date"});
+                                // Process p = Runtime.getRuntime().exec(new String[]{"date",
+                                // ">", "test.date"});
                                 MessageBay.displayMessage(command, Color.darkGray);