Changeset 30

Timestamp:

05/14/08 09:42:01 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (5 diffs)

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

@@ -150 +150 @@
          * 
          * @return The interactive widgets that are currently ancored in this frame.
-         * Hence it exlcudes free-widgets.
+         * Hence it exlcudes free-widgets. Returns a copy
          */
         public List<InteractiveWidget> getInteractiveWidgets() {
-                return Collections.unmodifiableList(this._iWidgets);
-                // return       this._iWidgets; // faster 
+                LinkedList<InteractiveWidget> clone = new LinkedList<InteractiveWidget>();
+                clone.addAll(this._iWidgets);
+                return clone;
         }
 
@@ -211 +212 @@
                 
                 return visibleItems;
+        }
+        
+        /**
+         * @param i Item to check if contained in this frame
+         * @return True if this frame contains i.
+         */
+        public boolean containsItem(Item i) {
+                if (i == null) throw new NullPointerException("i"); 
+                return _body.contains(i);
         }
 
@@ -607 +617 @@
                         }
                         
-                        item.onAddedToFrame();
+                        item.onAddedToFrame(false, 0);
 
                         change();
@@ -640 +650 @@
                         change();
                 
-                //Remove widgets from the widget list
+                // Remove widgets from the widget list
                 if (item != null) {
                         item.onRemovedFromFrame();
@@ -921 +931 @@
          * @param overlay
          *            The Frame to add
+         *            
+         * @throws NullPointerException
+         *            If overlay is null.
          */
         public void addOverlay(Overlay overlay) {
-                if (_overlays == null || overlay == null)
-                        _overlays = new ArrayList<Overlay>();
-
+                if (overlay == null) throw new NullPointerException("overlay");
+                if (_overlays.contains(overlay)) return;
+                
                 _overlays.add(overlay);
-        }
-
-        /**
-         * Removes the given Frame from the list of overlay Frames being drawn with
+                
+                // Items must be notified that they have been added to this frame via the overlay...
+                List<Item> items = new LinkedList<Item>();
+                FrameGraphics.AddAllOverlayItems(items, overlay.Frame, new LinkedList<Frame>());
+                for (Item i : items) {
+                        i.onAddedToFrame(true, overlay.Level);
+                }
+        }
+
+        /**
+         * Removes the given overlay from the list of overlays being drawn with this Frame.
+         * 
+         * @param overlay
+         *            The overlay to remove
+         *            
+         * @throws NullPointerException
+         *            If overlay is null.
+         */
+        public void removeOverlay(Overlay overlay) {
+                if (overlay == null) throw new NullPointerException("overlay");
+        
+                this._overlays.remove(overlay);
+                
+                // Items must be notified that they have been removed from this frame via the overlay...
+                List<Item> items = new LinkedList<Item>();
+                FrameGraphics.AddAllOverlayItems(items, overlay.Frame, new LinkedList<Frame>());
+                for (Item i : items) {
+                        i.onRemovedFromFrame();
+                }
+        }
+        
+        /**
+         * Removes the given Frame from the list of overlayed Frames being drawn with
          * this Frame.
          * 
-         * @param overlay
+         * @param overlayedFrame
          *            The Frame to remove
-         */
-        public void removeOverlay(Frame overlay) {
-                _overlays.remove(overlay);
-                FrameGraphics.Repaint();
+         *            
+         * @throws NullPointerException
+         *            If overlayedFrame is null.
+         */
+        public void removeOverlay(Frame overlayedFrame) {
+                if (overlayedFrame == null) throw new NullPointerException("overlay");
+                
+                // Locate the oveylay(s) that match this
+                List<Overlay> overlaysToRemove = new LinkedList<Overlay>();
+                for (Overlay o : _overlays) {
+                        if (overlayedFrame.equals(o.Frame)) overlaysToRemove.add(o);
+                }
+                for (Overlay o : overlaysToRemove) { // must be enumerated seperate to above...
+                        removeOverlay(o);
+                }
+                
         }
 
         public List<Overlay> getOverlays() {
-                return _overlays;
+                List<Overlay> l = new LinkedList<Overlay>();
+                l.addAll(_overlays);
+                return l;
+        }
+        
+        /**
+         * @return All overlays seen by this frame (including its overlays' overlays).
+         */
+        public List<Overlay> getOverlaysDeep() {
+                List<Overlay> l = new LinkedList<Overlay>();
+                getOverlaysDeep(l, this, new LinkedList<Frame>());
+                return l;
+        }
+        
+        private boolean getOverlaysDeep(List<Overlay> overlays, Frame overlay, List<Frame> seenOverlays) {
+
+                        if (seenOverlays.contains(overlay))
+                                return false;
+
+                        seenOverlays.add(overlay);
+
+                        for (Overlay o : overlay.getOverlays()) {
+                                if (getOverlaysDeep(overlays, o.Frame, seenOverlays)) {
+                                        overlays.add(o);
+                                }
+                        }
+                        
+                        return true;
+        }
+        
+        /**
+         * Gets the overlay on this frame which owns the given item.
+         * @param item The item - must not be null.
+         * @return The overlay that contains the itm. Null if no overlay owns the item.
+         */
+        public Overlay getOverlayOwner(Item item) {
+                if (item == null) throw new NullPointerException("item");
+                List<Overlay> overlays = getOverlaysDeep();
+                for (Overlay l : overlays) {
+                        //if (l.Frame.containsItem(item)) return l;
+                        if (item.getParent() == l.Frame) return l;
+                }
+                
+                return null;
         }
 
         public void clearOverlays() {
-                _overlays.clear();
+                while (!_overlays.isEmpty()) {
+                        removeOverlay(_overlays.get(0)); // centralise removing
+                }
         }
 
         public void addAllOverlays(List<Overlay> overlays) {
-                _overlays.addAll(overlays);
+                for (Overlay o : overlays) {
+                        addOverlay(o); // centralise adding
+                }
         }