Changeset 10

Timestamp:

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

Author:

ra33

Message:

Added Interactive Widget Items

Location:

trunk/src/org/expeditee

Files:

• gui/Browser.java (modified) (10 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (15 diffs)
• gui/FrameGraphics.java (modified) (8 diffs)
• gui/FrameIO.java (modified) (2 diffs)
• gui/FrameMouseActions.java (modified) (15 diffs)
• gui/FrameUtils.java (modified) (6 diffs)
• io/ExpWriter.java (modified) (4 diffs)
• items/Item.java (modified) (2 diffs)
• items/ItemUtils.java (modified) (4 diffs)

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -15 +16 @@
 import javax.swing.JFrame;
 
+import org.expeditee.AbsoluteLayout;
 import org.expeditee.actions.Actions;
 import org.expeditee.actions.Misc;
@@ -30 +32 @@
 public class Browser extends JFrame implements ComponentListener,
                 WindowListener, WindowStateListener {
+        
         /**
          * Default version - just to stop eclipse from complaining about it.
@@ -38 +41 @@
 
         public static Browser _theBrowser;
-
+        
         /**
          * Constructs a new Browser object, then launches it
@@ -51 +54 @@
                 // FrameGraphics.ForceRepaint();
         }
-
+        
         public void setSizes(Dimension size) {
                 setSize(size);
@@ -91 +94 @@
                                 UserSettings.InitialHeight));
 
+                //set the layout to absolute layout for widgets
+                this.getContentPane().setLayout(new AbsoluteLayout());
+                //enable the glasspane-for capturing all mouse events
+                this.setGlassPane(new MouseEventRouter(getJMenuBar(), getContentPane()));
+                this.getGlassPane().setVisible(true);
+                this.getContentPane().setBackground(Color.white);
+                
                 setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
 
@@ -127 +137 @@
                 DisplayIO.setCurrentFrame(firstFrame);
 
-                // Create the action handler for the
-                FrameMouseActions mouse = new FrameMouseActions();
-
-                this.getContentPane().addMouseListener(mouse);
-                this.getContentPane().addMouseMotionListener(mouse);
-                this.addKeyListener(new FrameKeyboardActions());
-                this.getContentPane().addMouseWheelListener(mouse);
+                FrameKeyboardActions keyboardListner = new FrameKeyboardActions();
+                this.getContentPane().addKeyListener(keyboardListner);
+                this.addKeyListener(keyboardListner);
         }
 
@@ -145 +151 @@
         }
 
-        /*
-         * public void loadedMenu(String menu) { if (g == null) return;
-         * 
-         * g.setColor(this.getBackground()); g.fillRect(0, 0, this.getWidth(),
-         * this.getHeight()); g.setColor(Color.BLACK); g.drawString("Loading Menu... " +
-         * menu, this.getWidth() / 2 - 200, this .getHeight() / 2); }
-         */
-
         @Override
         public void paint(Graphics g) {
                 super.paint(g);
                 FrameGraphics.Repaint();
-                // System.out.print('p');
         }
 
@@ -167 +164 @@
                 setupGraphics();
                 repaint();
-                // System.out.println("Resize");
         }
 
@@ -218 +214 @@
          */
         public void windowStateChanged(WindowEvent e) {
-                // FrameGraphics.Repaint();
-                // System.out.println('C');
+                //FrameGraphics.Repaint();
+                //System.out.println('C');
         }
 

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

@@ -330 +330 @@
                                 FrameIO.ResumeCache();
                         }
-
+                        
+                        // If the frames are the same then the items for the
+                        // frame that is just about to hide will still be in view
+                        // so only notify items that they are hidden if the
+                        // frames differ.
+                        if (_CurrentFrames[getCurrentSide()] != null &&
+                                _CurrentFrames[0] != _CurrentFrames[1]) {
+                                for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
+                                        i.onParentFameHidden(); 
+                                }
+                        }
                         _CurrentFrames[getCurrentSide()] = frame;
+                        
+                        // BROOK 
+                        for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
+                                i.onParentFameShown();
+                        }
                 } else {
+                        // Notifying items on the frame being hidden that they 
+                        // are about to be hidden.
+                        // ie. Widgets use this method to remove themselves from
+                        //the JPanel
+                        if (_CurrentFrames[getCurrentSide()] != null) {
+                                for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
+                                        i.onParentFameHidden(); 
+                                }
+                        }
+                        
                         _CurrentFrames[getCurrentSide()] = frame;
                         frame.setMaxSize(FrameGraphics.getMaxFrameSize());
