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

Timestamp:

07/03/08 16:48:09 (16 years ago)

Author:

bjn8

Message:

Added invalidation for graphics... biiiig commit. LOts of effeciency improvements - now can animate

File:

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

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

@@ -27 +27 @@
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.FreeItems;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Dot;
@@ -144 +146 @@
                 newSimpleTest.getTitleItem().setActions(actions);
                 FrameUtils.DisplayFrame(newSimpleTest, true);
-                FrameGraphics.DisplayMessage("New test created");
+                MessageBay.displayMessage("New test created");
         }
 
@@ -206 +208 @@
 
                 FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), false);
-                FrameGraphics.DisplayMessage("Starting test suite: " + _frameset,
+                MessageBay.displayMessage("Starting test suite: " + _frameset,
                                 Color.CYAN);
 
@@ -257 +259 @@
                                 if (passed) {
                                         if (_verbose)
-                                                FrameGraphics.DisplayMessage("Test passed: "
+                                                MessageBay.displayMessage("Test passed: "
                                                                 + title.toString(), Item.GREEN);
                                         testsPassed++;
@@ -263 +265 @@
                                         testsFailed++;
                                         // Print out the reason for failed tests
-                                        FrameGraphics.LinkedErrorMessage(errorMessage);
+                                        MessageBay.linkedErrorMessage(errorMessage);
                                         if (Simple._stop) {
                                                 Simple._stop = false;
@@ -275 +277 @@
                 assert (_programsRunning == 0);
                 // Report the number of test passed and failed
-                FrameGraphics.DisplayMessage("Total tests: "
+                MessageBay.displayMessage("Total tests: "
                                 + (testsPassed + testsFailed), Color.CYAN);
                 if (testsPassed > 0)
-                        FrameGraphics.DisplayMessage("Passed: " + testsPassed, Item.GREEN);
+                        MessageBay.displayMessage("Passed: " + testsPassed, Item.GREEN);
                 if (testsFailed > 0)
-                        FrameGraphics.DisplayMessage("Failed: " + testsFailed, Color.RED);
+                        MessageBay.displayMessage("Failed: " + testsFailed, Color.RED);
                 // Remove items from the cursor...
-                Frame.FreeItems.clear();
+                FreeItems.getInstance().clear();
 
                 return testsFailed == 0;
@@ -1437 +1439 @@
                                         .getValue();
                         try {
-                                FrameGraphics.DisplayMessage(((Text) message).copy());
+                                MessageBay.displayMessage(((Text) message).copy());
                         } catch (NullPointerException e) {
-                                FrameGraphics.DisplayMessage("null");
+                                MessageBay.displayMessage("null");
                         } catch (ClassCastException e) {
                                 // Just ignore not text items!
-                                FrameGraphics.DisplayMessage(message.toString());
+                                MessageBay.displayMessage(message.toString());
                         } catch (Exception e) {
                                 // Just ignore other errors
@@ -1455 +1457 @@
 
                         if (tokens[0].equals("errorln") || tokens[0].equals("errorline"))
-                                FrameGraphics.ErrorMessage(message);
+                                MessageBay.errorMessage(message);
                         else
-                                FrameGraphics.DisplayMessageAlways(message);
+                                MessageBay.displayMessageAlways(message);
                 } else if (tokens[0].equals("typeatrate")) {
                         assertMinParametreCount(tokens, 1);
@@ -1488 +1490 @@
                         try {
                                 Process p = Runtime.getRuntime().exec(command);
-                                FrameGraphics.DisplayMessage(command, Color.darkGray);
+                                MessageBay.displayMessage(command, Color.darkGray);
 
                                 BufferedReader stdInput = new BufferedReader(
@@ -1496 +1498 @@
                                 String message = "";
                                 while ((message = stdInput.readLine()) != null) {
-                                        FrameGraphics.DisplayMessage(message);
+                                        MessageBay.displayMessage(message);
                                 }
                                 while ((message = stdError.readLine()) != null) {
-                                        FrameGraphics.ErrorMessage(message);
+                                        MessageBay.errorMessage(message);
                                 }
                         } catch (Exception e) {
@@ -1758 +1760 @@
                                 success = FrameIO.DeleteFrame(frame);
                                 if (!success && _verbose)
-                                        FrameGraphics.WarningMessage(errorMessage);
+                                        MessageBay.warningMessage(errorMessage);
                         } catch (Exception e) {
                                 // If an exception is thrown then success is false
                                 if (_verbose) {
-                                        FrameGraphics.WarningMessage(errorMessage
+                                        MessageBay.warningMessage(errorMessage
                                                         + (e.getMessage() != null ? ". " + e.getMessage()
                                                                         : ""));
@@ -1777 +1779 @@
                         boolean success = FrameIO.DeleteFrameset(framesetName);
                         if (!success && _verbose) {
-                                FrameGraphics.WarningMessage("Error deleting " + framesetName);
+                                MessageBay.warningMessage("Error deleting " + framesetName);
                         }
                         if (tokens.length > 2) {
@@ -1800 +1802 @@
                                         copiedFrameset);
                         if (!success && _verbose)
-                                FrameGraphics.WarningMessage("Error copying " + framesetToCopy);
+                                MessageBay.warningMessage("Error copying " + framesetToCopy);
                         if (tokens.length > 3) {
                                 context.getPrimitives().setValue(tokens[3],
@@ -1829 +1831 @@
                         boolean success = fileContents != null;
                         if (!success && _verbose)
-                                FrameGraphics.WarningMessage("Error copying "
+                                MessageBay.warningMessage("Error copying "
                                                 + frameToCopy.getName());
                         if (tokens.length > 4) {
@@ -2026 +2028 @@
                                         if (freeMemory < DisplayTree.GARBAGE_COLLECTION_THRESHOLD) {
                                                 runtime.gc();
-                                                FrameGraphics
-                                                                .DisplayMessage("Force Garbage Collection!");
+                                                MessageBay
+                                                                .displayMessage("Force Garbage Collection!");
                                         }
                                 }
@@ -2128 +2130 @@
                                 success = false;
                                 if (_verbose)
-                                        FrameGraphics.WarningMessage("Error parsing " + frameName);
+                                        MessageBay.warningMessage("Error parsing " + frameName);
                         }
                         // assertPrimitiveType(tokens[2], 2);
@@ -2299 +2301 @@
                         // DisplayIO.setCursorPosition(finalX, finalY);
                         FrameMouseActions.anchor(item);
-                        Frame.FreeItems.clear();
+                        FreeItems.getInstance().clear();
                         FrameGraphics.Repaint();
                         // FrameMouseActions.updateCursor();
@@ -2591 +2593 @@
                 _programsRunning++;
                 AgentStats.reset();
-                FrameGraphics.DisplayMessage("Running SimpleProgram...", Color.BLUE);
+                MessageBay.displayMessage("Running SimpleProgram...", Color.BLUE);
         }