Changeset 286

Timestamp:

08/29/08 08:17:54 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (6 diffs)
• agents/PdfFrameset.java (modified) (2 diffs)
• agents/mail/MailSession.java (modified) (3 diffs)
• gui/AttributeValuePair.java (modified) (2 diffs)
• gui/Frame.java (modified) (7 diffs)
• gui/FrameGraphics.java (modified) (19 diffs)
• gui/FrameIO.java (modified) (2 diffs)
• gui/FrameKeyboardActions.java (modified) (12 diffs)
• gui/FrameMouseActions.java (modified) (15 diffs)
• gui/FrameUtils.java (modified) (8 diffs)
• gui/UserSettings.java (modified) (1 diff)
• gui/Vector.java (modified) (3 diffs)
• io/DefaultFrameWriter.java (modified) (10 diffs)
• io/DefaultFramesetWriter.java (modified) (1 diff)
• io/ItemWriter.java (modified) (6 diffs)
• io/PdfFramesetWriter.java (modified) (8 diffs)
• items/Item.java (modified) (5 diffs)
• items/ItemUtils.java (modified) (1 diff)
• items/Text.java (modified) (1 diff)
• items/widgets/DataFrameWidget.java (modified) (2 diffs)
• items/widgets/InteractiveWidget.java (modified) (2 diffs)
• items/widgets/charts/TimeSeries.java (modified) (1 diff)
• network (added)
• network/ConnectThread.java (added)
• network/PeerToPeer.java (added)

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

@@ -29 +29 @@
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Text;
+import org.expeditee.simple.SString;
 
 /**
@@ -65 +66 @@
         private static HashMap<String, String> _JAGs = new HashMap<String, String>();
 
+        // maps lower case IW class names to capitalized IW names
+        private static HashMap<String, String> _IWs = new HashMap<String, String>();
+
         public static final String ROOT_PACKAGE = "org.expeditee.";
 
@@ -71 +75 @@
 
         private static final String AGENTS_PACKAGE = ROOT_PACKAGE + "agents.";
+
+        private static final String WIDGET_PACKAGE = ROOT_PACKAGE
+                        + "items.widgets.";
+
+        private static final String CHARTS_PACKAGE = ROOT_PACKAGE
+                        + "items.widgets.charts.";
 
         private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE
@@ -199 +209 @@
                                 _JAGs.put(name.toLowerCase(), name);
                         }
+
+                        classes = getClasses(WIDGET_PACKAGE);
+
+                        for (int i = 0; i < classes.length; i++) {
+                                String name = classes[i].getSimpleName();
+                                // maps lower case name to correct capitalised name
+                                _IWs.put(name.toLowerCase(), WIDGET_PACKAGE + name);
+                        }
+
+                        classes = getClasses(CHARTS_PACKAGE);
+
+                        for (int i = 0; i < classes.length; i++) {
+                                String name = classes[i].getSimpleName();
+                                // maps lower case name to correct capitalised name
+                                _IWs.put("charts." + name.toLowerCase(), CHARTS_PACKAGE + name);
+                        }
                 } catch (Exception e) {
                         warnings.add("You must have Java 1.5 or higher to run Expeditee");
                         warnings.add(e.getMessage());
                 }
+
                 try {
                         classes = getClasses(ACTIONS_PACKAGE);
@@ -421 +448 @@
                                                 continue;
                                         for (int i = 0; i < paramCount; i++) {
-                                                if (paramTypes[i].equals(int.class)
-                                                                || paramTypes[i].equals(Integer.class)) {
-                                                        try {
-                                                                params[i] = Integer.parseInt(paramStrings[i]);
-                                                        } catch (Exception e) {
+                                                SString nextParam = new SString(paramStrings[i]);
+                                                try {
+                                                        params[i] = null;
+                                                        if (paramTypes[i].equals(int.class)
+                                                                        || paramTypes[i].equals(Integer.class)) {
+                                                                params[i] = nextParam.integerValue().intValue();
+                                                        } else if (paramTypes[i].equals(long.class)
+                                                                        || paramTypes[i].equals(Long.class)) {
+                                                                params[i] = nextParam.integerValue();
+                                                        } else if (paramTypes[i].equals(double.class)
+                                                                        || paramTypes[i].equals(Double.class)) {
+                                                                params[i] = nextParam.doubleValue();
+                                                        } else if (paramTypes[i].equals(float.class)
+                                                                        || paramTypes[i].equals(Float.class)) {
+                                                                params[i] = nextParam.doubleValue()
+                                                                                .floatValue();
+                                                        } else if (paramTypes[i].equals(boolean.class)
+                                                                        || paramTypes[i].equals(Boolean.class)) {
+                                                                params[i] = nextParam.booleanValue();
+                                                        } else if (paramTypes[i].equals(String.class)) {
+                                                                params[i] = nextParam.stringValue();
+                                                        } else {
                                                                 continue;
                                                         }
-                                                } else if (paramTypes[i].equals(double.class)
-                                                                || paramTypes[i].equals(Double.class)) {
-                                                        try {
-                                                                params[i] = Double.parseDouble(paramStrings[i]);
-                                                        } catch (Exception e) {
-                                                                continue;
-                                                        }
-                                                } else if (paramTypes[i].equals(String.class)) {
-                                                        params[i] = paramStrings[i];
-                                                } else {
+                                                } catch (Exception e) {
                                                         continue;
                                                 }
@@ -736 +771 @@
                 return null;
         }
+
+        /**
+         * Gets the full class path for a widget with a given case insensitive name.
+         * 
+         * @param widgetName
+         * @return
+         */
+        public static String getClassName(String widgetName) {
+                return _IWs.get(widgetName.toLowerCase());
+        }
 }

trunk/src/org/expeditee/agents/PdfFrameset.java

@@ -6 +6 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.io.PdfFramesetWriter;
+import org.expeditee.items.widgets.InteractiveWidget;
 
 
@@ -14 +15 @@
 
         private int _maxFrame = Integer.MAX_VALUE;
+        
+        private boolean _showFrameNames = false;
 