+                
+                        // Notify items on the frame being displayed that they are in view
+                        //ie. widgets use this method to add themselves to the content pane
+                        for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
+                                i.onParentFameShown();
+                        }
                 }
 

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) {

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

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -7 +9 @@
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
+import java.awt.Point;
 import java.awt.RenderingHints;
 import java.awt.image.VolatileImage;
@@ -12 +15 @@
 import java.util.List;
 
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
 import org.expeditee.actions.Misc;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetEdge;
 
 public class FrameGraphics {
@@ -247 +255 @@
                                 paintItems.addAll(toPaint.getItems());
                         }
+                        // FIRST: Paint widgets swing gui (not expeditee gui) .
+                        // Note that these are the ancored widgets
+                        for (InteractiveWidget iw : toPaint.getInteractiveWidgets()) {
+                                iw.paint(bg);
+                        }
+                        
                         PaintPictures(bg, paintItems);
 
@@ -300 +314 @@
                                 PaintLines(bg, Frame.FreeItems);
                         }
+                        
                         if (paintOverlay) {
                                 PaintItem(bg, toPaint.getFrameNameItem());
                         }
+                        
+                        // BROOK: Ensure popups are repainted
+                        if (Browser._theBrowser != null)
+                                repaintPopups(Browser._theBrowser.getLayeredPane(), bg);
+
                         bg.dispose();
                 }
@@ -388 +408 @@
                 g.drawImage(_MessageBuffer, 0, _MaxSize.height, null);
                 g.dispose();
-        }
+                
+        }
+        
+
 
         private static void paintMessage(Graphics2D g, Color background) {
@@ -481 +504 @@
                                         FrameMouseActions.MouseX, FrameMouseActions.MouseY);
 
-                        if (toDisconnect != null) {
-                                if (Frame.itemAttachedToCursor())
+                        // Brook: Widget Edges do not have such a context
+                        if (toDisconnect != null && !(i instanceof WidgetEdge)) {
+                                if(Frame.itemAttachedToCursor())
                                         return;
-
-                                // unhighlight all the other dots
+                                
+                                //unhighlight all the other dots
                                 for (Item conn : toDisconnect.getAllConnected()) {
                                         conn.showHighlight(false);
                                 }
-                                // highlight the dot that will be in disconnect mode
+                                //highlight the dot that will be in disconnect mode
                                 toDisconnect.showDisconnectHighlight(val);
                                 toDisconnect.setFilledHighlight(true);
@@ -724 +748 @@
                 _SupressErrors = val;
         }
+        
+
+        private static void repaintPopups(Container parent, Graphics g) {
+                for (Component c : parent.getComponents()) {
+                        if (c instanceof JPopupMenu && ((JPopupMenu)c).isVisible()) {
+                                
+                                Point p = SwingUtilities.convertPoint(c, c.getLocation(), Browser._theBrowser.getContentPane());
+                                
+                                g.translate(p.x, p.y);
+                                c.paint(g);
+                                g.translate(-p.x, -p.y);
+                        } else if (c instanceof Container && 
+                                        c != Browser._theBrowser.getContentPane()) {
+                                repaintPopups((Container)c, g);
+                        }
+                }
+        }
 }

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

@@ -822 +822 @@
                 Text titleItem = newFrame.getTitle();
 
