Changeset 10 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

05/01/08 17:02:40 (16 years ago)

Author:

ra33

Message:

Added Interactive Widget Items

File:

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

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

@@ -8 +8 @@
 import java.awt.image.VolatileImage;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedList;
@@ -16 +17 @@
 import org.expeditee.io.Logger;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetCorner;
 
 /**
@@ -86 +89 @@
 
         public static List<Item> FreeItems = new ArrayList<Item>();
+        
+        // for drawing purposes
+        private List<InteractiveWidget> _iWidgets = new ArrayList<InteractiveWidget>();
 
         private int _lineCount = 0;
@@ -140 +146 @@
                                 i.setID(++_lineCount);
         }
+        
+        /**
+         * 
+         * @return The interactive widgets that are currently ancored in this frame.
+         * Hence it exlcudes free-widgets.
+         */
+        public List<InteractiveWidget> getInteractiveWidgets() {
+                return Collections.unmodifiableList(this._iWidgets);
+                // return       this._iWidgets; // faster 
+        }
 
         /**
@@ -163 +179 @@
                 _change = value;
 
-                if (_change) {
+                if (_change){
                         setBufferValid(false);
                         _saved = false;
@@ -186 +202 @@
                         _sorted = true;
                 }
-
+                
                 List<Item> visibleItems = new ArrayList<Item>();
-
-                for (Item i : _body) {
+                
+                for(Item i: _body) {
                         if (i.isVisible())
                                 visibleItems.add(i);
                 }
-
+                
                 return visibleItems;
         }
@@ -214 +230 @@
                 }
 
-                return bodyTextItems;
-
+                return bodyTextItems;           
         }
 
@@ -289 +304 @@
                         if (autoBulletText.length() > 0)
                                 frameTitle.stripFirstWord();
+                }
+                //TODO Widgets... check this out
+                // Brook: Cannot figure what is going on above... widget  annot titles should be stripped always
+                if (ItemUtils.isTag(frameTitle, ItemUtils.GetTag(ItemUtils.TAG_IWIDGET))) {
+                        frameTitle.stripFirstWord();
                 }
 
@@ -452 +472 @@
                 if (_frameName != null) {
                         id = _frameName.getID();
-                } else {
+                } else{
                         id = -1 * getNextItemID();
                 }
@@ -575 +595 @@
                 if (item != null) {
                         if (_body.contains(item)) {
-                                // System.out.println("Item (" + item.getClass().getSimpleName()
-                                // + ") with ID " + item.getID() + " already in body.");
+                                //System.out.println("Item (" + item.getClass().getSimpleName()
+                                //              + ") with ID " + item.getID() + " already in body.");
                                 return;
                         }
@@ -582 +602 @@
                         if (item instanceof Line)
                                 _lineCount++;
-
+                        
                         _itemCount = Math.max(_itemCount, item.getID());
 
@@ -591 +611 @@
 
                         item.setMaxSize(FrameGraphics.getMaxFrameSize());
+                        //add widget items to the list of widgets
+                        if (item instanceof WidgetCorner) {
+                                InteractiveWidget iw = ((WidgetCorner)item).getWidgetSource();
+                                if (!this._iWidgets.contains(iw)) { // A set would have been best
+                                        _iWidgets.add(iw); 
+                                }
+                        }
+                        
+                        item.onAddedToFrame();
+
                         change();
                 }
@@ -608 +638 @@
         }
 
-        public void addAllItems(List<Item> toAdd) {
+        public void addAllItems(Collection<Item> toAdd) {
                 for (Item i : toAdd)
                         addItem(i);
         }
 
-        public void removeAllItems(List<Item> toRemove) {
+        public void removeAllItems(Collection<Item> toRemove) {
                 for (Item i : toRemove)
                         removeItem(i);
@@ -621 +651 @@
                 if (_body.remove(item))
                         change();
+                
+                //Remove widgets from the widget list
+                if (item != null) {
+                        item.onRemovedFromFrame();
+                        if (item instanceof WidgetCorner) {
+                                _iWidgets.remove(((WidgetCorner)item).getWidgetSource()); 
+                        }
+                }
+                
         }
 
@@ -951 +990 @@
                 List<Item> copies = ItemUtils.CopyItems(toMergeWith.getItems());
                 copies.remove(toMergeWith.getFrameNameItem());
-
+                
                 for (Item i : copies) {
                         if (i.getID() >= 0) {