-        public PdfFrameset(int firstFrame, int maxFrame) {
+        public PdfFrameset(int firstFrame, int maxFrame, boolean showFrameNames) {
                 super();
                 _firstFrame = firstFrame;
                 _maxFrame = maxFrame;
+                _showFrameNames = showFrameNames;
+        }
+        
+        public PdfFrameset(int firstFrame, int maxFrame) {
+                this(firstFrame, maxFrame, false);
+        }
+        
+        public PdfFrameset( boolean showFrameNames) {
+                this(1,Integer.MAX_VALUE, showFrameNames);
         }
 
         public PdfFrameset() {
-                super();
-                _firstFrame = 1;
-                _maxFrame = Integer.MAX_VALUE;
+                this(false);
         }
 
         @Override
         protected Frame process(Frame frame) {
-                _pdfWriter = new PdfFramesetWriter(_firstFrame, _maxFrame);
+                _pdfWriter = new PdfFramesetWriter(_firstFrame, _maxFrame, _showFrameNames);
                 
                 try {

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -76 +76 @@
                         if (item.getText().toLowerCase().trim().equals("autoconnect")) {
                                 _autoConnect = true;
+                                continue;
                         }
                         AttributeValuePair avp = new AttributeValuePair(item.getText());
@@ -156 +157 @@
                                 _bConnecting = true;
                                 _transport.connect();
-                                message.setText("SMTP server connected");
+                                message.setAttributeValue("SMTP server connected");
                                 message.setColor(Color.green);
                         } else {
@@ -211 +212 @@
                                 }.start();
 
-                                message.setText("Connection complete");
+                                message.setAttributeValue("Connection complete");
                                 message.setColor(Color.GREEN);
 

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

@@ -54 +54 @@
                 if (text.charAt(0) == ANNOTATION_CHAR) {
                         _bAnnotation = true;
-                        if (text.length() == 1 || !Character.isLetter(text.charAt(1)))
+                        if (text.length() == 1 || !Character.isLetterOrDigit(text.charAt(1)))
                                 return;
                         // All chars in the attribute must be letters or digits
@@ -61 +61 @@
                                         return;
                         }
+                        text = text.substring(1);
+                        ind--;
                         if (ind < 1) {
-                                setAttribute(text.substring(1));
+                                setAttribute(text);
                                 return;
                         }

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

@@ -2 +2 @@
 
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.Image;
 import java.awt.Polygon;
@@ -31 +30 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.XRayable;
+import org.expeditee.items.Item.HighlightMode;
 import org.expeditee.items.widgets.InteractiveWidget;
 import org.expeditee.items.widgets.WidgetCorner;
@@ -501 +501 @@
                 for (Overlay o : _overlays.keySet())
                         results.addAll(o.Frame.getItemsWithin(poly));
+                
+                for(Item i: getVectorItems()){
+                        if (i.intersects(poly)) {
+                                //This assumes a results is a set
+                                results.add(i.getEditTarget());
+                        }
+                }
 
                 return results;
@@ -1070 +1077 @@
                         int index = toCheck.indexOf(from);
 
+                        //If its the title index will be 0
                         if (index < 0)
-                                return column;
+                                index = 0;
 
                         for (int i = index; i < toCheck.size(); i++) {
@@ -1100 +1108 @@
                 // Items must be notified that they have been added or removed from this
                 // frame via the vector...
+                int maxX = 0;
+                int maxY = 0;
+                HighlightMode mode = toAdd.Source.getHighlightMode();
+                if(mode != HighlightMode.None)
+                        mode = HighlightMode.Connected;
+                Color highlightColor = toAdd.Source.getHighlightColor();
                 for (Item i : ItemUtils.CopyItems(toAdd.Frame.getVectorItems(), toAdd)) {
                         i.onParentStateChanged(new ItemParentStateChangedEvent(this,
                                         ItemParentStateChangedEvent.EVENT_TYPE_ADDED_VIA_OVERLAY,
                                         toAdd.permission));
+                        i.setEditTarget(toAdd.Source);
+                        i.setHighlightMode(mode, highlightColor);
                         _vectorItems.add(i);
                         i.invalidateAll();
                         i.invalidateFill();
-                }
+                        //Get the right most x and bottom most y pos
+                        int itemRight = i.getX() + i.getBoundsWidth();
+                        if(itemRight > maxX)
+                                maxX = itemRight;
+                        int itemBottom = i.getY() + i.getBoundsHeight();
+                        if(itemBottom > maxY)
+                                maxY = itemBottom;
+                }
+                toAdd.setSize(maxX, maxY);
                 return true;
         }
@@ -1916 +1940 @@
                         }
                 }
+                
+                for(Vector v: getVectors()){
+                        toSave.add(v.Source);
+                }
+                
                 return toSave;
         }
@@ -2016 +2045 @@
                 _frameName = null;
         }
+
+        public void parse() {
+                for(Overlay o: getOverlays()){
+                        o.Frame.parse();
+                }
+                //Must parse the frame AFTER the overlays
+                FrameUtils.Parse(this);
+        }
 }

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

@@ -36 +36 @@
         // the maximum size that can be used to paint on
         private static Dimension _MaxSize = new Dimension(1000, 1000);
-        
+
         // Final passes to renderering the current frame
         private static LinkedList<FinalFrameRenderPass> _finalPasses = new LinkedList<FinalFrameRenderPass>();
@@ -100 +100 @@
                         return;
                 _Mode = mode;
-                if (parse)
-                        FrameUtils.Parse(DisplayIO.getCurrentFrame());
+                if (parse) {
+                        Frame current = DisplayIO.getCurrentFrame();
+                        current.parse();
+                }
         }
 
@@ -134 +136 @@
                         if (DisplayIO.isTwinFramesOn()) {
                                 Frame opposite = DisplayIO.getOppositeFrame();
-                                //if (opposite != null) {
-                                        opposite.setBuffer(null);
-                                        opposite.refreshSize();
-                                //}
+                                // if (opposite != null) {
+                                opposite.setBuffer(null);
+                                opposite.refreshSize();
+                                // }
                         }
                 }
@@ -264 +266 @@
          * @return
          */