-                while (titleItem.getBoundsWidth() + titleItem.getX() > newFrame
-                                .getFrameNameItem().getX()) {
-                        titleItem.setSize(titleItem.getSize() - 1);
+                // BROOK: This had recursion!! Changed to avoid...
+                if ((titleItem.getX() + 1) < newFrame.getFrameNameItem().getX()) {
+                        while (titleItem.getBoundsWidth() + titleItem.getX() > newFrame
+                                        .getFrameNameItem().getX()) {
+                                titleItem.setSize(titleItem.getSize() - 1);
+                        }
+                } else {
+                        System.out.println("Bad title x position: " + titleItem.getX());
                 }
 
@@ -965 +970 @@
                 if (!FrameIO.DoesFramesetExist(framesetName))
                         return false;
-
+                
                 for (String path : UserSettings.FrameDirs) {
                         String source = path + framesetName.toLowerCase() + File.separator;

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

@@ -20 +20 @@
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidgetNotAvailableException;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -25 +26 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetCorner;
+import org.expeditee.items.WidgetEdge;
 import org.expeditee.stats.SessionStats;
 
 public class FrameMouseActions implements MouseListener, MouseMotionListener,
                 MouseWheelListener {
+        
+
+        private FrameMouseActions() {}
+        
+        private static FrameMouseActions _instance = null;
+        
+        public static FrameMouseActions getInstance() {
+                if (_instance == null) _instance = new FrameMouseActions();
+                return _instance;
+        }
 
         // TODO say where/how used
@@ -185 +198 @@
         public void mouseClicked(MouseEvent e) {
         }
-
+        
         /**
          * Each Item on the Frame is checked to determine if the mouse x,y
@@ -193 +206 @@
          */
         public void mousePressed(MouseEvent e) {
+                ProccessMousePressedEvent(e, e.getModifiersEx());
+        }
+
+        public void ProccessMousePressedEvent(MouseEvent e, int modifiersEx) {
+
                 _mouseDown += e.getButton();
                 _lastMouseClickDate = new Date();
@@ -238 +256 @@
 
                 // check for delete command
-                if (isDelete(e)) {
+                if (isDelete(modifiersEx)) {
                         _isDelete = true;
                         // _lastRanged = null;
@@ -244 +262 @@
                         _wasDouble = false;
                         // check for attributes command
-                } else if (isGetAttributes(e)) {
+                } else if (isGetAttributes(modifiersEx)) {
                         _isAttribute = true;
                         _wasDouble = false;
-                } else if (isTwoClickNoOp(e)) {
+                } else if (isTwoClickNoOp(modifiersEx)) {
                         _isAttribute = false;
                         _wasDouble = false;
@@ -442 +460 @@
                 }
 
-                // if the user has cropped an image, either the above happend or this is
+                // if the user has cropped an imate, either the above happend or this is
                 // a no-op
                 if (_lastCropped != null && _lastCropped.getCroppedSize() > 0) {
@@ -560 +578 @@
                 if (clicked == null)
                         return false;
+                
+                // Brook: widgets do not merge
+                if (clicked instanceof WidgetCorner) return false;
+                
+                // Brook: widgets do not merge
+                if (clicked instanceof WidgetEdge) return false;
 
                 // System.out.println(Frame.FreeItems.size());
@@ -623 +647 @@
                                 }
 
-                                // TODO remove rectangle constraints?
-                                if (clicked instanceof Line) {
+                                // BROOK: WIDGET RECTANGLES DONT ALLOW DISCONNECTION
+                                if (clicked instanceof Line && !(clicked instanceof WidgetEdge)) {
                                         // Check if within 20% of the end of the line
                                         Line l = (Line) clicked;
@@ -683 +707 @@
                                         }
                                 }
-
+                                
                                 pickup(clicked);
                                 return;
@@ -1320 +1344 @@
                 
                 DisplayIO.Back();
-                
+
                 // repaint things if necessary
                 if (Frame.itemAttachedToCursor())
@@ -1513 +1537 @@
                 List<Item> toUndo = new LinkedList<Item>();
                 List<Item> seen = new LinkedList<Item>();
-
+                
                 // disconnect any connected items
                 for (Item i : itemList) {
@@ -1580 +1604 @@
 
         private static List<Item> deleteDot(Dot dot) {
-                // create a backup copy of the dot
-                List<Item> copy = copy(dot.getConnected());
-                // remove lines that are connected to anchored dots
-                // note: the line is kept so that it can be properly restored
-                for (Item ic : copy) {
-                        if (ic instanceof Line) {
-                                Line line = (Line) ic;
-                                if (!copy.contains(line.getStartItem()))
-                                        line.getStartItem().removeLine(line);
-                                if (!copy.contains(line.getEndItem()))
-                                        line.getEndItem().removeLine(line);
-                        }
-                }
-
-                // remove all lines being deleted
-                for (Item ic : dot.getConnected()) {
-                        if (ic instanceof Line && ((Line) ic).getOppositeEnd(dot) != null) {
-                                Line line = (Line) ic;
-
-                                Item d = line.getOppositeEnd(dot);
-                                d.removeLine(line);
-
-                                // if the dot was only part of one line, it can be
-                                // removed
-                                if (d.getLines().size() == 0) {
-                                        if (d.getParent() != null)
-                                                d.getParent().removeItem(d);
-                                        if (!copy.contains(d))
-                                                copy.add(d);
-                                }
-
-                                if (dot.getParent() != null)
-                                        dot.getParent().removeItem(ic);
-                        }
-                }
-                return copy;
+                
+                if (dot instanceof WidgetCorner) { // Brook
+                        
+                        WidgetCorner wc = (WidgetCorner)dot;
+                        List<Item> wccopy;
+                        
+                        try {
+                                wccopy = wc.getWidgetSource().copy().getItems();
+                        } catch (InteractiveWidgetNotAvailableException e) {
+                                e.printStackTrace();
+                                return new LinkedList<Item>();
+                        }
+                        
+                        if (dot.getParent() != null) {
+                                dot.getParent().removeAllItems(wc.getWidgetSource().getItems());
+                        }
+                        return wccopy;
+                } else {
+                        
+                        // create a backup copy of the dot
+                        List<Item> copy = copy(dot.getConnected());
+                        // remove lines that are connected to anchored dots
+                        // note: the line is kept so that it can be properly restored
+                        for (Item ic : copy) {
+                                if (ic instanceof Line) {
+                                        Line line = (Line) ic;
+                                        if (!copy.contains(line.getStartItem()))
+                                                line.getStartItem().removeLine(line);
+                                        if (!copy.contains(line.getEndItem()))
+                                                line.getEndItem().removeLine(line);
+                                }
+                        }
+        
+                        // remove all lines being deleted
+                        for (Item ic : dot.getConnected()) {
+                                if (ic instanceof Line && ((Line) ic).getOppositeEnd(dot) != null) {
+                                        Line line = (Line) ic;
+        
+                                        Item d = line.getOppositeEnd(dot);
+                                        d.removeLine(line);
+        
+                                        // if the dot was only part of one line, it can be
+                                        // removed
+                                        if (d.getLines().size() == 0) {
+                                                if (d.getParent() != null)
+                                                        d.getParent().removeItem(d);
+                                                if (!copy.contains(d))
+                                                        copy.add(d);
+                                        }
+        
+                                        if (dot.getParent() != null)
+                                                dot.getParent().removeItem(ic);
+                                }
+                        }
+                        return copy;
+                }
         }
 
@@ -1763 +1807 @@
          */
         public static void pickup(Item toGrab) {
+                
+                // Brook: If the widget corner is being picked up. Instead refer to picking
+                // up the edge for fixed-sized widgets so it is not so confusing
+                if (toGrab instanceof WidgetCorner) {
+                        WidgetCorner wc = (WidgetCorner) toGrab;
+                        if (wc.getWidgetSource().isFixedSize()) {
+                                toGrab = toGrab.getConnected().get(1);
+                        }
+                }
+                
                 pickup(toGrab.getConnected());
         }
@@ -1974 +2028 @@
         }
 
-        public static boolean isDelete(MouseEvent e) {
-                if (e == null)
-                        return false;
+        public static boolean isDelete(int modifiersEx) {
+                
                 int onMask = MouseEvent.BUTTON3_DOWN_MASK
                                 | MouseEvent.BUTTON2_DOWN_MASK;
-                return (e.getModifiersEx() & onMask) == onMask;
-        }
-
-        public static boolean isGetAttributes(MouseEvent e) {
-                if (e == null)
-                        return false;
+                return (modifiersEx & onMask) == onMask;
+        }
+
+        public static boolean isGetAttributes(int modifiersEx) {
                 int onMask = MouseEvent.BUTTON3_DOWN_MASK
                                 | MouseEvent.BUTTON1_DOWN_MASK;
-                return (e.getModifiersEx() & onMask) == onMask;
-        }
-
-        public static boolean isTwoClickNoOp(MouseEvent e) {
-                if (e == null)
-                        return false;
+                return (modifiersEx & onMask) == onMask;
+        }
+
+        public static boolean isTwoClickNoOp(int modifiersEx) {
                 int onMask = MouseEvent.BUTTON2_DOWN_MASK
                                 | MouseEvent.BUTTON1_DOWN_MASK;
-                return (e.getModifiersEx() & onMask) == onMask;
+                return (modifiersEx & onMask) == onMask;
         }
 
         public static boolean wasDeleteClicked() {
-                return isDelete(_lastMouseClick);
+                if (_lastMouseClick == null) return false;
+                return isDelete(_lastMouseClick.getModifiersEx());
         }
 

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

@@ -11 +11 @@
 import org.expeditee.io.Logger;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidget;
+import org.expeditee.items.InteractiveWidgetNotAvailableException;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;
@@ -16 +18 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetCorner;
+import org.expeditee.items.WidgetEdge;
 
 public class FrameUtils {
@@ -447 +451 @@
                 frame.removeItem(txt);
                 frame.addItem(pic);
+
+                return true;
+        }
+        
+        /**
+         * Creates an interactive widget and adds it to a frame.
+         * If txt has no parent the parent will be set to frame.
+         * 
+         * @param frame 
+         *              Frame to add widget to. Must not be null.
+         * 
+         * @param txt 
+         *              Text to create the widget from. Must not be null.
+         * 
+         * @return True if created/added. False if coul not create.
+         * 
+         * @author Brook Novak
+         */
+        private static boolean createWidget(Frame frame, Text txt) {
+
+                if (frame == null) throw new NullPointerException("frame");
+                if (txt == null) throw new NullPointerException("txt");
+                
+                // Safety
+                if (txt.getParent() == null) txt.setParent(frame);
+                
+                InteractiveWidget iw = null;
+                
+                try {
+                        
+                        iw = InteractiveWidget.CreateWidget(txt);
+                        
+                } catch (InteractiveWidgetNotAvailableException e) {
+                        e.printStackTrace();
+                        FrameGraphics.ErrorMessage("Cannot create iWidget: " + e.getMessage());
+                        
+                }  catch (IllegalArgumentException e) {
+                        e.printStackTrace();
+                        FrameGraphics.ErrorMessage("Cannot create iWidget: " + e.getMessage());
+                }
+                
+                if (iw == null) return false;
+
+                frame.removeItem(txt);
+                
+                frame.addAllItems(iw.getItems());
 
                 return true;
@@ -628 +678 @@
                         ItemUtils.EnclosedCheck(toParse.getItems());
 
-                ArrayList<Item> items = new ArrayList<Item>();
-                items.addAll(toParse.getItems());
+                List<Item> items = toParse.getItems();
 
                 // if XRayMode is on, replace pictures with their underlying text
                 if (FrameGraphics.isXRayMode()) {
+                        
+                        // BROOK: Must handle these a little different
+                        //List<InteractiveWidget> widgets = toParse.getInteractiveWidgets();
+                        ArrayList<InteractiveWidget> widgets = new ArrayList<InteractiveWidget>();
+                        /*
                         for (Item i : items) {
                                 if (i instanceof Picture) {
                                         toParse.removeItem(i);
                                         toParse.addItem(((Picture) i).getText());
-                                }
-                        }
-
+                                } else if (i instanceof WidgetCorner) {
+                                        toParse.removeItem(i);
+                                } else if (i instanceof WidgetEdge) {
+                                        toParse.removeItem(i);
+                                }
+                        }*/
+                        for (Item i : items) {
+                                if (i instanceof Picture) {
+                                        toParse.removeItem(i);
+                                        toParse.addItem(((Picture) i).getText());
+                                } else if (i instanceof WidgetCorner) {
+                                        toParse.removeItem(i);
+                                        InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
+                                        if (!widgets.contains(iw)) { // hmmm I should be using a set... meh
+                                                widgets.add(iw);
+                                        }
+                                } else if (i instanceof WidgetEdge) toParse.removeItem(i);
+                        }
+
+
+                        for (InteractiveWidget iw : widgets) {
+                                toParse.addItem(iw.getSource());
+                        }
+                        
                         // update the list of items
                         items.clear();
@@ -691 +766 @@
                                 }
 
-                                // check for Images
+                                // check for Images and widgets
                                 if (!FrameGraphics.isXRayMode()) {
                                         if (ItemUtils.isTag(i, ItemUtils.TAG_IMAGE))
@@ -699 +774 @@
                                                         && ItemUtils.isTag(i, ItemUtils.TAG_FRAME_IMAGE))
                                                 createFramePicture(toParse, (Text) i);
+                                        // Check for interactive widgets
+                                        else if (ItemUtils.isTag(i, ItemUtils.TAG_IWIDGET)) {
+                                                createWidget(toParse, (Text) i);
+                                        }
                                 }
 

trunk/src/org/expeditee/io/ExpWriter.java

@@ -13 +13 @@
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
+import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.WidgetCorner;
+import org.expeditee.items.WidgetEdge;
 import org.expeditee.stats.SessionStats;
 
@@ -145 +148 @@
                 // write out each Item in the Frame.
                 List<Item> items = frame.getItems();
+                
+                // iWidgets are handled specially since 8 items are written as one
+                List<InteractiveWidget> seenWidgets = new LinkedList<InteractiveWidget>();
 
                 // do not write items with ID -1, also skip any lines
                 for (Item i : items) {
-                        if (i.getID() >= 0 && !(i instanceof Line))
+                        
+                        // Ensure only one of the WidgetCorners represent a single widget
+                        if (i instanceof WidgetCorner) {
+                                InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
+                                if (seenWidgets.contains(iw)) continue;
+                                seenWidgets.add(iw);
+                        }
+        
+                        if (i.getID() >= 0 && !(i instanceof Line)) {
                                 writeItem(i);
-                }
-
+                        }
+                }
+                
                 // write any lines or constraints
                 writeTerminator();
@@ -210 +225 @@
                 if (item instanceof Picture)
                         item = ((Picture) item).getText();
-
+                else if (item instanceof WidgetCorner)
+                        item = ((WidgetCorner) item).getWidgetSource().getSource();
+                
                 if (item.getLines().size() > 0)
                         writePoint(item);
@@ -242 +259 @@
                         if (lines != null && lines.size() > 0) {
                                 for (Line line : lines) {
+                                        
+                                        // Brook: widget edges are not saved
+                                        if (line instanceof WidgetEdge) {
+                                                seen.add(line);
+                                                continue;
+                                        }
 
                                         // only output new lines that have not yet been output

trunk/src/org/expeditee/items/Item.java

@@ -40 +40 @@
         public static int PERMISSION_TDFC = 3;
         public static int PERMISSION_FULL = 4;
-
+        
         public static final int NEAR_DISTANCE = 15;
         
@@ -1414 +1414 @@
                 return _visible;
         }
+        
+        
+        
+        // BROOK: Overrideable
+        public void onRemovedFromFrame() {}
+        public void onAddedToFrame() {}
+        public void onParentFameHidden() {} // because of caching
+        public void onParentFameShown() {} // because of caching
 }

trunk/src/org/expeditee/items/ItemUtils.java

@@ -63 +63 @@
 
         public static final int TAG_MAX = 15;
+        
+        // Brook: Im claiming this number!
+        public static final int TAG_IWIDGET = 16;
+        
 
         /**
@@ -276 +280 @@
                 case TAG_POINTTYPE:
                         return "@pointtype:";
+                case TAG_IWIDGET:
+                        return "@iw";
                 default:
                         return null;
@@ -418 +424 @@
                 List<Item> seen = new ArrayList<Item>();
                 
+                // Widgets are super special
+                List<InteractiveWidget> widgets = new ArrayList<InteractiveWidget>();
+                
                 for (Item i : toCopy) {
+                        
+//                      BROOK
+                        if (i instanceof WidgetCorner) { // dont add these 
+
+                                if (!widgets.contains(((WidgetCorner)i).getWidgetSource()))
+                                        widgets.add(((WidgetCorner)i).getWidgetSource());
+                                
+//                      BROOK
+                        } else if (i instanceof WidgetEdge) { // dont add these 
+
                         // lines are recreated later
-                        if (i instanceof Line) {
+                        } else if (i instanceof Line) {
                                 Line line = (Line) i;
                                 lines.add(line);
@@ -529 +548 @@
                 }
 
+                // BROOK
+                for (InteractiveWidget iw : widgets) {
+                        try {
+                                
+                                InteractiveWidget icopy = iw.copy();
+                                copies.addAll(icopy.getItems());
+                                
+                        } catch (InteractiveWidgetNotAvailableException e) {
+                                e.printStackTrace();
+                        }
+                }
+                
                 return copies;
         }