Changeset 282

Timestamp:

08/27/08 09:18:49 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (7 diffs)
• actions/MailActions.java (modified) (4 diffs)
• actions/Misc.java (modified) (4 diffs)
• agents/MailTree.java (moved) (moved from trunk/src/org/expeditee/agents/MailFrame.java ) (3 diffs)
• agents/PdfFrameset.java (modified) (2 diffs)
• agents/mail/MailSession.java (modified) (7 diffs)
• gui/AttributeUtils.java (modified) (2 diffs)
• gui/Browser.java (modified) (1 diff)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (1 diff)
• gui/FrameCreator.java (modified) (11 diffs)
• gui/FrameGraphics.java (modified) (1 diff)
• gui/FrameIO.java (modified) (4 diffs)
• gui/FrameKeyboardActions.java (modified) (9 diffs)
• gui/FrameMouseActions.java (modified) (6 diffs)
• gui/FrameUtils.java (modified) (7 diffs)
• importer/TextImporter.java (modified) (1 diff)
• io/DefaultFramesetWriter.java (modified) (1 diff)
• io/PDF2Writer.java (modified) (2 diffs)
• io/PDFWriter.java (modified) (1 diff)
• io/PdfFramesetWriter.java (moved) (moved from trunk/src/org/expeditee/io/PDF3Writer.java ) (4 diffs)
• items/Dot.java (modified) (4 diffs)
• items/FrameImage.java (modified) (1 diff)
• items/Item.java (modified) (10 diffs)
• items/Picture.java (modified) (2 diffs)
• items/Text.java (modified) (6 diffs)
• items/XRayable.java (modified) (3 diffs)
• items/widgets/InteractiveWidget.java (modified) (14 diffs)
• simple/SVariable.java (modified) (1 diff)
• simple/Variables.java (modified) (1 diff)

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

@@ -234 +234 @@
          */
         public static void LoadMethods(Class c) {
-                assert(c != null);
-                
+                assert (c != null);
+
                 // list of methods to test
                 Method[] toLoad = c.getMethods();
@@ -306 +306 @@
                 String mname = getName(command);
                 command = command.substring(mname.length()).trim();
-                //If no params are provided get them from a text item on the cursor
-                if(command.length() == 0 && launcher instanceof Text){
+                // If no params are provided get them from a text item on the cursor
+                if (command.length() == 0 && launcher instanceof Text) {
                         command = launcher.getText();
                 }
@@ -366 +366 @@
                         }
                 }
-                //If the actions was not found... then it is run as an agent
+                // If the actions was not found... then it is run as an agent
                 assert (possibles.size() > 0);
                 throw new RuntimeException("Incorrect parameters for " + mname);