-        private static Image Paint(Frame toPaint, Area clip, boolean isActualFrame, boolean createVolitile) {
+        private static Image Paint(Frame toPaint, Area clip, boolean isActualFrame,
+                        boolean createVolitile) {
                 if (toPaint == null)
                         return null;
@@ -276 +279 @@
                                 if (createVolitile) {
                                         buffer = ge.getDefaultScreenDevice()
-                                        .getDefaultConfiguration()
-                                        .createCompatibleVolatileImage(_MaxSize.width,
-                                                        _MaxSize.height);
+                                                        .getDefaultConfiguration()
+                                                        .createCompatibleVolatileImage(_MaxSize.width,
+                                                                        _MaxSize.height);
                                 } else {
                                         buffer = new BufferedImage(_MaxSize.width, _MaxSize.height,
@@ -302 +305 @@
          * @param bg
          */
-        public static void paintFrame(Frame toPaint, Area clip, boolean isActualFrame, boolean createVolitile, Graphics2D bg) {
+        public static void paintFrame(Frame toPaint, Area clip,
+                        boolean isActualFrame, boolean createVolitile, Graphics2D bg) {
                 bg.setClip(clip);
 
@@ -318 +322 @@
                 if (createVolitile) {
                         backgroundColor = toPaint.getPaintBackgroundColor();
-                }else{
+                } else {
                         backgroundColor = toPaint.getBackgroundColor();
                         if (backgroundColor == null)
@@ -337 +341 @@
                         visibleItems.addAll(toPaint.getAllItems());
                         paintWidgets = new LinkedList<InteractiveWidget>();
-                        AddAllOverlayWidgets(paintWidgets, toPaint,
-                                        new LinkedList<Frame>());
+                        AddAllOverlayWidgets(paintWidgets, toPaint, new LinkedList<Frame>());
                 } else {
                         visibleItems.addAll(toPaint.getVisibleItems());
@@ -348 +351 @@
                 // FIRST: Paint widgets swing gui (not expeditee gui) .
                 // Note that these are the anchored widgets
-                ListIterator<InteractiveWidget> widgetItor = paintWidgets.listIterator(paintWidgets.size());
-                while (widgetItor.hasPrevious())  { 
-                        //Paint first-in-last-serve ordering - like swing
-                        //If it is done the other way around then widgets are covered up by the box that is supposed to be underneath
+                ListIterator<InteractiveWidget> widgetItor = paintWidgets
+                                .listIterator(paintWidgets.size());
+                while (widgetItor.hasPrevious()) {
+                        // Paint first-in-last-serve ordering - like swing
+                        // If it is done the other way around then widgets are covered up by
+                        // the box that is supposed to be underneath
                         InteractiveWidget iw = widgetItor.previous();
-                        if (clip == null
-                                        || clip.intersects(iw.getComponant().getBounds())){
-                                iw.paint(bg);   
+                        if (clip == null || clip.intersects(iw.getComponant().getBounds())) {
+                                iw.paint(bg);
                                 PaintItem(bg, iw.getItems().get(4));
                                 paintedFillsAndLines.addAll(iw.getItems());
@@ -702 +706 @@
                 } else if (i instanceof Circle) {
                         i.setHighlightMode(Item.HighlightMode.Connected);
+                } else if (!i.isVisible()) {
+                        changeHighlightMode(i, Item.HighlightMode.Connected, null);
                 } else {
                         // FrameGraphics.ChangeSelectionMode(i,
@@ -726 +732 @@
                 if (item == null)
                         return;
-                // Mike: TODO comment on why the line below is used!!
-                // I forgot already!!Opps
-                boolean freeItem = FreeItems.getInstance().contains(item);
-                for (Item i : item.getAllConnected()) {
-                        if (/* freeItem || */!FreeItems.getInstance().contains(i)) {
-                                i.setHighlightMode(connectedNewMode);
-                        }
-                }
-                if (!freeItem && newMode != connectedNewMode)
+
+                if (item.hasVector()) {
+                        for (Item i : item.getParentOrCurrentFrame().getVectorItems()) {
+                                if (i.getEditTarget() == item) {
+                                        i.setHighlightMode(newMode);
+                                }
+                        }
                         item.setHighlightMode(newMode);
+                } else {
+                        // Mike: TODO comment on why the line below is used!!
+                        // I forgot already!!Opps
+                        boolean freeItem = FreeItems.getInstance().contains(item);
+                        for (Item i : item.getAllConnected()) {
+                                if (/* freeItem || */!FreeItems.getInstance().contains(i)) {
+                                        i.setHighlightMode(connectedNewMode);
+                                }
+                        }
+                        if (!freeItem && newMode != connectedNewMode)
+                                item.setHighlightMode(newMode);
+                }
                 Repaint();
         }
@@ -746 +762 @@
          */
 
-        public static void UpdateBuffer(Frame toUpdate, boolean paintOverlays, boolean useVolitile) {
+        public static void UpdateBuffer(Frame toUpdate, boolean paintOverlays,
+                        boolean useVolitile) {
                 toUpdate.setBuffer(getBuffer(toUpdate, paintOverlays, useVolitile));
         }
-        
-        public static Image getBuffer(Frame toUpdate, boolean paintOverlays, boolean useVolitile){
+
+        public static Image getBuffer(Frame toUpdate, boolean paintOverlays,
+                        boolean useVolitile) {
                 if (toUpdate == null)
                         return null;
@@ -771 +789 @@
         // Damaged areas pending to render. Accessessed by multiple threads
         private static HashSet<Rectangle> damagedAreas = new HashSet<Rectangle>();
-        
+
         /** The clip used while paiting */
         private static Area currentClip;
-        
+
         /**
          * The current clip that is used for painting at this instant.
@@ -781 +799 @@
          * lost in the graphics object for which can be regained via this method.
          * 
-         * @return
-         *              The current clip. Null if no clip (e.g. full screen render).
+         * @return The current clip. Null if no clip (e.g. full screen render).
          */
         public static Area getCurrentClip() {
-                return (currentClip != null) ? (Area)currentClip.clone() : null;
+                return (currentClip != null) ? (Area) currentClip.clone() : null;
         }
 
@@ -869 +886 @@
                                         MessageBay.refresh(true, dg, Item.DEFAULT_BACKGROUND);
                                         return;
-                                        
-                                } else return; // nothing to render
+
+                                } else
+                                        return; // nothing to render
                         }
 
@@ -936 +954 @@
 
         }
-        
+
         /**
          * Adds a FinalFrameRenderPass to the frame-render pipeline...
@@ -944 +962 @@
          * 
          * @param pass
-         *              The pass to add. If already added then nothing results in the call.
+         *            The pass to add. If already added then nothing results in the
+         *            call.
          * 
          * @throws NullPointerException
-         *              If pass is null.
+         *             If pass is null.
          */
         public static void addFinalFrameRenderPass(FinalFrameRenderPass pass) {
-                if (pass == null) throw new NullPointerException("pass");
-                
+                if (pass == null)
+                        throw new NullPointerException("pass");
+
                 if (!_finalPasses.contains(pass))
                         _finalPasses.add(pass);
         }
-        
+
         /**
          * Adds a FinalFrameRenderPass to the frame-render pipeline...
@@ -963 +983 @@
          * 
          * @param pass
-         *              The pass to remove
+         *            The pass to remove
          * 
          */
@@ -969 +989 @@
                 _finalPasses.remove(pass);
         }
-        
-        /**
-         * A FinalFrameRenderPass is invoked at the very final stages for rendering a frame:
-         * that is, after the popups are drawn.
-         *  
-         * There can be many applications for FinalFrameRenderPass. Such as tool tips, balloons,
-         * or drawing items at the highest Z-order in special situations.
+
+        /**
+         * A FinalFrameRenderPass is invoked at the very final stages for rendering
+         * a frame: that is, after the popups are drawn.
+         * 
+         * There can be many applications for FinalFrameRenderPass. Such as tool
+         * tips, balloons, or drawing items at the highest Z-order in special
+         * situations.
          * 
          * Although if there are multiples FinalFrameRenderPasses attatach to the

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

@@ -44 +44 @@
         public static void changeParentFolder(String newFolder) {
                 PARENT_FOLDER = newFolder;
+                PUBLIC_PATH = PARENT_FOLDER + "public" + File.separator;
                 FRAME_PATH = PARENT_FOLDER + "framesets" + File.separator;
                 TRASH_PATH = PARENT_FOLDER + "trash" + File.separator;
@@ -65 +66 @@
 
         public static String FRAME_PATH;
+        
+        public static String PUBLIC_PATH;
 
         public static String IMAGES_PATH;

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

@@ -10 +10 @@
 import java.awt.event.KeyListener;
 import java.awt.geom.Point2D;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -39 +40 @@
 
         private static Collection<Item> _enclosedItems = null;
-        
+
         public static void resetEnclosedItems() {
                 _enclosedItems = null;
@@ -330 +331 @@
         public void keyPressed(KeyEvent e) {
                 int keyCode = e.getKeyCode();
-                
-                if(keyCode != KeyEvent.VK_F1 && keyCode != KeyEvent.VK_F2){
+
+                if (keyCode != KeyEvent.VK_F1 && keyCode != KeyEvent.VK_F2) {
                         resetEnclosedItems();
                 }
-                
+
                 SessionStats.AddFrameEvent("k" + KeyEvent.getKeyText(keyCode));
 
@@ -526 +527 @@
 
         }
-
 
         public void keyReleased(KeyEvent e) {
@@ -1114 +1114 @@
         public static final String SHORT_DATE_FORMAT = "ddMMMyyyy";
 
+        public static final String TIME_DATE_FORMAT = "[HH:mm]";
+
         public static final String LONG_DATE_FORMAT = "ddMMMyyyy[HH:mm]";
 
@@ -1181 +1183 @@
                                 dummyItem.setText(newItemText + dummyItem.getText());
                         }
-                        
+
                         dummyItem = createText();
                         if (FreeItems.textOnlyAttachedToCursor()) {
@@ -1199 +1201 @@
                         if (column.size() == 0) {
                                 Frame current = DisplayIO.getCurrentFrame();
-                                //Item itemTemplate = current.getItemTemplate();
+                                // Item itemTemplate = current.getItemTemplate();
                                 int xPos = title.getX() + FrameCreator.INDENT_FROM_TITLE;
                                 int yPos = FrameCreator.getYStart(title);
@@ -1509 +1511 @@
                         // check permissions
                         if (!item.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to change the size of that item");
-                                return;
+                                Item editTarget = item.getEditTarget();
+                                if (editTarget != item
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        item = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to change the size of that item");
+                                        return;
+                                }
                         }
                         toSet = item;
@@ -1569 +1577 @@
                                         i.setThickness((float) (i.getThickness() * ratio));
                                 } else if (i instanceof XRayable) {
+                                        XRayable xRay = (XRayable) i;
+                                        Text source = xRay.getSource();
+                                        // Ensure that the source is done before the XRayable
+                                        if (!done.contains(source)) {
+                                                scaleText(origin, ratio, done, source);
+                                        }
+
                                         i.translate(origin, ratio);
                                         i.setThickness((float) (i.getThickness() * ratio));
                                         done.add(i);
+                                } else if (i.hasVector()) {
+                                        // TODO Improve the effiency of resizing vectors... ie...
+                                        // dont want to have to reparse all the time
+                                        assert (i instanceof Text);
+                                        Text text = (Text) i;
+                                        AttributeValuePair avp = new AttributeValuePair(text
+                                                        .getText());
+                                        double scale = 1F;
+                                        try {
+                                                scale = avp.getDoubleValue();
+                                        } catch (Exception e) {
+                                        }
+                                        scale *= ratio;
+                                        NumberFormat nf = Vector.getNumberFormatter();
+                                        text.setAttributeValue(nf.format(scale));
+                                        text.translate(origin, ratio);
+                                        item.getParent().parse();
                                 } else if (i instanceof Text) {
-                                        i.translate(origin, ratio);
-                                        i.setSize((float) (i.getSize() * ratio));
-                                        done.add(i);
+                                        scaleText(origin, ratio, done, (Text) i);
                                 }
                         }
@@ -1598 +1628 @@
                                 current = Math.max(current + diff, Item.MINIMUM_THICKNESS);
                                 dot.setThickness(current);
+                        } else if (i.hasVector()) {
+                                assert (item instanceof Text);
+                                Text text = (Text) item;
+                                AttributeValuePair avp = new AttributeValuePair(text.getText());
+                                double scale = 1F;
+                                try {
+                                        scale = avp.getDoubleValue();
+                                } catch (Exception e) {
+                                }
+                                scale *= ratio;
+                                NumberFormat nf = Vector.getNumberFormatter();
+                                text.setAttributeValue(nf.format(scale));
+                                text.translate(origin, ratio);
+                                item.getParent().parse();
                         } else {
                                 float oldSize = Math.abs(i.getSize());
@@ -1620 +1664 @@
         }
 
+        /**
+         * @param origin
+         * @param ratio
+         * @param done
+         * @param source
+         */
+        private static void scaleText(Point2D origin, double ratio,
+                        Collection<Item> done, Text source) {
+                source.translate(origin, ratio);
+                source.setSize((float) (source.getSize() * ratio));
+                done.add(source);
+        }
+
         private static void SetFillColor(Item item, boolean setTransparent) {
                 if (item == null)
@@ -1716 +1773 @@
                         // check permissions
                         if (!item.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to change that item's color");
-                                return;
+                                Item editTarget = item.getEditTarget();
+                                if (editTarget != item
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        item = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to change color");
+                                        return;
+                                }
                         }
                         // Toggling color of circle center changes the circle fill color

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

@@ -2 +2 @@
 
 import java.awt.Point;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -10 +11 @@
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -683 +685 @@
                         // check item permissions
                         if (!clicked.hasPermission(Permission.followLinks)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permissions to perform action on item");
-                                return;
+                                Item editTarget = clicked.getEditTarget();
+                                if (editTarget != clicked
+                                                && editTarget.hasPermission(Permission.followLinks)) {
+                                        clicked = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to perform action on item");
+                                        return;
+                                }
                         }
 
@@ -869 +877 @@
                         // check permissions
                         if (!clicked.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to pick up item");
-                                return;
+                                Item editTarget = clicked.getEditTarget();
+                                if (editTarget != clicked
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        clicked = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to pick up item");
+                                        return;
+                                }
                         }
 
@@ -1250 +1264 @@
                                         }
                                 } else if (!clicked.hasPermission(Permission.copy)) {
-                                        MessageBay
-                                                        .displayMessage("Insufficient permission to copy");
-                                        return;
+                                        Item editTarget = clicked.getEditTarget();
+                                        if (editTarget != clicked
+                                                        && editTarget.hasPermission(Permission.copy)) {
+                                                clicked = editTarget;
+                                        } else {
+                                                MessageBay
+                                                                .displayMessage("Insufficient permission to copy");
+                                                return;
+                                        }
                                 }
 
@@ -1548 +1568 @@
 
         private static boolean _controlDown;
-        
+
         public static boolean isControlDown() {
                 return _controlDown;
@@ -1596 +1616 @@
                 MouseX = e.getX();
                 MouseY = e.getY();
-                //System.out.println(MouseX + "," + MouseY);
+                // System.out.println(MouseX + "," + MouseY);
 
                 // Moving the mouse a certain distance removes the last edited text if
@@ -1813 +1833 @@
                                 // Item.SelectedMode.Connected);
                                 // TODO: The method below is for the most part redundant
-                                on = FrameGraphics.Highlight(on);
+                                on = FrameGraphics.Highlight(on.getEditTarget());
                         }
                         // if the last item highlighted is still highlighted, clear it
@@ -2001 +2021 @@
          */
         public static boolean tdfc(Item linker) throws RuntimeException {
-                // if (linker instanceof Line)
-                // return false;
-
                 // if this is a non-usable item
                 if (linker.getID() < 0)
                         return false;
+
+                // Check if its an image that can be resized to fit a box
+                // around it
+                String text = linker.getText();
+                if (text.equals("@v") || text.equals("@f")) {
+                        Collection<Item> enclosure = FrameUtils.getEnclosingLineEnds(linker
+                                        .getPosition());
+                        if (enclosure != null) {
+                                for (Item i : enclosure) {
+                                        if (i.isLineEnd() && i.isEnclosed()) {
+                                                DisplayIO.getCurrentFrame().removeAllItems(enclosure);
+                                                Rectangle rect = i.getEnclosedRectangle();
+                                                long width = Math.round(rect.getWidth());
+                                                if (text.equals("@v")) {
+                                                        NumberFormat nf = Vector.getNumberFormatter();
+                                                        linker.setText("@v: "
+                                                                        + nf.format((width / FrameGraphics
+                                                                                        .getMaxFrameSize().getWidth())));
+                                                } else {
+                                                        linker.setText("@f: " + width);
+                                                }
+
+                                                linker.setPosition(new Point(rect.x, rect.y));
+                                                linker.setThickness(i.getThickness());
+                                                linker.setBorderColor(i.getColor());
+                                                break;
+                                        }
+                                }
+                                FrameMouseActions.deleteItems(enclosure, false);
+                        }
+                }
 
                 boolean mouseMoved;
@@ -2178 +2226 @@
                         // check permissions
                         if (!toDelete.hasPermission(Permission.full)) {
-                                MessageBay
-                                                .displayMessage("Insufficient permission to delete item");
-                                return;
+                                Item editTarget = toDelete.getEditTarget();
+                                if (editTarget != toDelete
+                                                && editTarget.hasPermission(Permission.full)) {
+                                        toDelete = editTarget;
+                                } else {
+                                        MessageBay
+                                                        .displayMessage("Insufficient permission to delete item");
+                                        return;
+                                }
                         }
 
@@ -2532 +2586 @@
 
                 if (!toGrab.hasPermission(Permission.full)) {
-                        MessageBay
-                                        .displayMessage("Insufficient permission pickup the item");
+                        if (toGrab.getEditTarget() != toGrab) {
+                                pickup(toGrab.getEditTarget());
+                        } else {
+                                MessageBay
+                                                .displayMessage("Insufficient permission pickup the item");
+                        }
                         return;
                 }
@@ -2539 +2597 @@
                 if (toGrab instanceof Circle)
                         toGrab.setHighlightMode(HighlightMode.Connected);
-                else
+                //Dont set the highlight mode if a vector is being picked up
+                else if(toGrab.isVisible()){
                         toGrab.setHighlightMode(HighlightMode.Normal);
+                }
 
                 // Brook: If the widget corner is being picked up. Instead refer to
@@ -2559 +2619 @@
 
         public static void pickup(Collection<Item> toGrab) {
-                if(toGrab == null || toGrab.size() == 0)
+                if (toGrab == null || toGrab.size() == 0)
                         return;
-                
+
                 boolean bReparse = false;
                 Frame frame = DisplayIO.getCurrentFrame();
@@ -2594 +2654 @@
                                 for (Item copy : copies) {
                                         FreeItems.getInstance().add(copy);
+                                        copy.setEditTarget(i);
                                         copy.setFloating(true);
                                         copy.setParent(null);
+                                        //copy.setHighlightMode(HighlightMode.Connected);
                                 }
                         }
@@ -2636 +2698 @@
                 } else {
                         MessageBay
-                                        .displayMessage("Insufficient permission pickup the items");
+                                        .displayMessage("Insufficient permission to pickup the items");
                 }
                 if (bReparse)

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

@@ -4 +4 @@
 import java.awt.Point;
 import java.awt.Polygon;
+import java.awt.Rectangle;
 import java.io.File;
 import java.util.ArrayList;
@@ -31 +32 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.network.PeerToPeer;
 import org.expeditee.stats.SessionStats;
 
@@ -580 +582 @@
                         else if (attribute.equals("mailsettings"))
                                 MailSession.init(item.getChild());
+                        else if (attribute.equals("peertopeersettings"))
+                                PeerToPeer.init(item.getChild());
                         else if (attribute.equals("reminders"))
                                 Reminders.init(item.getChild());
@@ -779 +783 @@
                                 } else if (i.hasFormula()) {
                                         i.setText(i.getFormula());
+                                } else if (i.hasOverlay()) {
+                                        i.setVisible(true);
                                 }
                         }
@@ -849 +855 @@
                                                 }
                                                 // check for new OVERLAY items
-                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
-                                                                ItemUtils.TAG_OVERLAY)
+                                                else if (!ignoreAnnotations
+                                                                && ItemUtils.startsWithTag(i,
+                                                                                ItemUtils.TAG_OVERLAY)
                                                                 && i.getLink() != null) {
                                                         if (i.getAbsoluteLink().equalsIgnoreCase(
@@ -872 +879 @@
                                                 }
                                                 // check for ACTIVE_OVERLAY items
-                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
-                                                                ItemUtils.TAG_ACTIVE_OVERLAY)
+                                                else if (!ignoreAnnotations
+                                                                && ItemUtils.startsWithTag(i,
+                                                                                ItemUtils.TAG_ACTIVE_OVERLAY)
                                                                 && i.getLink() != null) {
                                                         String link = i.getAbsoluteLink();
@@ -1028 +1036 @@
                         } catch (Exception e) {
                         }
-                        Vector newVector = new Vector(vector, vectorPermission, i
-                                        .getPosition(), scale, i.getColor(), i.getBackgroundColor());
+                        Vector newVector = new Vector(vector, vectorPermission, scale, i);
                         i.setOverlay(newVector);
+                        i.setVisible(false);
                         vectors.add(newVector);
                 }
@@ -1451 +1459 @@
                         if (lastEdited != LastEdited) {
                                 if (LastEdited.startsWith("@i")) {
+                                        // Check if its an image that can be resized to fit a box
+                                        // around it
+                                        String text = LastEdited.getText();
+                                        if (text.startsWith("@i:")
+                                                        && !Character.isDigit(text
+                                                                        .charAt(text.length() - 1))) {
+                                                Collection<Item> enclosure = FrameUtils
+                                                                .getEnclosingLineEnds(LastEdited.getPosition());
+                                                if (enclosure != null) {
+                                                        for (Item i : enclosure) {
+                                                                if (i.isLineEnd() && i.isEnclosed()) {
+                                                                        DisplayIO.getCurrentFrame().removeAllItems(
+                                                                                        enclosure);
+                                                                        Rectangle rect = i.getEnclosedRectangle();
+                                                                        LastEdited
+                                                                                        .setText(LastEdited.getText()
+                                                                                                        + " "
+                                                                                                        + Math.round(rect
+                                                                                                                        .getWidth()));
+                                                                        LastEdited.setPosition(new Point(rect.x,
+                                                                                        rect.y));
+                                                                        LastEdited.setThickness(i.getThickness());
+                                                                        LastEdited.setBorderColor(i.getColor());
+                                                                        break;
+                                                                }
+                                                        }
+                                                        FrameMouseActions.deleteItems(enclosure, false);
+                                                }
+                                        }
                                         toReparse = LastEdited.getParent();
                                 } else if (LastEdited.recalculateWhenChanged()) {

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

@@ -71 +71 @@
 
                 UserSettings.FrameDirs.add(FrameIO.FRAME_PATH);
+                UserSettings.FrameDirs.add(FrameIO.PUBLIC_PATH);
                 UserSettings.FrameDirs.add(FrameIO.PROFILE_PATH);
                 UserSettings.FrameDirs.add(FrameIO.HELP_PATH);

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

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Point;
+import java.text.NumberFormat;
 
+import org.expeditee.items.Item;
 import org.expeditee.items.Permission;
 
@@ -15 +18 @@
 
         public Color Background;
+        
+        public Item Source;
+        
+        public Dimension Size;
 
-        public Vector(Frame overlay, Permission permission, Point origin,
-                        Float scale, Color color, Color background) {
+        public Vector(Frame overlay, Permission permission,
+                        Float scale, Item source) {
                 super(overlay, permission);
-                Origin = origin;
+                Origin = source.getPosition();
                 Scale = scale;
-                Foreground = color;
-                Background = background;
+                Foreground = source.getColor();
+                Background = source.getBackgroundColor();
+                Source = source;
         }
 
@@ -54 +62 @@
                 return (y - Origin.y) / Scale;
         }
+
+        public void setSize(int maxX, int maxY) {
+                Size = new Dimension(maxX, maxY);
+        }
+
+        public static NumberFormat getNumberFormatter() {
+                NumberFormat nf = NumberFormat.getInstance();
+                nf.setMaximumFractionDigits(4);
+                return nf;
+        }
 }

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

@@ -6 +6 @@
 import java.lang.reflect.Method;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 
@@ -12 +13 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.Item;
+import org.expeditee.items.Line;
 import org.expeditee.items.Text;
 
@@ -63 +65 @@
                         _ItemTags.put("G", Item.class
                                         .getMethod("getBackgroundColor", param));
-                        _ItemTags.put("K", Item.class
-                                        .getMethod("getBorderColor", param));
+                        _ItemTags.put("K", Item.class.getMethod("getBorderColor", param));
                         _ItemTags.put("H", Item.class.getMethod("getAnchorRight", param));
                         _ItemTags.put("I", Item.class.getMethod("getAnchorBottom", param));
@@ -83 +84 @@
                         _ItemTags.put("e", Item.class.getMethod("getFillColor", param));
                         _ItemTags.put("E", Item.class.getMethod("getGradientColor", param));
-                        
+
                         _ItemTags.put("i", Item.class.getMethod("getFillPattern", param));
                         _ItemTags.put("o", Item.class.getMethod("getOwner", param));
@@ -96 +97 @@
                         _ItemTags.put("t", Text.class.getMethod("getSpacing", param));
 
-                        //TODO set a boolean flag to indicate that the text is a formula
-                        //Store the formula in the text property NOT the answer
+                        // TODO set a boolean flag to indicate that the text is a formula
+                        // Store the formula in the text property NOT the answer
                         _ItemTags.put("J", Item.class.getMethod("getFormula", param));
                         _ItemTags.put("T", Text.class.getMethod("getText", param));
@@ -138 +139 @@
         /**
          * Called before writing out the body items of each frame.
-         * @param starting the name of the frame currently being written out.
+         * 
+         * @param starting
+         *            the name of the frame currently being written out.
          * @throws IOException
          */
@@ -152 +155 @@
         /**
          * Called after writing out the body items of each frame.
-         * @param ending the name of the frame currently being written out.
+         * 
+         * @param ending
+         *            the name of the frame currently being written out.
          * @throws IOException
          */
@@ -160 +165 @@
         protected void initialise(Frame start) throws IOException {
                 if (_filename == null)
-                        _filename = FrameIO.EXPORTS_DIR + getValidFilename(start.getTitle()) + _format;
+                        _filename = FrameIO.EXPORTS_DIR
+                                        + getFileName(start) + _format;
 
                 if (_filename.equalsIgnoreCase(WriteTree.CLIPBOARD)) {
@@ -189 +195 @@
         }
 
+        protected String getFileName(Frame start) {
+                return getValidFilename(start.getTitle());
+        }
+
         public static String getValidFilename(String filename) {
                 return filename.replaceAll("[ \\.]", "_");
@@ -212 +222 @@
                 writeStartFrame(toWrite);
 
+                Collection<Item> done = new HashSet<Item>();
+
                 for (Item i : getItemsToWrite(toWrite)) {
-                        if (_stop){
+                        if (_stop) {
                                 return;
                         }
+
+                        if (i instanceof Line) {
+                                if (done.contains(i)) {
+                                        continue;
+                                }
+                                done.addAll(i.getAllConnected());
+                        }
                         writeItem(i);
                 }
-
                 writeEndFrame(toWrite);
         }
-        
+
         protected Collection<Item> getItemsToWrite(Frame toWrite) {
                 return toWrite.getItemsToSave();

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

@@ -8 +8 @@
 
 public class DefaultFramesetWriter extends DefaultFrameWriter {
-        private long  _firstFrame = 1;
-        private long _maxFrame = Long.MAX_VALUE;
+        protected long  _firstFrame = 1;
+        protected long _maxFrame = Long.MAX_VALUE;
         
         protected DefaultFramesetWriter(long firstFrame, long maxFrame){

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

@@ -4 +4 @@
 import java.util.List;
 
+import org.expeditee.items.Circle;
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
@@ -9 +10 @@
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.WidgetEdge;
 
 public abstract class ItemWriter {
@@ -22 +25 @@
 
         /**
-         * Called for each item on each frame to write out the contents of the items.
-         * @param toWrite the item to be written out.
+         * Called for each item on each frame to write out the contents of the
+         * items.
+         * 
+         * @param toWrite
+         *            the item to be written out.
          * @throws IOException
          */
@@ -38 +44 @@
                         writePicture((Picture) toWrite);
 
-                if (toWrite instanceof Line)
+                if (toWrite instanceof Line) {
+                        if (toWrite instanceof WidgetEdge) {
+                                writeWidget(((WidgetEdge) toWrite).getWidgetSource());
+                        }
                         writeLine((Line) toWrite);
+                }
 
                 if (toWrite instanceof Dot)
                         writeDot((Item) toWrite);
+
+                if (toWrite instanceof Circle)
+                        writeCircle((Circle) toWrite);
         }
 
@@ -52 +65 @@
                         writeAnnotationPicture((Picture) toWrite);
 
-                if (toWrite instanceof Line)
+                if (toWrite instanceof Line) {
                         writeAnnotationLine((Line) toWrite);
+                }
 
                 if (toWrite instanceof Dot)
@@ -80 +94 @@
         }
 
+        protected void writeCircle(Circle toWrite) throws IOException {
+        }
+
+        protected void writeWidget(InteractiveWidget toWrite) throws IOException {
+        }
+
         protected void writeDot(Item toWrite) throws IOException {
         }

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

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.Image;
 import java.io.FileOutputStream;
@@ -11 +13 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.UserSettings;
+import org.expeditee.items.Circle;
 import org.expeditee.items.Item;
+import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
+import org.expeditee.items.widgets.InteractiveWidget;
 
 import com.lowagie.text.Document;
@@ -26 +31 @@
  * 
  * @author root
- *
+ * 
  */
 public class PdfFramesetWriter extends DefaultFramesetWriter {
@@ -34 +39 @@
         private PdfWriter _pdfWriter;
 
-        public PdfFramesetWriter(long firstFrame, long maxFrame) {
+        private boolean _showFrameNames;
+
+        public PdfFramesetWriter(long firstFrame, long maxFrame,
+                        boolean showFrameNames) {
                 super(firstFrame, maxFrame);
                 Dimension d = FrameGraphics.getMaxSize();
                 _pdfDocument = new Document(new Rectangle(d.width, d.height));
+                _showFrameNames = showFrameNames;
         }
-        
+
         public PdfFramesetWriter() {
-                this(1, Long.MAX_VALUE);
+                this(1, Long.MAX_VALUE, false);
+        }
+
+        @Override
+        protected String getFileName(Frame start) {
+                String fileName = start.getFramesetName();
+                if (_maxFrame < Long.MAX_VALUE) {
+                        fileName += "_" + _firstFrame + "-" + _maxFrame;
+                }
+                return fileName;
         }
 
@@ -48 +66 @@
                 _format = ".pdf";
                 super.initialise(start);
+
                 try {
                         _pdfWriter = PdfWriter.getInstance(_pdfDocument,
@@ -68 +87 @@
         }
 
+        protected void writeStartFrame(Frame starting) throws IOException {
+                // TODO color in the frame background color
+
+                super.writeStartFrame(starting);
+        }
+
         protected void writeEndFrame(Frame ending) throws IOException {
+                if (_showFrameNames)
+                        writeText((Text) ending.getNameItem());
                 super.writeEndFrame(ending);
                 // Move to the next page
@@ -108 +135 @@
         protected void writePicture(Picture pic) throws IOException {
                 Image image = pic.getCroppedImage();
-                if(image == null)
+                if (image == null)
                         return;
                 try {
@@ -124 +151 @@
 
         @Override
+        protected void writeLine(Line lineEnd) throws IOException {
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+//              Color fill = lineEnd.getFillColor();
+//              if (fill != null) {
+//                      cb.setColorFill(fill);
+//              }
+                Graphics2D g = cb.createGraphicsShapes(
+                                FrameGraphics.getMaxSize().width,
+                                FrameGraphics.getMaxSize().height);
+                lineEnd.paint(g);
+//              if (fill != null) {
+//                      g.setPaint(fill);
+//              }
+//              lineEnd.paintFill(g);
+        }
+
+        @Override
         protected Collection<Item> getItemsToWrite(Frame toWrite) {
                 return toWrite.getVisibleItems();
         }
+        
+        @Override
+        protected void writeCircle(Circle toWrite) throws IOException {
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                Graphics2D g = cb.createGraphicsShapes(
+                                FrameGraphics.getMaxSize().width,
+                                FrameGraphics.getMaxSize().height);
+                toWrite.paint(g);
+        }
+        
+        
+        @Override
+        protected void writeWidget(InteractiveWidget toWrite) throws IOException {
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                Graphics2D g = cb.createGraphicsShapes(
+                                FrameGraphics.getMaxSize().width,
+                                FrameGraphics.getMaxSize().height);
+                toWrite.paint(g);
+        }
 }

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

@@ -192 +192 @@
                 dest._overlay = source._overlay;
                 dest._mode = source._mode;// SelectedMode.None;
+                //dest._highlightColor = source._highlightColor;
+                //dest.setHighlight(source.getHighlight());
+                
                 dest._visible = source._visible;
                 Frame parent = source.getParentOrCurrentFrame();
@@ -234 +237 @@
 
         private int _id;
+
+        private Item _editTarget = this;
 
         private String _creationDate = null;
@@ -1831 +1836 @@
 
         public int setHighlightColor(Color c) {
+                if (!this.isVisible() && this.hasVector()) {
+                        for (Item i : this.getParentOrCurrentFrame().getVectorItems()) {
+                                if (i.getEditTarget() == this) {
+                                        i.setHighlightColor(c);
+                                }
+                        }
+                }
 
                 _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
@@ -1890 +1902 @@
         public void setHighlightMode(HighlightMode mode, Color color) {
                 setHighlightColor(color);
-                if (hasPermission(Permission.followLinks)) {
+                if (hasPermission(Permission.followLinks)
+                                || getEditTarget().hasPermission(Permission.followLinks)) {
                         if (_mode != mode) {
                                 _mode = mode;
@@ -2666 +2679 @@
                 }
         }
+
+        /**
+         * Sets the item to be pickup when the user attempts to pick this item up.
+         * EditTarget has a value of 'this' by default but may be set to other
+         * values if this item is on a vector.
+         * 
+         * @param target
+         *            the item to be copied or picked up when the user attempts to
+         *            edit this item.
+         */
+        public void setEditTarget(Item target) {
+                _editTarget = target;
+        }
+
+        public Item getEditTarget() {
+                return _editTarget;
+        }
 }

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

@@ -457 +457 @@
 
                 for (Item i : toCopy) {
-
+                        //Dont copy parts of a vector
+                        if(!i.hasPermission(Permission.copy))
+                                continue;
+                        
                         // BROOK
                         if (i instanceof WidgetCorner) { // dont add these

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

@@ -275 +275 @@
 
         public void setAttributeValue(String value) {
-
+                AttributeValuePair avp = new AttributeValuePair(getText(),false);
+                avp.setValue(value);
+                setText(avp.toString());
         }
 

trunk/src/org/expeditee/items/widgets/DataFrameWidget.java

@@ -1 +1 @@
 package org.expeditee.items.widgets;
 
+import java.awt.Color;
+import java.awt.Graphics;
 import java.util.Collection;
 import java.util.HashSet;
 
 import javax.swing.JComponent;
-import javax.swing.JPanel;
 
 import org.expeditee.gui.Frame;
@@ -131 +132 @@
                 }
         }
-        
-        //STUFF FROM HEAVY_DUTY_INTERACTIVE_WIDGET CLASS
-        
-//      @Override
-//      public int getLoadDelayTime() {
-//              // TODO Auto-generated method stub
-//              return 0;
-//      }
-//
-//      @Override
-//      protected float loadWidgetData() {
-//              // TODO Auto-generated method stub
-//              return 0;
-//      }
-//
-//      @Override
-//      protected void saveWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      @Override
-//      protected void tempUnloadWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      @Override
-//      protected void unloadWidgetData() {
-//              // TODO Auto-generated method stub
-//              
-//      }
-//
-//      public boolean doesNeedSaving() {
-//              // TODO Auto-generated method stub
-//              return false;
-//      }
-//
-//      public String getSaveName() {
-//              // TODO Auto-generated method stub
-//              return null;
-//      }
+
+        protected void paintInFreeSpace(Graphics g) {
+                super.paintInFreeSpace(g);
+                g.setFont(((Text)getSource()).getFont());
+                g.setColor(Color.WHITE);
+                g.drawString(this.getClass().getSimpleName(), getX() + 10, getY() + 20);
+
+        }
 }

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
-import org.expeditee.gui.AttributeUtils;
+import org.expeditee.actions.Actions;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -184 +184 @@
                 String classname = tokens[0];
                 if (classname.charAt(0) == '$')
-                        classname = "org.expeditee.items.widgets." + classname.substring(1);
+                        classname = Actions.getClassName(classname.substring(1));
                 // Attempt to locate the class using reflection
                 Class<?> iwclass = findIWidgetClass(classname);

trunk/src/org/expeditee/items/widgets/charts/TimeSeries.java

@@ -211 +211 @@
                                 .length()) {
                         df = new SimpleDateFormat(FrameKeyboardActions.LONG_DATE_FORMAT);
-                } else {
+                } else if (dateString.length() <= FrameKeyboardActions.TIME_DATE_FORMAT.length()) {
+                        df = new SimpleDateFormat(FrameKeyboardActions.TIME_DATE_FORMAT);
+                }else {
                         df = new SimpleDateFormat(FrameKeyboardActions.SHORT_DATE_FORMAT);
                 }