Changeset 121 for trunk/src/org/expeditee/gui/DisplayIO.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/gui/DisplayIO.java (modified) (8 diffs)

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -10 +10 @@
 import java.awt.geom.Point2D;
 import java.awt.image.MemoryImageSource;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
@@ -205 +206 @@
 
                 if (Frame.itemAttachedToCursor()) {
-                        List<Item> toMove = Frame.FreeItems;
+                        List<Item> toMove = FreeItems.getInstance();
                         for (Item move : toMove) {
                                 move.setPosition(move.getX() + deltax, move.getY() + deltay);
@@ -333 +334 @@
                 if (frame == null)
                         return;
-
+                
                 if (_TwinFrames) {
                         if (_CurrentFrames[0] == null) {
@@ -348 +349 @@
                 if (frame == getCurrentFrame()) {
                         FrameGraphics.Repaint();
-                        FrameGraphics.DisplayMessage(frame.getName()
+                        MessageBay.displayMessage(frame.getName()
                                         + " is already the current frame.");
                         return;
@@ -355 +356 @@
                 }
 
+                
+                // Invalidate free items
+                if (!FreeItems.getInstance().isEmpty() && getCurrentFrame() != null) {
+        
+                        // Empty free items temporarily so that the old frames buffer is repainted
+                        // without the free items.
+                        ArrayList<? extends Item> tmp = (ArrayList<? extends Item>)FreeItems.getInstance().clone();
+                        FreeItems.getInstance().clear(); // NOTE: This will invalidate all the cleared free items
+                        FrameGraphics.refresh(true);
+                        FreeItems.getInstance().addAll(tmp);
+                        
+                        
+                }
+                
+                
                 if (_TwinFrames) {
                         // if the same frame is being shown in both sides, load a fresh
@@ -379 +395 @@
                         _CurrentFrames[getCurrentSide()] = frame;
 
-                        // BROOK : TODO...
+                        // BROOK : TODO... overlays and loadable widgets
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
                                 i.onParentStateChanged(new ItemParentStateChangedEvent(
@@ -469 +485 @@
                 }
 
-                FrameGraphics.Repaint();
+                FrameGraphics.refresh(false);
         }
 
@@ -573 +589 @@
                 // there must be a frame to go back to
                 if (_VisitedFrames[side].size() < 1) {
-                        FrameGraphics
-                                        .DisplayMessageOnce("You are already on the home frame");
+                        MessageBay
+                                        .displayMessageOnce("You are already on the home frame");
                         return;
                 }
 
                 if (!FrameUtils.LeavingFrame(getCurrentFrame())) {
-                        FrameGraphics.DisplayMessage("Back operation cancelled");
+                        MessageBay.displayMessage("Back operation cancelled");
                         return;
                 }