@@ -412 +412 @@
                         // determine correct parameters for constructor
                         for (Constructor c : constructors) {
-                                if (parameters.length() > 0
-                                                && c.getParameterTypes().length == 1) {
+                                Class[] paramTypes = c.getParameterTypes();
+                                int paramCount = paramTypes.length;
+                                if (paramCount > 0) {
+                                        params = new Object[paramCount];
+                                        String[] paramStrings = parameters.split("\\s+");
+                                        if (paramCount != paramStrings.length)
+                                                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) {
+                                                                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 {
+                                                        continue;
+                                                }
+                                        }
                                         con = c;
-                                        params = new String[1];
-                                        params[0] = parameters;
                                         break;
                                 } else if (c.getParameterTypes().length == 0 && con == null) {
@@ -543 +567 @@
 
                 // if the first class in the list is a frame or item, it is the source
-                //or launcher
+                // or launcher
                 // length must be at least one if we are still running
                 if (paramTypes[ind] == Frame.class) {
@@ -550 +574 @@
                 }
 
-                //Check if the second item is an item
+                // Check if the second item is an item
                 if (paramCount > ind && Item.class.isAssignableFrom(paramTypes[ind])) {
                         objects[ind] = launcher;
                         ind++;
-                }//If there is stuff on the cursor use it for the rest of the params
-                else if (launcher != null && launcher.isFloating()){
+                }// If there is stuff on the cursor use it for the rest of the params
+                else if (launcher != null && launcher.isFloating()) {
                         values = launcher.getText();
                 }
@@ -702 +726 @@
         }
 
-        public static Object PerformActionCatchErrors(Frame current, Item launcher, String command) {
-                try{
+        public static Object PerformActionCatchErrors(Frame current, Item launcher,
+                        String command) {
+                try {
                         return PerformAction(current, launcher, command);
-                }catch(Exception e) {
+                } catch (Exception e) {
                         MessageBay.errorMessage(e.getMessage());
                 }

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

@@ -5 +5 @@
 import org.expeditee.agents.mail.MailSession;
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 public class MailActions {
@@ -27 +31 @@
 
         public static String getNewMailString() {
-                String mail = MailSession.getInstance().getMailString(Flag.RECENT, true);
+                String mail = MailSession.getInstance()
+                                .getMailString(Flag.RECENT, true);
                 if (mail.length() == 0) {
                         return "No new mail";
@@ -41 +46 @@
                 return mail;
         }
-        
+
         public static void getUnreadMail() {
-                MailSession.getInstance().getMail(Flag.SEEN, false, DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
+                MailSession.getInstance().getMail(Flag.SEEN, false,
+                                DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
         }
-        
+
         public static void getAllMail() {
-                MailSession.getInstance().getMail(null, null, DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
+                MailSession.getInstance().getMail(null, null,
+                                DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
         }
-        
+
         public static void getNewMail() {
-                MailSession.getInstance().getMail(Flag.RECENT, true, DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
+                MailSession.getInstance().getMail(Flag.RECENT, true,
+                                DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition());
         }
 
@@ -83 +91 @@
         }
 
+        public static void reply(Frame frame, Item reply) {
+                String fromAddress = frame.getAnnotationValue("from");
+                if (fromAddress == null) {
+                        return;
+                }
+                String fromName = frame.getAnnotationValue("fromName");
+                
+                reply.setActions(null);
+                FrameMouseActions.tdfc(reply);
+                
+                Frame replyFrame = DisplayIO.getCurrentFrame();
+                replyFrame.setTitle("RE: " + frame.getTitle());
+                FrameKeyboardActions.Drop(null, false);
+                Text original = replyFrame.createNewText("@original");
+                original.setPosition(FrameMouseActions.getPosition());
+                original.setLink(frame.getName());
+                FrameKeyboardActions.Drop(original, false);
+                
+                Text to = replyFrame.createNewText("@to: " + fromAddress);
+                to.setPosition(FrameMouseActions.getPosition());
+                to.addAction("MailFrame");
+                FrameKeyboardActions.Drop(to, false);
+                if (fromName != null) {
+                        Text toName = replyFrame.createNewText("@toName: " + fromName);
+                        toName.setPosition(FrameMouseActions.getPosition());
+                        FrameKeyboardActions.Drop(toName, false);
+                }
+        }
+
 }

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

@@ -107 +107 @@
          * 
          */
-        public static void DeleteFrame() {
-                Frame toDelete = DisplayIO.getCurrentFrame();
+        public static void DeleteFrame(Frame toDelete) {
                 String deletedFrame = toDelete.getName();
                 String deletedFrameNameLowercase = deletedFrame.toLowerCase();
@@ -770 +769 @@
         public static void importFiles(Item item) {
                 List<File> files = new LinkedList<File>();
-                for (String s : item.getText().split("\n")) {
-                        File file = new File(s);
+                for (String s : item.getText().split("\\s+")) {
+                        File file = new File(s.trim());
                         if (file.exists()) {
                                 files.add(file);
@@ -784 +783 @@
 
         public static void importFile(Item item) {
-                File file = new File(item.getText());
+                File file = new File(item.getText().trim());
                 if (file.exists()) {
                         try {
@@ -810 +809 @@
                 double curAngle = 0;
                 double size = 50F;
-                if (item instanceof Dot && item.getLines().size() > 0) {
+                if (item.isLineEnd() && item.getLines().size() > 0) {
                         item = item.getLines().get(0);
                 }

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

@@ -8 +8 @@
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
-public class MailFrame extends DefaultAgent {
+public class MailTree extends DefaultAgent {
 
         @Override
         public boolean initialise(Frame frame, Item item) {
                 return super.initialise(frame, item);
+        }
+
+        private String getFrameText(Frame frame, String prefix) {
+                StringBuffer sb = new StringBuffer();
+                // Get the text to mail
+                for (Text t : frame.getBodyTextItems(false)) {
+                        if (t.hasLink()) {
+                                Frame linkedFrame = FrameIO.LoadFrame(t.getAbsoluteLink());
+                                if (linkedFrame == null)
+                                        continue;
+
+                                String frameTitle = linkedFrame.getTitle();
+                                sb.append(prefix).append(frameTitle).append('\n')
+                                                .append(prefix);
+                                for (int i = 0; i < frameTitle.length(); i++) {
+                                        sb.append('-');
+                                }
+                                sb.append("\n\n");
+                                sb.append(getFrameText(linkedFrame, prefix));
+                        } else {
+                                sb.append(prefix).append(t.getText()).append("\n\n");
+                        }
+                }
+
+                Text original = frame.getAnnotation("original");
+                if (original != null) {
+                        Frame linkedFrame = FrameIO.LoadFrame(original.getAbsoluteLink());
+                        if (linkedFrame != null) {
+                                sb.append("\n\n").append("Original Message").append(
+                                                "----------------").append("\n\n");
+                                sb.append(getFrameText(linkedFrame, ">"));
+                        }
+                }
+
+                return sb.toString();
         }
 
@@ -30 +66 @@
         protected Frame process(Frame frame) {
                 String subject = frame.getTitle();
-                List<Text> text = frame.getBodyTextItems(false);
-                StringBuilder body = new StringBuilder();
-                for (Text t : text) {
-                        body.append(t.getText()).append("\n\n");
-                }
+
+                // Get the text to mail
+                String body = getFrameText(frame, "");
+
                 String to = frame.getAnnotationValue("to");
                 String cc = frame.getAnnotationValue("cc");
@@ -115 +150 @@
                 // Allow the user to do other stuff while the message gets sent
                 _running = false;
-                MailSession.sendTextMessage(to, cc, bcc, subject, body.toString());
+                MailSession.sendTextMessage(to, cc, bcc, subject, body, null);
 
                 return null;

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

@@ -1 +1 @@
 package org.expeditee.agents;
 
-import java.awt.Dimension;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
+import java.io.IOException;
 
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
-import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.UserSettings;
+import org.expeditee.gui.MessageBay;
+import org.expeditee.io.PdfFramesetWriter;
 
-import com.lowagie.text.Document;
-import com.lowagie.text.DocumentException;
-import com.lowagie.text.Rectangle;
-import com.lowagie.text.pdf.PdfContentByte;
-import com.lowagie.text.pdf.PdfWriter;
 
 public class PdfFrameset extends DefaultAgent {
-        private long _firstFrame = 1;
+        private PdfFramesetWriter _pdfWriter;
+        
+        private int _firstFrame = 1;
 
-        private long _maxFrame = Integer.MAX_VALUE;
+        private int _maxFrame = Integer.MAX_VALUE;
 
-        public PdfFrameset(long firstFrame, long maxFrame) {
+        public PdfFrameset(int firstFrame, int maxFrame) {
                 super();
                 _firstFrame = firstFrame;
@@ -35 +29 @@
         @Override
         protected Frame process(Frame frame) {
-                String framesetName = frame.getFramesetName();
-                String fileName = FrameIO.EXPORTS_DIR + framesetName + ".pdf";
-                int count = FrameIO.getLastNumber(framesetName);
-
-                Dimension d = FrameGraphics.getMaxSize();
-                Document _pdfDocument = new Document(new Rectangle(d.width, d.height));
+                _pdfWriter = new PdfFramesetWriter(_firstFrame, _maxFrame);
                 
-                PdfContentByte cb = null;
                 try {
-                        PdfWriter writer = PdfWriter.getInstance(_pdfDocument,
-                                        new FileOutputStream(fileName));
-                        _pdfDocument.open();
-                        _pdfDocument.addCreationDate();
-                        _pdfDocument.addAuthor(UserSettings.Username);
-                        _pdfDocument.addCreator("Expeditee");
-                        cb = writer.getDirectContent();
-
-                } catch (FileNotFoundException e) {
-                        e.printStackTrace();
-                        return null;
-                } catch (DocumentException e) {
-                        e.printStackTrace();
-                        return null;
+                        _pdfWriter.writeFrame(frame);
+                } catch (IOException e) {
+                        MessageBay.errorMessage("PdfFrameset error: " + e.getMessage());
+                        //e.printStackTrace();
                 }
-
-                for (long i = _firstFrame; i <= _maxFrame && i <= count; i++) {
-                        if (_stop) {
-                                break;
-                        }
-                        String frameName = framesetName + i;
-                        Frame toPaint = FrameIO.LoadFrame(frameName);
-                        if (toPaint != null) {
-                                overwriteMessage("Converting " + frameName);
-                                java.awt.Graphics2D g2 = cb.createGraphics(FrameGraphics
-                                                .getMaxSize().width, FrameGraphics.getMaxSize().height);
-                                FrameGraphics.paintFrame(toPaint, null, false, false, g2);
-                                g2.dispose();
-                                // Move to the next page?
-                                _pdfDocument.setPageCount(_pdfDocument.getPageNumber() + 1);
-                        }
-                }
-                try {
-                        _pdfDocument.close();
-                } catch (Exception e) {
-                        overwriteMessage("Error writing PDF document");
-                }
+                
                 return null;
         }
+        
+        @Override
+        public void stop(){
+                _pdfWriter.stop();
+        }
 }

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

@@ -224 +224 @@
 
         public static boolean sendTextMessage(String to, String cc, String bcc,
-                        String subject, String body) {
+                        String subject, String body, Object attachments) {
 
                 if (_theMailSession == null) {
@@ -236 +236 @@
                 }
 
-                return _theMailSession.sendText(to, cc, bcc, subject, body);
+                return _theMailSession.sendText(to, cc, bcc, subject, body, attachments);
         }
 
         private synchronized boolean sendText(String to, String cc, String bcc,
-                        String subject, String body) {
+                        String subject, String body, Object attachments) {
                 if (!_transport.isConnected()) {
                         MessageBay
@@ -263 +263 @@
                         // -- Create a new message --
                         Message msg = new MimeMessage(_session);
-
+                        
                         // -- Set the FROM and TO fields --
                         msg.setFrom(new InternetAddress(_address));
@@ -409 +409 @@
                                 if (flag == null
                                                 || msgs[msgNum].getFlags().contains(flag) == isPresent) {
-                                        Item newItem = readMessage(msgs[msgNum], msgNum, frame, point);
+                                        Item newItem = readMessage(msgs[msgNum], msgNum, frame,
+                                                        point);
                                         if (newItem != null) {
                                                 mailItems.add(newItem);
@@ -423 +424 @@
         }
 
-        private Item readMessage(final Message message, int messageNo, Frame frame, Point point) {
-                String subject;
-                try {
-                        subject = message.getSubject();
-                } catch (MessagingException e) {
-                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
-                        return null;
-                }
-
-                final Text source = FrameDNDTransferHandler
-                                .importString(subject, point);
-                // Create a frameCreator
-                final FrameCreator frames = new FrameCreator(frame.getFramesetName(),
-                                frame.path, messageNo + ". " + subject, false);
+        private Item readMessage(final Message message, final int messageNo,
+                        final Frame frame, final Point point) {
+
+                final Text source = FrameDNDTransferHandler.importString(
+                                "Loading message " + messageNo, point);
 
                 new Thread() {
                         public void run() {
                                 try {
+                                        String subject = message.getSubject();
+                                        source.setText(messageNo + ". " + subject);
+                                        // Create a frameCreator
+                                        final FrameCreator frames = new FrameCreator(frame
+                                                        .getFramesetName(), frame.path, subject, false);
+
                                         // Get the header information
                                         String from = ((InternetAddress) message.getFrom()[0])
                                                         .getPersonal();
-                                        if( from != null){
-                                                frames.addText("@fromName: " + from, null, null, null, false);
+                                        if (from != null) {
+                                                frames.addText("@fromName: " + from, null, null, null,
+                                                                false);
                                         }
                                         from = ((InternetAddress) message.getFrom()[0])
-                                                                .getAddress();
-                                        frames.addText("@fromAddress: " + from, null, null, null, false);
+                                                        .getAddress();
+                                        Text fromAddressItem = frames.addText("@from: " + from,
+                                                        null, null, null, false);
+
+                                        Text reply = frames.addText("@reply" + from, null, null,
+                                                        null, false);
+                                        reply.setPosition(10 + fromAddressItem.getX()
+                                                        + fromAddressItem.getBoundsWidth(), fromAddressItem
+                                                        .getY());
 
                                         // -- Get the message part (i.e. the message itself) --
@@ -461 +467 @@
                                         }
                                         // -- Get the content type --
-                                        String contentType = messagePart.getContentType().toLowerCase();
+                                        String contentType = messagePart.getContentType()
+                                                        .toLowerCase();
                                         // -- If the content is plain text, we can print it --
                                         // System.out.println("CONTENT:" + contentType);
@@ -479 +486 @@
                                         frames.save();
                                         source.setLink(frames.getName());
+                                } catch (MessagingException e) {
+                                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
                                 } catch (Exception e) {
-                                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
+                                        MessageBay.errorMessage("Error reading mail: "
+                                                        + e.getMessage());
                                 }
                         }

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

@@ -351 +351 @@
                                                         o = i;
                                         } else if (o instanceof Float) {
-                                                // -1 indicates default value
-                                                if (((Float) o) < 0.0001)
+                                                if (((Float) o) < -0.0001)
                                                         continue;
+                                                //Null indicates default
                                                 o = Math.round((Float) o);
                                         } else if (o instanceof Double) {
@@ -398 +398 @@
                                                         sb.append(values[i]).append(' ');
                                                 }
-                                                sb.deleteCharAt(attributes.length() - 1);
+                                                sb.deleteCharAt(sb.length() - 1);
                                                 o = sb.toString();
                                         } else if (o instanceof Boolean) {

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

@@ -207 +207 @@
                         // Must be loaded after setupGraphics if images are on the frame
                         // Turn off XRay mode and load the first frame
+                        FrameGraphics.setMode(FrameGraphics.MODE_NORMAL, false);
                         FrameUtils.loadFirstFrame(profile);
-                        FrameGraphics.setMode(FrameGraphics.MODE_NORMAL, false);
                         DisplayIO.UpdateTitle();
 

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

@@ -69 +69 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp08Aug2008A";
+        public static final String TITLE = "Exp27Aug2008A";
 
         private DisplayIO() {

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

@@ -696 +696 @@
                         InteractiveWidget iw = ((WidgetCorner) item).getWidgetSource();
                         if (!this._iWidgets.contains(iw)) { // A set would have been
-                                // best
-                                _iWidgets.add(iw);
+                                if(FrameMouseActions.isControlDown())
+                                        _iWidgets.add(iw);
+                                else
+                                        _iWidgets.add(0, iw);
                         }
                 }

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

@@ -23 +23 @@
 
         private Item _Mprev;
+        
+        private Item _Mfirst;
 
         // Next and previous links for the current frame
@@ -29 +31 @@
         private Item _prev;
 
-        private Frame _first;
+        private Frame _firstFrame;
 
         public FrameCreator(String frameTitle) {
@@ -55 +57 @@
          * @return the newly created button.
          */
-        public Item createButton(String text, Float x, Float y, Float right,
+        public static Item createButton(String text, Float x, Float y, Float right,
                         Float bottom) {
-                Item button = new Text(text);
+                Text button = new Text(text);
                 button.setBackgroundColor(Color.LIGHT_GRAY);
                 button.setBorderColor(Color.DARK_GRAY);
@@ -66 +68 @@
                         button.setX(x);
                 if (right != null)
-                        button.setAnchorRight(15F);
+                        button.setAnchorRight(right);
                 if (y != null)
                         button.setY(y);
 
+                button.updatePolygon();
+                
                 return button;
         }
@@ -75 +79 @@
         public FrameCreator(String name, String path, String frameTitle,
                         boolean recreate) {
-                _Mnext = createButton("@Next", null, null, 15F, 15F);
-                _Mprev = createButton("@Previous", 30F, null, null, 15F);
-
+
+                _Mnext = createButton("@Next", null, null, 10F, 15F);
+
+                _Mprev = createButton("@Previous", null, null, _Mnext.getBoundsWidth() + _Mnext.getAnchorRight() + 20F, 15F);
+                
+                _Mfirst = createButton("@First", null, null, _Mprev.getBoundsWidth() + _Mprev.getAnchorRight() + 20F, 15F);
+                
                 Frame toUse = null;
                 try {
@@ -88 +96 @@
 
                 resetGlobals(toUse);
-                _first = toUse;
+                _firstFrame = toUse;
                 // set positions of next\prev frame links
                 // _Mnext.setPosition(FrameGraphics.getMaxSize().width - 100,
@@ -96 +104 @@
 
         public String getName() {
-                return _first.getName();
+                return _firstFrame.getName();
         }
 
@@ -110 +118 @@
 
                         // add link to previous frame
-                        _prev = _Mprev.copy();
-                        _prev.setID(newFrame.getNextItemID());
-                        _prev.setLink(_current.getName());
-                        newFrame.addItem(_prev);
+                        _prev = addPreviousButton(newFrame, _current.getName()); 
 
                         // add link to new frame
-                        _next = _Mnext.copy();
-                        _next.setID(_current.getNextItemID());
-                        _next.setLink(newFrame.getName());
-                        _current.addItem(_next);
+                        _next = addNextButton(_current,newFrame.getName());
+                        
+//                       add link to new frame
+                        addFirstButton(newFrame,_firstFrame.getName());
+                        
                         FrameIO.SaveFrame(_current, false);
 
@@ -193 +199 @@
         }
 
-        public void addText(String toAdd, Color c, String link, String action,
+        public Text addText(String toAdd, Color c, String link, String action,
                         boolean bSave) {
                 Text text = _current.createNewText();
@@ -202 +208 @@
 
                 addItem(text, bSave);
+                
+                return text;
         }
 
@@ -221 +229 @@
 
         public Frame getFirstFrame() {
-                return _first;
+                return _firstFrame;
+        }
+
+        public Item addNextButton(Frame current, String link) {
+                return addButton(_Mnext, current, link);
+        }
+        
+        public Item addPreviousButton(Frame current, String link) {
+                return addButton(_Mprev, current, link);
+        }
+        
+        public Item addFirstButton(Frame current, String link) {
+                return addButton(_Mfirst, current, link);
+        }
+        
+        public Item addButton(Item template, Frame current, String link) {
+                // add link to new frame
+                Item previousButton = template.copy();
+                previousButton.setID(current.getNextItemID());
+                previousButton.setLink(link);
+                current.addItem(previousButton);
+                
+                return previousButton;
         }
 }

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

@@ -349 +349 @@
                 // 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
+                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

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

@@ -121 +121 @@
                 MessageBay.supressMessages(true);
                 // loading automatically caches the frame is caching is turned on
-                LoadUnknownPath(framename);
+                LoadUnknownPath(framename, false);
                 MessageBay.supressMessages(false);
         }
@@ -143 +143 @@
 
         public static Frame LoadFrame(String frameName) {
+                return LoadFrame(frameName, false);
+        }
+        
+        public static Frame LoadFrame(String frameName, boolean ignoreAnnotations) {
                 if (!isValidFrameName(frameName))
                         return null;
@@ -157 +161 @@
                 Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName
                                 + " from disk.");
-                return LoadUnknownPath(frameName);
-        }
-
-        private static Frame LoadUnknownPath(String framename) {
+                return LoadUnknownPath(frameName, ignoreAnnotations);
+        }
+
+        private static Frame LoadUnknownPath(String framename, boolean ignoreAnnotations) {
                 Frame loaded = null;
 
@@ -166 +170 @@
                         loaded = LoadFrame(path, framename);
                         if (loaded != null) {
-                                FrameUtils.Parse(loaded, true);
+                                FrameUtils.Parse(loaded, true, ignoreAnnotations);
                                 break;
                         }

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

@@ -38 +38 @@
         private static Text _toRemove = null;
 
+        private static Collection<Item> _enclosedItems = null;
+        
+        public static void resetEnclosedItems() {
+                _enclosedItems = null;
+        }
+
         public synchronized void keyTyped(KeyEvent e) {
                 if (Simple.isProgramRunning()) {
@@ -324 +330 @@
         public void keyPressed(KeyEvent e) {
                 int keyCode = e.getKeyCode();
+                
+                if(keyCode != KeyEvent.VK_F1 && keyCode != KeyEvent.VK_F2){
+                        resetEnclosedItems();
+                }
+                
                 SessionStats.AddFrameEvent("k" + KeyEvent.getKeyText(keyCode));
 
@@ -516 +527 @@
         }
 
-        /**
-         * Currently ignored.
-         */
+
         public void keyReleased(KeyEvent e) {
                 if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
@@ -761 +770 @@
                                         Item lastItem = null;
 
-                                        boolean drop = currentFrame.hasAnnotation("more");
+                                        boolean drop = currentFrame.hasAnnotation("next");
                                         // separate the clipboard content into items based on
                                         // blank lines
@@ -1118 +1127 @@
          *            indicate the cursor is in free space.
          */
-        private static void Drop(Item toDropFrom, boolean bPasting) {
+        public static void Drop(Item toDropFrom, boolean bPasting) {
                 try {
                         FrameUtils.setLastEdited(null);
@@ -1191 +1200 @@
                                 Frame current = DisplayIO.getCurrentFrame();
                                 Item itemTemplate = current.getItemTemplate();
-                                int xPos = title.getX();
+                                int xPos = title.getX() + 25;
                                 int yPos = title.getY() + title.getBoundsHeight()
                                                 + itemTemplate.getBoundsHeight();
@@ -1219 +1228 @@
                                                 || dummyItem.getY() > FrameGraphics.getMaxFrameSize()
                                                                 .getHeight()) {
-                                        // Check for the @more tag!
+                                        // Check for the 'next' tag!
                                         Frame current = DisplayIO.getCurrentFrame();
-                                        Item i = current.getAnnotation("more");
-
-                                        if (i != null) {
+                                        Item next = current.getAnnotation("next");
+                                        Item prev = current.getAnnotation("previous");
+                                        // Check for an unlinked next tag
+                                        if ((next != null && !next.hasLink())
+                                                        || (prev != null && prev.hasLink())) {
                                                 Frame firstFrame = current;
-                                                boolean mouseMoved = FrameMouseActions.tdfc(i);
+                                                if (next != null)
+                                                        next.delete();
+                                                FrameCreator frameCreator = new FrameCreator(null);
+                                                // Add the next button
+                                                next = frameCreator.addNextButton(current, null);
+
+                                                // Create the new frame linked to the next tag
+                                                boolean mouseMoved = FrameMouseActions.tdfc(next);
                                                 Frame moreFrame = DisplayIO.getCurrentFrame();
-                                                // Add the @more if we are pasting
-                                                if (bPasting) {
-                                                        Item copy = i.copy();
-                                                        copy.setLink(null);
-                                                        moreFrame.addItem(copy);
+
+                                                // Add previous button to the new frame
+                                                frameCreator.addPreviousButton(moreFrame, firstFrame
+                                                                .getName());
+                                                Item first = current.getAnnotation("first");
+                                                if (first != null) {
+                                                        frameCreator.addFirstButton(moreFrame, first
+                                                                        .getLink());
+                                                } else {
+                                                        frameCreator.addFirstButton(moreFrame, firstFrame
+                                                                        .getName());
                                                 }
+                                                // Add the @next if we are pasting
+                                                // if (bPasting) {
+                                                // Item copy = next.copy();
+                                                // copy.setLink(null);
+                                                // moreFrame.addItem(copy);
+                                                // }
 
                                                 moreFrame.setTitle(firstFrame.getTitleItem().getText());
                                                 // need to move the mouse to the top of the frame if
-                                                // there
-                                                // wasnt an @start on it
+                                                // there wasnt an @start on it
                                                 if (!mouseMoved) {
                                                         Item moreTitle = moreFrame.getTitleItem();
@@ -1489 +1518 @@
                         // change copying to copy only the stuff completely enclosed
                         if (insideEnclosure) {
-                                for (Item i : FrameUtils.getCurrentItems(toSet)) {
-                                        if (i.hasPermission(Permission.full) && !toSize.contains(i))
-                                                toSize.addAll(i.getAllConnected());
-                                }
+                                if (_enclosedItems == null) {
+                                        for (Item i : FrameUtils.getCurrentItems(toSet)) {
+                                                if (i.hasPermission(Permission.full)
+                                                                && !toSize.contains(i))
+                                                        toSize.addAll(i.getAllConnected());
+                                        }
+                                        _enclosedItems = toSize;
+                                } else {
+                                        toSize = _enclosedItems;
+                                }
+
                         }// Enclosed circle centers are resized with the center as origin
                         // Just add the circle center to the list of items to size
@@ -1570 +1606 @@
                                 if (i instanceof Text && i.getSize() != oldSize) {
                                         i.translate(origin, resizeRatio);
+                                        if (i.isLineEnd()) {
+                                                i.setPosition(i.getPosition());
+                                        }
                                 }
                         }

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

@@ -1548 +1548 @@
 
         private static boolean _controlDown;
+        
+        public static boolean isControlDown() {
+                return _controlDown;
+        }
 
         public static void setLastRobotMove(float x, float y) {
@@ -1573 +1577 @@
 
         private void mouseMoved(MouseEvent e, boolean shiftStateChanged) {
+                FrameKeyboardActions.resetEnclosedItems();
                 // System.out.println(e.getX() + "," + e.getY() + " " + e.getWhen());
                 if (LastRobotX != null) {
@@ -2220 +2225 @@
                         ItemUtils.EnclosedCheck(parent.getItems());
                         if (toDelete.hasOverlay()) {
-                                FrameUtils.Parse(parent, false);
+                                FrameUtils.Parse(parent, false, false);
                                 FrameGraphics.requestRefresh(false);
                         }
@@ -2294 +2299 @@
                 itemList.clear();
                 if (bReparse)
-                        FrameUtils.Parse(currentFrame, false);
+                        FrameUtils.Parse(currentFrame, false, false);
 
         }
@@ -2631 +2636 @@
                 }
                 if (bReparse)
-                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false);
+                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false, false);
 
                 FrameGraphics.Repaint();
@@ -2724 +2729 @@
                 }
                 if (bReparse)
-                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false);
+                        FrameUtils.Parse(DisplayIO.getCurrentFrame(), false, false);
                 FrameGraphics.Repaint();
         }

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

@@ -734 +734 @@
          */
         public static void Parse(Frame toParse, boolean firstParse) {
+                Parse(toParse, firstParse, false);
+        }
+
+        /**
+         * 
+         * @param toParse
+         * @param firstParse
+         * @param ignoreAnnotations
+         *            used to prevent infinate loops such as when performing TDFC
+         *            with an ao tag linked to a frame with an frameImage of a frame
+         *            which also has an ao tag on it.
+         */
+        public static void Parse(Frame toParse, boolean firstParse,
+                        boolean ignoreAnnotations) {
                 // TODO check why we are getting toParse == null... when profile frame
                 // is being created and change the lines below
@@ -833 +847 @@
                                                 }
                                                 // check for new OVERLAY items
-                                                else if (ItemUtils.startsWithTag(i,
+                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
                                                                 ItemUtils.TAG_OVERLAY)
                                                                 && i.getLink() != null) {
@@ -856 +870 @@
                                                 }
                                                 // check for ACTIVE_OVERLAY items
-                                                else if (ItemUtils.startsWithTag(i,
+                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
                                                                 ItemUtils.TAG_ACTIVE_OVERLAY)
                                                                 && i.getLink() != null) {
@@ -1143 +1157 @@
         /**
          * 
-         * @param currentItem 
+         * @param currentItem
          * @return
          */
@@ -1149 +1163 @@
                 return getCurrentItems(getCurrentItem());
         }
-        
+
         public static Collection<Item> getCurrentItems(Item currentItem) {
 
@@ -1186 +1200 @@
 
         public static Collection<Item> getEnclosingLineEnds() {
-                return getEnclosingLineEnds(new Point(DisplayIO.getMouseX(), FrameMouseActions.getY()));
-        }
-        
+                return getEnclosingLineEnds(new Point(DisplayIO.getMouseX(),
+                                FrameMouseActions.getY()));
+        }
+
         public static Collection<Item> getEnclosingLineEnds(Point position) {
                 // update enclosed shapes
@@ -1451 +1466 @@
                 if (!FrameGraphics.isXRayMode()) {
                         if (toReparse != null) {
-                                Parse(toReparse, false);
+                                Parse(toReparse, false, false);
                         } else if (toRecalculate != null) {
                                 toRecalculate.recalculate();

trunk/src/org/expeditee/importer/TextImporter.java

@@ -26 +26 @@
                 final String fullPath = f.getAbsolutePath();
 
-                final Text source = FrameDNDTransferHandler.importString(f.getName(),
+                final Text source = FrameDNDTransferHandler.importString(f.getPath(),
                                 location);
 

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

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

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

@@ -23 +23 @@
 import com.lowagie.text.pdf.PdfWriter;
 
+/**
+ * 
+ * @author root
+ *
+ */
 public class PDF2Writer extends DefaultFrameWriter {
 
@@ -99 +104 @@
                         cb.addImage(iTextImage);
                 } catch (DocumentException e) {
-                        // TODO Auto-generated catch block
                         e.printStackTrace();
                 }

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

@@ -18 +18 @@
 import com.lowagie.text.pdf.PdfWriter;
 
+/**
+ * Writes out a tree in a linear format.
+ * @author root
+ *
+ */
 public class PDFWriter extends DefaultTreeWriter {
 

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

@@ -23 +23 @@
 import com.lowagie.text.pdf.PdfWriter;
 
-public class PDF3Writer extends DefaultFramesetWriter {
+/**
+ * 
+ * @author root
+ *
+ */
+public class PdfFramesetWriter extends DefaultFramesetWriter {
 
         private Document _pdfDocument;
@@ -29 +34 @@
         private PdfWriter _pdfWriter;
 
-        public PDF3Writer() {
+        public PdfFramesetWriter(long firstFrame, long maxFrame) {
+                super(firstFrame, maxFrame);
                 Dimension d = FrameGraphics.getMaxSize();
                 _pdfDocument = new Document(new Rectangle(d.width, d.height));
+        }
+        
+        public PdfFramesetWriter() {
+                this(1, Long.MAX_VALUE);
         }
 
@@ -60 +70 @@
         protected void writeEndFrame(Frame ending) throws IOException {
                 super.writeEndFrame(ending);
-                // Move to the next page?
+                // Move to the next page
                 _pdfDocument.newPage();
-                //int nextPage = _pdfDocument.getPageNumber() + 1;
-                //_pdfDocument.setPageCount(nextPage);
         }
 
@@ -100 +108 @@
         protected void writePicture(Picture pic) throws IOException {
                 Image image = pic.getCroppedImage();
+                if(image == null)
+                        return;
                 try {
                         PdfContentByte cb = _pdfWriter.getDirectContent();

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

@@ -74 +74 @@
         @Override
         public void setAnchorBottom(Float anchor) {
-                if(!isLineEnd()){
+                if (!isLineEnd()) {
                         super.setAnchorBottom(anchor);
                         return;
@@ -84 +84 @@
                         float deltaY = FrameGraphics.getMaxFrameSize().height - anchor
                                         - getBoundsHeight() - oldY;
-                        //Check for a more efficient way to do this!!
-                        //Invalidate all the items
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
-                        //Move the items
-                        for (Item i : this.getAllConnected()) {
-                                if (i.isLineEnd()){
-                                        i.setAnchorBottom(null);
-                                        i.setXY(i.getX(), i.getY() + deltaY);
-                                        i.updatePolygon();
-                                        i.invalidateAll();
-                                }
-                        }
-                        //Invalidate them again!!
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
+                        anchorConnected(null, deltaY);
                 }
                 this._anchorBottom = anchor;
@@ -107 +90 @@
                 invalidateFill();
         }
-        
+
         @Override
         public void setAnchorRight(Float anchor) {
-                if(!isLineEnd()){
+                if (!isLineEnd()) {
                         super.setAnchorRight(anchor);
                         return;
@@ -120 +103 @@
                         float deltaX = FrameGraphics.getMaxFrameSize().width - anchor
                                         - getBoundsWidth() - oldX;
-                        //Check for a more efficient way to do this!!
-                        //Invalidate all the items
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
-                        //Move the items
-                        for (Item i : this.getAllConnected()) {
-                                if (i.isLineEnd()){
-                                        i.setAnchorRight(null);
-                                        i.setXY(i.getX() + deltaX, i.getY());
-                                        i.updatePolygon();
-                                        i.invalidateAll();
-                                }
-                        }
-                        //Invalidate them again!!
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
+
+                        anchorConnected(deltaX, null);
                 }
                 this._anchorRight = anchor;

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

@@ -37 +37 @@
                 // parseSize();
                 assert (_source.getLink() != null);
-                Frame frame = FrameIO.LoadFrame(_source.getAbsoluteLink());
+                Frame frame = FrameIO.LoadFrame(_source.getAbsoluteLink(), true);
                 if (frame == null)
                         return false;

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

@@ -182 +182 @@
                 dest.setArrow(source.getArrowheadLength(), source.getArrowheadRatio());
 
-                dest.setAnchorBottom(source.getAnchorBottom());
-                dest.setAnchorRight(source.getAnchorRight());
-                
+                // Calling the methods will move the item...
+                // This messes things up when the user uses backspace to delete a text
+                // line end
+                dest._anchorBottom = source._anchorBottom;
+                dest._anchorRight = source._anchorRight;
+
                 dest.setFormula(source.getFormula());
                 dest.setParent(source.getParent());
@@ -880 +883 @@
 
         public int getWidth() {
+                return 0;
+        }
+
+        public int getHeight() {
                 return 0;
         }
@@ -1063 +1070 @@
                 if (sourceItem == null) {
                         sourceItem = this;
-                }else{
-                        for(Item i: sourceItem.getAllConnected()){
-                                if(i instanceof Text){
+                } else {
+                        for (Item i : sourceItem.getAllConnected()) {
+                                if (i instanceof Text) {
                                         sourceItem = i;
                                         break;
@@ -1368 +1375 @@
                 for (Line line : _lines) {
                         Item other = line.getOppositeEnd(this);
-                        if (other.getFillColor() != c){
+                        if (other.getFillColor() != c) {
                                 other.setFillColor(c);
                         }
@@ -1534 +1541 @@
         private void invalidateCommonTraitForAll(ItemAppearence trait) {
                 invalidateCommonTrait(trait);
-                for (Line line : getLines())
-                        line.invalidateCommonTrait(trait);
+                if (isLineEnd()) {
+                        boolean hasLinePattern = getLines().get(0).getLinePattern() != null;
+                        if (hasLinePattern) {
+                                for (Item i : getAllConnected()) {
+                                        if (i instanceof Line) {
+                                                ((Line)i).invalidateCommonTrait(trait);
+                                        }
+                                }
+                        } else {
+                                for (Line line : getLines()) {
+                                        line.invalidateCommonTrait(trait);
+                                }
+                        }
+                }
                 if (_colorFill != null) {
                         invalidateFill(); // only invalidates if has fill
@@ -1651 +1670 @@
                         line.updatePolygon();
                 }
+                
+//              for (Item item : getAllConnected()) {
+//                      item.updatePolygon();
+//              }
 
                 invalidateCommonTraitForAll(ItemAppearence.PostMoved);
@@ -1759 +1782 @@
                                 "Item type does not support width attribute!");
         }
-        
+
         public void setRightMargin(int i) {
                 setWidth(i - getX() - Item.MARGIN_LEFT);
@@ -2541 +2564 @@
                 this._anchorRight = anchor;
                 if (anchor != null)
-                        setX(FrameGraphics.getMaxFrameSize().width - anchor - getBoundsWidth());
+                        setX(FrameGraphics.getMaxFrameSize().width - anchor
+                                        - getBoundsWidth());
         }
 
@@ -2551 +2575 @@
                 this._anchorBottom = anchor;
                 if (anchor != null)
-                        setY(FrameGraphics.getMaxFrameSize().height - anchor - getBoundsHeight());
+                        setY(FrameGraphics.getMaxFrameSize().height - anchor);
         }
 
@@ -2606 +2630 @@
                 return null;
         }
+
+        public boolean hasLink() {
+                return _link != null;
+        }
+
+        protected void anchorConnected(Float deltaX, Float deltaY) {
+                // Check for a more efficient way to do this!!
+                // Invalidate all the items
+                for (Item i : this.getAllConnected()) {
+                        i.invalidateAll();
+                }
+                // Move the items
+                for (Item i : this.getAllConnected()) {
+                        if (i.isLineEnd()) {
+                                if (deltaX != null) {
+                                        i.setAnchorRight(null);
+                                        i.setXY(i.getX() + deltaX, i.getY());
+                                }
+                                if (deltaY != null) {
+                                        i.setAnchorBottom(null);
+                                        i.setXY(i.getX(), i.getY() + deltaY);
+                                }
+                        }
+                }
+                // Invalidate them again!!
+                for (Item i : this.getAllConnected()) {
+                        i.updatePolygon();
+                        i.invalidateAll();
+                }
+        }
 }

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

@@ -288 +288 @@
          * Gets the height with which the picture is displayed on the screen.
          */
+        @Override
         public int getHeight() {
                 return Math.round((_end.y - _start.y) * _scale);
@@ -483 +484 @@
 
         public Image getCroppedImage() {
+                if(_image == null)
+                        return null;
                 return Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(
                                 _image.getSource(),

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

@@ -1422 +1422 @@
                 }
 
+                if (hasFormula()) {
+                        g.setColor(getPaintHighlightColor());
+                        Stroke highlightStroke = new BasicStroke(
+                                        1F, CAP, JOIN);
+                        g.setStroke(highlightStroke);
+
+                        Point2D.Float start = getEdgePosition(0, true);
+                        Point2D.Float end = getEdgePosition(0, false);
+                        g.drawLine(Math.round(start.x), Math.round(start.y), Math
+                                        .round(end.x), Math.round(end.y));
+                }
+
                 if (isHighlighted()) {
                         g.setColor(getPaintHighlightColor());
@@ -1644 +1656 @@
                         if (s.equals("@old") || s.equals("@ao")
                                         || s.equals("@itemtemplate") || s.equals("@parent")
-                                        || s.equals("@more") || s.equals("@next")
-                                        || s.equals("@previous") || s.equals("@i")
+                                        || s.equals("@next") || s.equals("@previous")
+                                        || s.equals("@first") || s.equals("@i") || s.equals("@iw")
                                         || s.equals("@f"))
                                 return true;
@@ -1883 +1895 @@
                                                 e.printStackTrace();
                                         }
-                                } else {
-                                        try {
-                                                double value = pair.getDoubleValue();
-                                                myParser.addVariable("$" + nextVarNo++, value);
-                                        } catch (NumberFormatException nfe) {
-                                                continue;
-                                        } catch (Exception e) {
-                                                e.printStackTrace();
-                                        }
+                                } // else {
+                                // Add anonomous vars
+                                try {
+                                        double value = pair.getDoubleValue();
+                                        myParser.addVariable("$" + nextVarNo++, value);
+                                } catch (NumberFormatException nfe) {
+                                        continue;
+                                } catch (Exception e) {
+                                        e.printStackTrace();
                                 }
+                                // }
                         }
                 }
@@ -2000 +2013 @@
                         float deltaX = FrameGraphics.getMaxFrameSize().width - anchor
                                         - getBoundsWidth() + getLeftMargin() - oldX;
-                        // Check for a more efficient way to do this!!
-                        // Invalidate all the items
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
-                        // Move the items
-                        for (Item i : this.getAllConnected()) {
-                                if (i.isLineEnd()) {
-                                        i.setAnchorRight(null);
-                                        i.setXY(i.getX() + deltaX, i.getY());
-                                }
-                        }
-                        // Invalidate them again!!
-                        for (Item i : this.getAllConnected()) {
-                                i.updatePolygon();
-                                i.invalidateAll();
-                        }
+                        anchorConnected(deltaX, null);
                 }
                 this._anchorRight = anchor;
@@ -2022 +2019 @@
                 invalidateFill();
         }
-        
+
         @Override
         public void setAnchorBottom(Float anchor) {
-                if(!isLineEnd()){
+                if (!isLineEnd()) {
                         super.setAnchorBottom(anchor);
                         return;
@@ -2034 +2031 @@
                 if (anchor != null) {
                         float deltaY = FrameGraphics.getMaxFrameSize().height - anchor
-                                        - getBoundsHeight() - oldY;
-                        //Check for a more efficient way to do this!!
-                        //Invalidate all the items
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
-                        //Move the items
-                        for (Item i : this.getAllConnected()) {
-                                if (i.isLineEnd()){
-                                        i.setAnchorBottom(null);
-                                        i.setXY(i.getX(), i.getY() + deltaY);
-                                        i.updatePolygon();
-                                        i.invalidateAll();
-                                }
-                        }
-                        //Invalidate them again!!
-                        for (Item i : this.getAllConnected()) {
-                                i.invalidateAll();
-                        }
+                                        - oldY;
+                        anchorConnected(null, deltaY);
                 }
                 this._anchorBottom = anchor;

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

@@ -6 +6 @@
 import java.util.LinkedList;
 import java.util.List;
+
+import org.expeditee.gui.FrameGraphics;
 
 public abstract class XRayable extends Item {
@@ -115 +117 @@
         public float getThickness() {
                 return _source.getThickness();
+        }
+        
+        @Override
+        public Float getAnchorBottom() {
+                return _source.getAnchorBottom();
+        }
+        
+        @Override
+        public Float getAnchorRight() {
+                return _source.getAnchorRight();
         }
         
@@ -205 +217 @@
         public void setAnchorBottom(Float anchor) {
                 _source.setAnchorBottom(anchor);
+                if (anchor != null)
+                        _source.setY(FrameGraphics.getMaxFrameSize().height - getHeight() - anchor);
         }
         

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

@@ -19 +19 @@
 import javax.swing.SwingUtilities;
 
+import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -133 +134 @@
                 text = text.trim();
 
+                // Check starts with the widget tag and seporator
+                if (!text.startsWith(TAG + ":"))
+                        throw new IllegalArgumentException("Source text must begin with \""
+                                        + TAG + ":\"");
+
+                text = text.substring(TAG.length() + 1).trim();
+
                 int index = 0;
-                if (text.length() > TAG.length() + 1) {
-                        index = text.indexOf(':', TAG.length() + 1); // used for
+                if (text.length() > 0) {
+                        index = text.indexOf(':'); // used for
                         // signifying start
-                        // of
-                }
-
-                // arguments
+                        // of arguments
+                }
+
                 if (index == 0)
                         throw new IllegalArgumentException("Source text must begin with \""
@@ -148 +155 @@
                                 0, index).split(" ");
 
-                // Check starts with the widget tag and seporator
-                if (tokens.length == 0 || !tokens[0].equals(TAG + ":"))
-                        throw new IllegalArgumentException("Source text must begin with \""
-                                        + TAG + ":\"");
-
                 float width = -1, height = -1;
 
-                if (tokens.length < 2)
+                if (tokens.length < 1)
                         throw new IllegalArgumentException(
                                         "Missing widget class name in source text");
@@ -161 +163 @@
                 try {
 
-                        if (tokens.length >= 3) { // parse optional width
-                                width = Integer.parseInt(tokens[2]);
+                        if (tokens.length >= 2) { // parse optional width
+                                width = Integer.parseInt(tokens[1]);
                                 width = (width <= 0) ? width = -1 : width;
                         }
 
-                        if (tokens.length >= 4) { // parse optional height
-                                height = Integer.parseInt(tokens[3]);
+                        if (tokens.length >= 3) { // parse optional height
+                                height = Integer.parseInt(tokens[2]);
                                 height = (height <= 0) ? height = -1 : height;
                         }
@@ -176 +178 @@
                 }
 
-                if (tokens.length > 4)
+                if (tokens.length > 3)
                         throw new IllegalArgumentException(
                                         "to many arguments given before \":\" in source text");
 
-                String classname = tokens[1];
+                String classname = tokens[0];
                 if (classname.charAt(0) == '$')
                         classname = "org.expeditee.items.widgets." + classname.substring(1);
@@ -704 +706 @@
 
         public void setPosition(int x, int y) {
-                if (x == getX() && y == getY()) return;
+                if (x == getX() && y == getY())
+                        return;
 
                 boolean vfloating[] = new boolean[] { _d1.isFloating(),
@@ -925 +928 @@
                                                 .getCurrentMouseEvent())
                         return; // already dealt with this event
-                
+
                 _lastParentStateChangedEvent = e;
-                _lastParentStateChangedMouseEvent = MouseEventRouter.getCurrentMouseEvent();
+                _lastParentStateChangedMouseEvent = MouseEventRouter
+                                .getCurrentMouseEvent();
 
                 switch (e.getEventType()) {
@@ -1072 +1076 @@
         /**
          * 
-         * @return
-         *              The current bounds for this widget. Never null.
+         * @return The current bounds for this widget. Never null.
          */
         public Rectangle getBounds() {
@@ -1155 +1158 @@
                 if (_textRepresentation.getLink() != null
                                 || _textRepresentation.hasAction()) {
-                        //System.out.println("Painted link");
+                        // System.out.println("Painted link");
                         _textRepresentation.paintLinkGraphic(g, getLinkX(), getLinkY());
 
@@ -1493 +1496 @@
 
                 if (newData != null) {
-                        if (data != null) data.add(newData);
+                        if (data != null)
+                                data.add(newData);
                         else {
                                 data = new LinkedList<String>();
                                 data.add(newData);
                                 getCurrentRepresentation().setData(data);
-                                
-                        }
-                } 
+
+                        }
+                }
         }
 
@@ -1507 +1511 @@
          * 
          * @param link
-         *              The new frame link. Can be null (for no link)
-         *              
+         *            The new frame link. Can be null (for no link)
+         * 
          */
         public void setLink(String link) {
@@ -1518 +1522 @@
                         invalidateLink();
         }
-        
-        public void setBackgroundColor(Color c){
+
+        public void setBackgroundColor(Color c) {
                 getSource().setBackgroundColor(c);
         }
-        
-        /**
-         * @return
-         *              The link for this widget. Null if none.
+
+        /**
+         * @return The link for this widget. Null if none.
          */
         public String getLink() {
                 return _textRepresentation.getLink();
         }
-        
-
-        /**
-         * <b>Note:</b> That if the widget has no parent (e.g. the widget is a free-item) then
-         * the absolute link returned will be for the frameset of the current frame.
-         * 
-         * @return
-         *              The absolute link for this item. Null if there is no link, or if
-         *              there is no parent for this widget and the current frame is unavailable.
-         *
+
+        /**
+         * <b>Note:</b> That if the widget has no parent (e.g. the widget is a
+         * free-item) then the absolute link returned will be for the frameset of
+         * the current frame.
+         * 
+         * @return The absolute link for this item. Null if there is no link, or if
+         *         there is no parent for this widget and the current frame is
+         *         unavailable.
+         * 
          */
         public String getAbsoluteLink() {
-                
-                // Note:  cannot return the source absolute link since it does not have
+
+                // Note: cannot return the source absolute link since it does not have
                 // a parent ... thus must manually format link
-                
+
                 String link = getLink();
-                
-                if (link == null || link.length() == 0) return null;
-                
-                if (FrameIO.isPositiveInteger(link)) { // relative - convert to absolute
-                        
+
+                if (link == null || link.length() == 0)
+                        return null;
+
+                if (FrameIO.isPositiveInteger(link)) { // relative - convert to
+                                                                                                // absolute
+
                         // Get the frameset of this item
                         Frame parent = getParentFrame();
-                        if (parent == null) parent = DisplayIO.getCurrentFrame();
-                        if (parent == null) return null;
-                        
+                        if (parent == null)
+                                parent = DisplayIO.getCurrentFrame();
+                        if (parent == null)
+                                return null;
+
                         String framesetName = parent.getFramesetName();
-                        
-                        if (framesetName == null) return null;
-                        
+
+                        if (framesetName == null)
+                                return null;
+
                         return framesetName + link;
-                        
+
                 } else if (FrameIO.isValidFrameName(link)) { // already absolute
                         return link;
                 }
-                
+
                 return null;
         }
@@ -1600 +1608 @@
                 _textRepresentation.setColor(c);
         }
-        
+
         public void setSourceBorderColor(Color c) {
                 _textRepresentation.setBorderColor(c);
         }
-        
+
         public void setSourceFillColor(Color c) {
                 _textRepresentation.setFillColor(c);
         }
-        
+
         public void setSourceThickness(float newThickness, boolean setConnected) {
                 _textRepresentation.setThickness(newThickness, setConnected);
@@ -1616 +1624 @@
                 _textRepresentation.setData(data);
         }
-        
+
         protected Point getOrigin() {
                 return _d1.getPosition(); // BROOK: This flips around ... the origin can be any point 
         }
-        
+
         protected Item getFirstCorner() {
                 return _d1;

trunk/src/org/expeditee/simple/SVariable.java

@@ -7 +7 @@
  * 
  */
-public abstract class SVariable<T> {
+public abstract class SVariable<T extends Object> {
         public static final String prefix = "$";
 

trunk/src/org/expeditee/simple/Variables.java

@@ -63 +63 @@
                 }
                 //TODO:figure out how to fix the ANT build error
-                toSet.setValue(toGetValueFrom);
+                ((SVariable)toSet).setValue(toGetValueFrom);
         }