Changeset 7

Timestamp:

05/01/08 12:26:53 (16 years ago)

Author:

ra33

Message:

New expeditee version

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• actions/Misc.java (modified) (7 diffs)
• actions/Simple.java (modified) (28 diffs)
• agents/ComputeTree.java (modified) (1 diff)
• agents/CopyTree.java (modified) (2 diffs)
• gui/Browser.java (modified) (7 diffs)
• gui/DisplayIO.java (modified) (10 diffs)
• gui/Frame.java (modified) (21 diffs)
• gui/FrameCreator.java (modified) (4 diffs)
• gui/FrameGraphics.java (modified) (9 diffs)
• gui/FrameIO.java (modified) (21 diffs)
• gui/FrameKeyboardActions.java (modified) (51 diffs)
• gui/FrameMouseActions.java (modified) (71 diffs)
• gui/FrameUtils.java (modified) (22 diffs)
• items/Dot.java (modified) (3 diffs)
• items/Item.java (modified) (12 diffs)
• items/ItemUtils.java (modified) (7 diffs)
• items/Line.java (modified) (13 diffs)
• items/Picture.java (modified) (4 diffs)
• items/Text.java (modified) (16 diffs)
• simple/Context.java (modified) (6 diffs)
• stats/SessionStats.java (modified) (9 diffs)

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

@@ -276 +276 @@
                 // loose changes
                 if (toRun.getDeclaringClass().getName().equals(
-                                 NAVIGATIONS_CLASS))
+                                 NAVIGATIONS_CLASS)) {
                         FrameIO.SaveFrame(DisplayIO.getCurrentFrame());
+                }
 
                 // if there are duplicate methods with the same name

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

@@ -6 +6 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.List;
@@ -113 +111 @@
                 Frame toDelete = DisplayIO.getCurrentFrame();
                 DisplayIO.Back();
+                String deletedFrame = toDelete.getFrameName();
+                String deletedFrameNameLowercase = deletedFrame.toLowerCase();
                 try {
-                        String deletedFrame = toDelete.getFrameName();
                         boolean del = FrameIO.DeleteFrame(toDelete);
                         if (!del) {
@@ -123 +122 @@
                                 for (Item i : current.getItems())
                                         if (i.getLink() != null
-                                                        && i.getLink().toLowerCase().equals(
-                                                                        toDelete.getFrameName().toLowerCase())) {
+                                                        && i.getAbsoluteLink().toLowerCase().equals(
+                                                                        deletedFrameNameLowercase)) {
                                                 i.setLink(null);
                                         }
 
                                 FrameGraphics.Repaint();
-                                FrameGraphics.DisplayMessage(deletedFrame
-                                                + " Deleted.");
+                                FrameGraphics.DisplayMessage(deletedFrame + " Deleted.");
                         }
                 } catch (IOException ioe) {
-                        FrameGraphics.ErrorMessage("Error trying to delete "
-                                        + toDelete.getFrameName() + ":\n" + ioe.getMessage());
+                        FrameGraphics.ErrorMessage("Error trying to delete " + deletedFrame
+                                        + ":\n" + ioe.getMessage());
                 }
         }
@@ -240 +238 @@
                 FrameGraphics.Repaint();
         }
-        
+
         /**
          * Creates a new Text Object containing the available fonts.
@@ -246 +244 @@
         public static void GetAvailableFontFamilyNames() {
 
-                String[] availableFonts = GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
+                String[] availableFonts = GraphicsEnvironment
+                                .getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
                 StringBuilder fontsList = new StringBuilder();
-                for (String s: availableFonts) {
+                for (String s : availableFonts) {
                         fontsList.append(s).append('\n');
                 }
-                
+
                 Text text = DisplayIO.getCurrentFrame().createNewText();
                 // We dont want the stats to wrap at all
@@ -364 +363 @@
         public static void CopyFile(String existingFile, String newFileName) {
                 try {
-                        //TODO is there a built in method which will do this faster?
-                        
-                        FrameGraphics.DisplayMessage("Copying file " + existingFile + " to " + newFileName + "...");
-                        FileInputStream is = new FileInputStream(existingFile);
-                        FileOutputStream os = new FileOutputStream(
-                                        newFileName, false);
-                        int data;
-                        while ( (data = is.read()) != -1 ) {
-                                os.write(data);
-                        }
-                        os.flush();
-                        os.close();
-                        is.close();
+                        // TODO is there a built in method which will do this faster?
+
+                        FrameGraphics.DisplayMessage("Copying file " + existingFile
+                                        + " to " + newFileName + "...");
+                        FrameIO.copyFile(existingFile, newFileName);
                         FrameGraphics.DisplayMessage("File copied successfully");
                 } catch (FileNotFoundException e) {
                         FrameGraphics.DisplayMessage("Error opening file: " + existingFile);
-                } catch (Exception e){
+                } catch (Exception e) {
                         FrameGraphics.DisplayMessage("File could not be copied");
                 }
@@ -446 +437 @@
 
                 for (Item i : body)
-                        if (i != child.getTitle() && i != child.getName()
+                        if (i != child.getTitle() && i != child.getFrameNameItem()
                                         && !i.isAnnotation()) {
                                 item = i;

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

@@ -13 +13 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
@@ -18 +19 @@
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
@@ -59 +61 @@
         };
 
-        private static final String BREAK_TEXT = "exitrepeat";
-
-        private static final String CONTINUE_TEXT = "nextrepeat";
+        private static final String BREAK2_TEXT = "exitrepeat";
+
+        private static final String BREAK_TEXT = "break";
+
+        private static final String CONTINUE2_TEXT = "nextrepeat";
+
+        private static final String CONTINUE_TEXT = "continue";
 
         private static final String RETURN_TEXT = "return";
@@ -155 +161 @@
 
                 FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), false);
-
                 FrameGraphics.DisplayMessage("Starting test suite: " + frameset,
                                 Color.CYAN);
@@ -229 +234 @@
 
         private static void FlagError(Item item) {
-                item.setColor(Color.CYAN);
+                // item.setColor(Color.CYAN);
                 FrameUtils.DisplayFrame(item.getParent().getFrameName(), true);
+                item.showHighlight(true, Color.CYAN);
                 FrameIO.SaveFrame(item.getParent());
         }
@@ -306 +312 @@
                 Frame frame = i.getParent();
 
-                if (i == frame.getTitle() || i == frame.getName() || i.isAnnotation()) {
+                if (i == frame.getTitle() || i == frame.getFrameNameItem() || i.isAnnotation()) {
                         return false;
                 }
@@ -319 +325 @@
          * @return
          */
-        private static String[] parseStatement(String statement) {
-                return statement.split(TOKEN_SEPARATOR);
+        private static String[] parseStatement(Text code) throws Exception {
+                String statement = code.getTextNoList();
+                ArrayList<String> tokens = new ArrayList<String>();
+
+                for (int i = 0; i < statement.length(); i++) {
+                        char c = statement.charAt(i);
+                        // ignore spaces
+                        if (c != ' ') {
+                                int startOfToken = i;
+                                if (c == '\"') {
+                                        int endOfToken = statement.length() - 1;
+                                        // find the end of the string literal
+                                        while (statement.charAt(endOfToken) != '\"')
+                                                endOfToken--;
+                                        if (endOfToken > startOfToken) {
+                                                tokens.add(statement.substring(startOfToken,
+                                                                endOfToken + 1));
+                                        } else {
+                                                throw new Exception("Expected matching \" "
+                                                                + code.toString());
+                                        }
+                                        break;
+                                } else if (c == '#' || c == '/') {
+                                        break;
+                                } else {
+                                        // read in a normal token
+                                        while (++i < statement.length()
+                                                        && statement.charAt(i) != ' ')
+                                                ;
+                                        tokens.add(statement.substring(startOfToken, i)
+                                                        .toLowerCase());
+                                }
+                        }
+                }
+
+                String[] a = new String[tokens.size()];
+                a = tokens.toArray(a);
+                code.setProcessedCode(a);
+                return a;
         }
 
@@ -464 +507 @@
         private static Status RunItem(Text code, Context context,
                         Status lastItemStatus) throws Exception {
-                String codeText = code.getTextNoList();
+
+                String[] tokens = code.getProcessedCode();
+
+                if (tokens == null) {
+                        tokens = parseStatement(code);
+                }
+
                 // Comments without links are a no-op
-                if (codeText.startsWith("#") || codeText.startsWith("//")) {
+                if (tokens.length == 0) {
                         if (code.getLink() == null)
                                 return Status.OK;
@@ -473 +522 @@
                 }
 
-                // Now check for code statements
-                codeText = codeText.trim();
-                String[] tokens = parseStatement(codeText.toLowerCase());
                 // At present only set statements can have literals so they
                 // are the only statements that we have to worry about string
                 // literals
-                assert (tokens.length > 0);
                 if (tokens[0].equals("call") && tokens.length >= 2) {
                         return Call(tokens, code, context);
@@ -497 +542 @@
                                                 // check for strings enclosed in quotes
                                                 if (tokens[2].startsWith("\"")) {
-                                                        if (tokens[tokens.length - 1].endsWith("\"")) {
-                                                                context.getPrimitives().setValue(
-                                                                                tokens[1],
-                                                                                new SString(codeText.substring(codeText
-                                                                                                .indexOf("\"") + 1, codeText
-                                                                                                .length() - 1)));
-                                                                return Status.OK;
-                                                        } else
-                                                                throw new Exception("Expected matching \" "
-                                                                                + code.toString());
+                                                        context.getPrimitives().setValue(
+                                                                        tokens[1],
+                                                                        new SString(tokens[2].substring(1,
+                                                                                        tokens[2].length() - 1)));
+                                                        return Status.OK;
+
                                                         // set a literal
                                                 } else if (tokens.length == 3) {
@@ -517 +558 @@
                                         throw new RuntimeException(e.getMessage());
                                 }
+                        } else if (tokens[0].equals("setframevalue")) {
+                                assertMinParametreCount(tokens, 4);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+
+                                // Get the attribute to be searched for on the target frame
+                                Frame targetFrame = (Frame) context.getPointers().getVariable(
+                                                tokens[1]).getValue();
+                                String targetAttribute = context.getPrimitives()
+                                                .getStringValue(tokens[2]).toLowerCase()
+                                                + ":";
+                                String value = context.getPrimitives()
+                                                .getStringValue(tokens[3]);
+                                Boolean found = false;
+                                Text attributeItem = null;
+                                Text valueItem = null;
+                                // Begin the search
+                                for (Text text : targetFrame.getBodyTextItems()) {
+                                        String s = text.getTextNoList().toLowerCase();
+                                        if (s.startsWith(targetAttribute)) {
+                                                attributeItem = text;
+                                                AttributeUtils.setSingleValue(attributeItem, value);
+                                                found = true;
+                                                break;
+                                        }
+                                }
+                                // Keep looking for a matching value nearby if we found an
+                                // attribute without the value in the same item
+                                if (!found && attributeItem != null) {
+                                        Point endPoint = attributeItem.getEndParagraphPosition();
+
+                                        for (Text text : targetFrame.getBodyTextItems()) {
+                                                Point startPoint = text.getPosition();
+                                                if (Math.abs(startPoint.y - endPoint.y) < 10
+                                                                && Math.abs(startPoint.x - endPoint.x) < 20) {
+                                                        found = true;
+                                                        valueItem = text;
+                                                        text.setText(value);
+                                                        break;
+                                                }
+                                        }
+                                }
+
+                                // Set the values of the output parametres
+                                context.getPrimitives()
+                                                .setValue(tokens[4], new SBoolean(found));
+                                if (tokens.length > 5) {
+                                        context.getPointers().setObject(tokens[5], attributeItem);
+                                        if (tokens.length > 6) {
+                                                context.getPointers().setObject(tokens[6], valueItem);
+                                        }
+                                }
+
+                                return Status.OK;
                         } else if (tokens[0].startsWith("setitem")) {
                                 if (tokens[0].equals("setitemposition")) {
@@ -651 +745 @@
                                         throw new UnitTestFailedException("null", value.toString());
                                 return Status.OK;
+                        } else if (tokens[0].equals("assertnotnull")) {
+                                assertExactParametreCount(tokens, 1);
+                                Object value = context.getPrimitives().getVariable(tokens[1])
+                                                .getValue();
+                                if (value == null)
+                                        throw new UnitTestFailedException("not null", "null");
+                                return Status.OK;
+                        } else if (tokens[0].equals("assertdefined")) {
+                                assertExactParametreCount(tokens, 1);
+                                if (!context.isDefined(tokens[1]))
+                                        throw new UnitTestFailedException("defined", "not defined");
+                                return Status.OK;
+                        } else if (tokens[0].equals("assertnotdefined")) {
+                                assertExactParametreCount(tokens, 1);
+                                if (context.isDefined(tokens[1]))
+                                        throw new UnitTestFailedException("defined", "not defined");
+                                return Status.OK;
                         } else if (tokens[0].equals("assertequals")) {
                                 assertExactParametreCount(tokens, 2);
@@ -751 +862 @@
                                         context.getPrimitives().setValue(frameNameVar,
                                                         frame.getFrameName());
+                                        return Status.OK;
+                                } else if (tokens[0].startsWith("getframefilepath")) {
+                                        assertExactParametreCount(tokens, 2);
+                                        String frameName = context.getPrimitives().getStringValue(
+                                                        tokens[1]);
+                                        String path = FrameIO.LoadFrame(frameName).path;
+                                        String filePath = FrameIO.getFrameFullPathName(path,
+                                                        frameName);
+                                        context.getPrimitives().setValue(tokens[2], filePath);
                                         return Status.OK;
                                 }
@@ -862 +982 @@
                                                 new SInteger(AgentStats.getMilliSecondsElapsed()));
                                 return Status.OK;
+                        } else if (tokens[0].equals("getlastnumberinframeset")) {
+                                String framesetNameVar = DEFAULT_STRING;
+                                String countVar = DEFAULT_INTEGER;
+                                if (tokens.length > 1) {
+                                        assertMinParametreCount(tokens, 2);
+                                        framesetNameVar = tokens[1];
+                                        countVar = tokens[2];
+                                }
+                                String frameset = context.getPrimitives().getStringValue(
+                                                framesetNameVar);
+                                long count = FrameIO.getLastNumber(frameset);
+                                context.getPrimitives().setValue(countVar, new SInteger(count));
+                                return Status.OK;
+                        } else if (tokens[0].equals("getlistofframesets")) {
+                                String stringVar = DEFAULT_ITEM;
+                                if (tokens.length > 1) {
+                                        assertMinParametreCount(tokens, 1);
+                                        stringVar = tokens[1];
+                                }
+                                context.getPrimitives().setValue(stringVar,
+                                                FrameIO.getFramesetList());
+                                return Status.OK;
                         }
                 } else if (tokens[0].equals("or")) {
@@ -903 +1045 @@
                                 FrameGraphics.DisplayMessage(((Text) message).copy());
                         } catch (NullPointerException e) {
-                                // Just ignore not text items!
                                 FrameGraphics.DisplayMessage("null");
                         } catch (ClassCastException e) {
@@ -914 +1055 @@
                 } else if (tokens[0].equals("messageln")
                                 || tokens[0].equals("messageline")
+                                || tokens[0].equals("messagelnnospaces")
+                                || tokens[0].equals("messagelinenospaces")
                                 || tokens[0].equals("errorln") || tokens[0].equals("errorline")) {
-                        StringBuilder message = new StringBuilder();
-                        if (tokens.length == 1) {
-                                message.append(context.getPrimitives().getVariable(
-                                                DEFAULT_STRING).stringValue()
-                                                + " ");
-                        } else {
-                                for (int i = 1; i < tokens.length; i++) {
-                                        if (Primitives.isPrimitive(tokens[i])) {
-                                                message.append(context.getPrimitives().getVariable(
-                                                                tokens[i]).stringValue()
-                                                                + " ");
-                                        } else
-                                                throw new Exception("Illegal parametre: [" + tokens[i]
-                                                                + "] in line " + code.toString());
-                                }
-                        }
+                        String message = getMessage(tokens, context, code.toString(),
+                                        tokens[0].endsWith("nospaces") ? "" : " ");
 
                         if (tokens[0].equals("errorln") || tokens[0].equals("errorline"))
-                                FrameGraphics.ErrorMessage(message.toString());
+                                FrameGraphics.ErrorMessage(message);
                         else
-                                FrameGraphics.DisplayMessageAlways(message.toString());
+                                FrameGraphics.DisplayMessageAlways(message);
+                        return Status.OK;
+                } else if (tokens[0].equals("typein")
+                                || tokens[0].equals("typeinnospaces")) {
+
+                        String s = getMessage(tokens, context, code.toString(), tokens[0]
+                                        .equals("typein") ? " " : "");
+                        for (int i = 0; i < s.length(); i++) {
+                                FrameKeyboardActions.processChar(s.charAt(i));
+                                Thread.sleep(25);
+                        }
                         return Status.OK;
                 } else if (tokens[0].startsWith("else")) {
@@ -1015 +1154 @@
                                                 tokens[2]) <= 0;
                                 parametres = 2;
+                        } else if (tokens[0].equals("ifexistingframe")) {
+                                result = FrameIO.DoesFrameExist(context.getPrimitives()
+                                                .getStringValue(tokens[1]));
+                        } else if (tokens[0].equals("ifexistingframeset")) {
+                                String framesetName = context.getPrimitives().getStringValue(
+                                                tokens[1]);
+                                result = FrameIO.DoesFramesetExist(framesetName);
                         } else {
                                 // assertVariableType(variable, 1, SPointer.itemPrefix);
@@ -1164 +1310 @@
 
                         return Status.OK;
+                } else if (tokens[0].equals("deleteitem")) {
+                        assertMinParametreCount(tokens, 1);
+                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                        Item item = (Item) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
+                        item.delete();
+                        return Status.OK;
+                } else if (tokens[0].equals("deleteframe")) {
+                        assertMinParametreCount(tokens, 1);
+                        assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                        Frame frame = (Frame) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
+                        boolean success = FrameIO.DeleteFrame(frame);
+
+                        if (tokens.length > 2) {
+                                context.getPrimitives().setValue(tokens[2],
+                                                new SBoolean(success));
+                        }
+
+                        return Status.OK;
+                } else if (tokens[0].equals("deleteframeset")) {
+                        assertMinParametreCount(tokens, 1);
+                        String framesetName = context.getPrimitives().getStringValue(
+                                        tokens[1]);
+                        boolean success = FrameIO.DeleteFrameset(framesetName);
+
+                        if (tokens.length > 2) {
+                                context.getPrimitives().setValue(tokens[2],
+                                                new SBoolean(success));
+                        }
+
+                        return Status.OK;
+                } else if (tokens[0].equals("copyitem")) {
+                        assertMinParametreCount(tokens, 2);
+                        assertVariableType(tokens[1],1,SPointer.itemPrefix);
+                        assertVariableType(tokens[2],2,SPointer.itemPrefix);
+                        Item item = (Item)context.getPointers().getVariable(tokens[1]).getValue();
+                        Item copy = item.copy();
+                        context.getPointers().setObject(tokens[2], copy);
+
+                        return Status.OK;
+                }else if (tokens[0].equals("copyframeset")) {
+                        assertMinParametreCount(tokens, 2);
+                        String framesetToCopy = context.getPrimitives().getStringValue(
+                                        tokens[1]);
+                        String copiedFrameset = context.getPrimitives().getStringValue(
+                                        tokens[2]);
+                        boolean success = FrameIO.CopyFrameset(framesetToCopy,
+                                        copiedFrameset);
+
+                        if (tokens.length > 3) {
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SBoolean(success));
+                        }
+
+                        return Status.OK;
+                } else if (tokens[0].equals("copyframe")) {
+                        assertMinParametreCount(tokens, 2);
+                        assertVariableType(tokens[1],1,SPointer.framePrefix);
+                        assertVariableType(tokens[2],2,SPointer.framePrefix);
+                        Frame frameToCopy = (Frame) context.getPointers().getVariable(
+                                        tokens[1]).getValue();
+                        FrameIO.SuspendCache();
+                        Frame freshCopy = FrameIO.LoadFrame(frameToCopy.getFrameName());
+                        // Change the frameset if one was provided
+                        if (tokens.length > 3) {
+                                String destinationFrameset = context.getPrimitives()
+                                                .getStringValue(tokens[3]);
+                                freshCopy.setFrameset(destinationFrameset);
+                        }// Otherwise add it to the end of this frameset
+                        freshCopy.setFrameNumber(FrameIO.getLastNumber(freshCopy
+                                        .getFramesetName()) + 1);
+                        context.getPointers().setObject(tokens[2], freshCopy);
+                        String fileContents = FrameIO.ForceSaveFrame(freshCopy);
+                        boolean success = fileContents != null;
+                        FrameIO.ResumeCache();
+                        if (tokens.length > 4) {
+                                context.getPrimitives().setValue(tokens[4],
+                                                new SBoolean(success));
+                        }
+                        return Status.OK;
                 } else if (tokens[0].equals("createframe")) {
 
@@ -1237 +1464 @@
                                 context.getPrimitives().setValue(nextCharVarName,
                                                 new SCharacter(nextChar));
+
+                        return Status.OK;
+                } else if (tokens[0].equals("openreadfile")) {
+                        assertVariableType(tokens[1], 1, SString.prefix);
+                        assertVariableType(tokens[2], 2, SPointer.filePrefix);
+
+                        if (tokens.length > 3) {
+                                assertVariableType(tokens[3], 3, SBoolean.prefix);
+                                context.openReadFile(tokens[1], tokens[2], tokens[3]);
+                        } else
+                                context.openReadFile(tokens[1], tokens[2]);
+
+                        return Status.OK;
+                } else if (tokens[0].equals("readlinefile")
+                                || tokens[0].equals("readlnfile")) {
+                        assertVariableType(tokens[1], 1, SPointer.filePrefix);
+
+                        if (tokens.length > 3) {
+                                assertVariableType(tokens[3], 3, SBoolean.prefix);
+                                context.readLineFile(tokens[1], tokens[2], tokens[3]);
+                        } else
+                                context.readLineFile(tokens[1], tokens[2]);
+
+                        return Status.OK;
+                } else if (tokens[0].equals("readitemfile")) {
+                        assertVariableType(tokens[1], 1, SPointer.filePrefix);
+                        assertVariableType(tokens[2], 1, SPointer.itemPrefix);
+
+                        if (tokens.length > 3) {
+                                assertVariableType(tokens[3], 3, SBoolean.prefix);
+                                context.readItemFile(tokens[1], tokens[2], tokens[3]);
+                        } else
+                                context.readItemFile(tokens[1], tokens[2]);
 
                         return Status.OK;
@@ -1276 +1536 @@
 
                         return Status.OK;
+                } else if (tokens[0].equals("displayframeset")) {
+                        assertMinParametreCount(tokens, 1);
+                        String framesetName = context.getPrimitives().getStringValue(
+                                        tokens[1]);
+                        int lastFrameNo = FrameIO.getLastNumber(framesetName);
+                        int firstFrameNo = 0;
+                        double pause = 0.0;
+                        // get the first and last frames to display if they were proided
+                        if (tokens.length > 2) {
+                                firstFrameNo = (int) context.getPrimitives().getIntegerValue(
+                                                tokens[2]);
+                                if (tokens.length > 3) {
+                                        lastFrameNo = (int) context.getPrimitives()
+                                                        .getIntegerValue(tokens[3]);
+                                        if (tokens.length > 4) {
+                                                pause = context.getPrimitives().getDoubleValue(
+                                                                tokens[4]);
+                                        }
+                                }
+                        }
+                        // Display the frames
+                        String adjustedFramesetName = FrameUtils
+                                        .GetFramesetNameAdjusted(framesetName);
+                        for (int i = firstFrameNo; i <= lastFrameNo; i++) {
+                                Frame frame = FrameIO.LoadFrame(adjustedFramesetName + i);
+                                if (frame != null) {
+                                        double thisFramesPause = pause;
+                                        // check for change in delay for this frame only
+                                        Item pauseItem = ItemUtils.FindTag(frame.getItems(),
+                                                        "@DisplayFramePause:");
+                                        if (pauseItem != null) {
+                                                try {
+                                                        // attempt to read in the delay value
+                                                        thisFramesPause = Double.parseDouble(ItemUtils
+                                                                        .StripTag(
+                                                                                        ((Text) pauseItem).getFirstLine(),
+                                                                                        "@DisplayFramePause:"));
+                                                } catch (NumberFormatException nfe) {
+                                                }
+                                        }
+                                        DisplayIO.setCurrentFrame(frame);
+                                        pause(thisFramesPause);
+                                }
+                        }
+                        return Status.OK;
+                } else if (tokens[0].equals("createframeset")) {
+                        String framesetName = DEFAULT_STRING;
+                        String successVar = null;
+                        if (tokens.length > 1) {
+                                framesetName = tokens[1];
+                                if (tokens.length > 2)
+                                        successVar = tokens[2];
+                        }
+                        context.createFrameset(framesetName, successVar);
+                        return Status.OK;
                 } else if (tokens[0].equals("concatstr")) {
                         assertMinParametreCount(tokens, 3);
@@ -1436 +1751 @@
                         }
 
-                        double time = context.getPrimitives().getDoubleValue(lengthVar);
-                        for (int i = 0; i < time * 10; i++) {
-                                Thread.yield();
-                                Thread.sleep(100);
-                        }
+                        pause(context.getPrimitives().getDoubleValue(lengthVar));
                         return Status.OK;
                 } else if (tokens[0].equals("glidecursorto")) {
@@ -1473 +1784 @@
                         Thread.sleep(milliseconds % timeInterval);
                         DisplayIO.setCursorPosition(finalX, finalY);
+                        return Status.OK;
+                } else if (tokens[0].equals("glideitemto")) {
+                        assertMinParametreCount(tokens, 3);
+                        assertVariableType(tokens[1], 1, SPointer.itemPrefix);
+                        Item item = (Item) context.getPointers().getVariable(tokens[1])
+                                        .getValue();
+                        int finalX = (int) context.getPrimitives().getIntegerValue(
+                                        tokens[2]);
+                        int finalY = (int) context.getPrimitives().getIntegerValue(
+                                        tokens[3]);
+
+                        // DisplayIO.setCursorPosition(item.getX(), item.getY());
+                        // FrameMouseActions.pickup(item);
+
+                        int milliseconds = 1000;
+                        if (tokens.length > 4)
+                                milliseconds = (int) (context.getPrimitives().getDoubleValue(
+                                                tokens[4]) * 1000);
+
+                        int initialX = item.getX();
+                        int initialY = item.getY();
+                        // int initialX = DisplayIO.getMouseX();
+                        // int initialY = DisplayIO.getMouseY();
+
+                        final int timeInterval = 40;
+
+                        int deltaX = (int) (finalX - initialX);
+                        int deltaY = (int) (finalY - initialY);
+
+                        int intervals = milliseconds / timeInterval;
+                        for (double i = 0; i < intervals; i++) {
+                                int newX = initialX + (int) (deltaX * i / intervals);
+                                int newY = initialY + (int) (deltaY * i / intervals);
+                                Thread.yield();
+                                Thread.sleep(timeInterval);
+                                // DisplayIO.setCursorPosition(newX, newY);
+
+                                item.setPosition(newX, newY);
+                                DisplayIO.repaint();
+                        }
+                        // Thread.yield();
+                        Thread.sleep(milliseconds % timeInterval);
+                        item.setPosition(finalX, finalY);
+                        // DisplayIO.setCursorPosition(finalX, finalY);
+                        FrameMouseActions.anchor(item);
+                        Frame.FreeItems.clear();
+                        FrameGraphics.Repaint();
+                        // FrameMouseActions.updateCursor();
                         return Status.OK;
                 }
@@ -1487 +1846 @@
                                         status = Status.OK;
                                 return status;
-                        } else if (tokens[0].equals(CONTINUE_TEXT)) {
+                        } else if (tokens[0].equals(CONTINUE_TEXT)
+                                        || tokens[0].equals(CONTINUE2_TEXT)) {
                                 return Status.Continue;
-                        } else if (tokens[0].equals(BREAK_TEXT)) {
+                        } else if (tokens[0].equals(BREAK_TEXT)
+                                        || tokens[0].equals(BREAK2_TEXT)) {
                                 return Status.Break;
                         } else if (tokens[0].equals(RETURN_TEXT)) {
@@ -1536 +1897 @@
                                 assertVariableType(tokens[1], 1, SPointer.filePrefix);
                                 context.closeWriteFile(tokens[1]);
+
+                                return Status.OK;
+                        } else if (tokens[0].equals("closereadfile")) {
+                                assertVariableType(tokens[1], 1, SPointer.filePrefix);
+                                context.closeReadFile(tokens[1]);
 
                                 return Status.OK;
@@ -1550 +1916 @@
                         }
                 } else if (tokens.length == 3) {
-                        if (tokens[0].equals("foreach")) {
+                        if (tokens[0].startsWith("foreach")) {
+                                Class itemType = Object.class;
+                                String type = tokens[0].substring("foreach".length());
+                                // Check the type of foreach loop
+                                // and set the item type to iterate over
+                                if (type.equals("dot")) {
+                                        itemType = Dot.class;
+                                } else if (type.equals("text")) {
+                                        itemType = Text.class;
+                                } else if (type.equals("line")) {
+                                        itemType = Line.class;
+                                }
+
                                 assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                                 assertVariableType(tokens[2], 2, SPointer.framePrefix);
@@ -1556 +1934 @@
                                                 tokens[2]).getValue();
                                 // Create the ip variable
+                                Item frameName = currFrame.getFrameNameItem();
+                                Item frameTitle = currFrame.getTitle();
+
                                 for (Item i : currFrame.getItems()) {
+                                        if (i == frameName || i == frameTitle)
+                                                continue;
+                                        if (!(itemType.isInstance(i)))
+                                                continue;
+
                                         context.getPointers().setObject(tokens[1], i);
                                         Status status = RunFrameAndReportError(code, context);
                                         // check if we need to exit this loop because of
-                                        // statements in
-                                        // the code that was run
+                                        // statements in the code that was run
                                         if (status == Status.Exit || status == Status.Return)
                                                 return status;
@@ -1633 +2018 @@
         }
 
+        private static void pause(double time) throws Exception {
+                for (int i = 0; i < time * 10; i++) {
+                        Thread.yield();
+                        Thread.sleep(100);
+                }
+        }
+
         public static int countCharsInString(String s, String pattern) {
                 String newString = s;
@@ -1668 +2060 @@
                         throw new IncorrectParametreCountException(parametreCount);
         }
+
+        private static String getMessage(String[] tokens, Context context,
+                        String code, String separator) throws Exception {
+                StringBuilder message = new StringBuilder();
+                if (tokens.length == 1) {
+                        message.append(context.getPrimitives().getVariable(DEFAULT_STRING)
+                                        .stringValue());
+                } else {
+                        for (int i = 1; i < tokens.length; i++) {
+                                if (Primitives.isPrimitive(tokens[i])) {
+                                        message.append(context.getPrimitives().getVariable(
+                                                        tokens[i]).stringValue()
+                                                        + separator);
+                                } else
+                                        throw new Exception("Illegal parametre: [" + tokens[i]
+                                                        + "] in line " + code);
+                        }
+                }
+                return message.toString();
+        }
 }

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

@@ -98 +98 @@
                         AttributeUtils.setSingleValue(frame.getTitle(), result.toString());
                 frameCount++;
-
+                FrameIO.ForceSaveFrame(frame);
+                
                 return result;
         }

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

@@ -38 +38 @@
                 if (_lastNumber < 0) {
                         // create the new frameset
-                        Frame one = FrameIO.CreateFrameset(_nameTo, init.path);
-                        _framePath = one.path;
-                        _lastNumber = -1;
-                        _firstNumber = 1;
+                        try {
+                                Frame one = FrameIO.CreateFrameset(_nameTo, init.path);
 
-                        // copy the original .0 frame
-                        Frame zero = FrameIO.LoadFrame(init.getFramesetNameAdjusted() + "0");
-                        processFrame(zero);
+                                _framePath = one.path;
+                                _lastNumber = -1;
+                                _firstNumber = 1;
+
+                                // copy the original .0 frame
+                                Frame zero = FrameIO.LoadFrame(init.getFramesetNameAdjusted()
+                                                + "0");
+                                processFrame(zero);
+                        } catch (Exception e) {
+                                // TODO fix this up later.
+                        }
                 } else {
                         // get the frame path
@@ -120 +126 @@
                                 }
                         }
-
-                        if (changed)
+                        if (changed) {
                                 FrameIO.SaveFrame(toParse);
+                        }
                 }
 
                 message("Tree successfully copied to " + _nameTo);
-                FrameUtils.DisplayFrame(Frame.GetFramesetNameAdjusted(_nameTo) + _firstNumber);
+                FrameUtils.DisplayFrame(FrameUtils.GetFramesetNameAdjusted(_nameTo)
+                                + _firstNumber);
         }
 

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

@@ -37 +37 @@
         // private static final JScrollPane scrollPane = new JScrollPane();
 
+        public static Browser _theBrowser;
+        
         /**
          * Constructs a new Browser object, then launches it
@@ -43 +45 @@
          */
         public static void main(String[] args) {
-                Browser b = new Browser();
+                _theBrowser = new Browser();
                 // Why do we want to ignore repaint?
                 // b.setIgnoreRepaint(true);
-                b.requestFocus();
+                _theBrowser.requestFocus();
                 // FrameGraphics.ForceRepaint();
         }
-
+        
         public void setSizes(Dimension size) {
                 setSize(size);
@@ -63 +65 @@
                                 .getHeight() / 2)));
 
-                FrameGraphics.setMaxSize(size);
+                FrameGraphics.setMaxSize(this.getContentPane().getSize());
         }
 
@@ -75 +77 @@
                 Frame profile = FrameIO.LoadProfile(UserSettings.Username);
                 if (profile == null) {
+                        try{
                         profile = FrameIO.CreateNewProfile(UserSettings.Username);
+                        }catch(Exception e){
+                                //TODO fix this later
+                        }
                 }
                 FrameUtils.ParseProfile(profile);
@@ -110 +116 @@
                 setVisible(true);
 
-                g = (Graphics2D) getGraphics();
+                setupGraphics();
+
+                // required to accept TAB key
+                setFocusTraversalKeysEnabled(false);
+
+                assert (UserSettings.FirstFrame != null);
+                Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
+
+                DisplayIO.setCurrentFrame(firstFrame);
+
+                // Create the action handler for the
+                FrameMouseActions mouse = new FrameMouseActions();
+                
+                this.getContentPane().addMouseListener(mouse);
+                this.getContentPane().addMouseMotionListener(mouse);
+                this.addKeyListener(new FrameKeyboardActions());
+                this.getContentPane().addMouseWheelListener(mouse);
+        }
+
+        private void setupGraphics() {
+                g = (Graphics2D) this.getContentPane().getGraphics();
                 assert g != null;
                 g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
                                 RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
                 g.setFont(g.getFont().deriveFont(40f));
-
-                FrameGraphics.setDisplayGraphics((Graphics2D) getGraphics());
-
-                // required to accept TAB key
-                setFocusTraversalKeysEnabled(false);
-
-                assert (UserSettings.FirstFrame != null);
-                Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
-
-                DisplayIO.setCurrentFrame(firstFrame);
-
-                // Create the action handler for the
-                FrameMouseActions mouse = new FrameMouseActions();
-
-                this.addMouseListener(mouse);
-                this.addMouseMotionListener(mouse);
-                this.addKeyListener(new FrameKeyboardActions());
-                this.addMouseWheelListener(mouse);
-
-                // Rob: Why is all this being done????
-                g.dispose();
-                g = null;
+                FrameGraphics.setDisplayGraphics(g);
         }
 
@@ -158 +163 @@
          */
         public void componentResized(ComponentEvent e) {
-                FrameGraphics.setMaxSize(this.getSize());
-                // FrameGraphics.Repaint();
+                setSizes(this.getSize());
+                setupGraphics();
                 repaint();
                 //System.out.println("Resize");
@@ -181 +186 @@
          */
         public void componentHidden(ComponentEvent e) {
-        }
-
-        public int getTitleBarHeight() {
-                Rectangle contentbounds = getContentPane().getBounds();
-                contentbounds = this.getGlassPane().getBounds();
-                // contentbounds = this.getRootPane().getBounds();
-                int titleheight = getSize().height - contentbounds.height;
-
-                return titleheight;
         }
 

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

@@ -15 +15 @@
 
 import org.expeditee.items.Item;
-import org.expeditee.items.ItemPermission;
+import org.expeditee.items.Picture;
 import org.expeditee.stats.SessionStats;
 
@@ -59 +59 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp13Mar2008A";
+        public static final String TITLE = "Exp01May2008A";
 
         private DisplayIO() {
@@ -80 +80 @@
                 _VisitedFrames[0] = new Stack<String>();
                 _VisitedFrames[1] = new Stack<String>();
-                UpdateTitle();
         }
 
@@ -175 +174 @@
 
         public static void setCursorPosition(int x, int y, boolean forceArrow) {
-                y += getOffset();
-
                 if (Frame.itemAttachedToCursor()) {
                         List<Item> toMove = Frame.FreeItems;
@@ -205 +202 @@
                 FrameMouseActions.MouseY = y;
 
-                _Robot.mouseMove(_Browser.getDrawingAreaX() + x, _Browser
-                                .getDrawingAreaY()
-                                + y);
-
+                _Robot.mouseMove((int)_Browser.getContentPane().getLocationOnScreen().getX() + x, (int)_Browser.getContentPane().getLocationOnScreen().getY() + y);
         }
 
@@ -269 +263 @@
                         }
 
-                ItemPermission ip = FrameUtils.getCurrentItem();
-                if (ip == null || ip.Item == null)
+                Item ip = FrameUtils.getCurrentItem();
+                if (ip == null)
                         _VisitedFrames[side].push(toAdd.getFrameName());
                 else
@@ -344 +338 @@
 
                 FrameGraphics.Repaint();
+                UpdateTitle();
         }
 
         public static void UpdateTitle() {
-                StringBuffer title = new StringBuffer(TITLE);
+                StringBuffer title = new StringBuffer(TITLE + " [");
 
                 if (FrameGraphics.isAudienceMode())
                         title.append(" - Audience Mode");
-                // title.append(SessionStats.getShortStats());*/
+                else
+                        title.append(SessionStats.getShortStats()).append(']');
 
                 _Browser.setTitle(title.toString());
@@ -452 +448 @@
 
         /**
-         * 
-         */
-        public static int getOffset() {
-                if (_Browser != null)
-                        return /* getMenuHeight() + */_Browser.getTitleBarHeight();
-
-                // default offset (if the menu has not been created yet, etc)
-                return 0;
-        }
-
-        /**
          * Returns the current mouse X coordinate. This coordinate is relative to
          * the left edge of the frame the mouse is in. It takes into account the
@@ -483 +468 @@
          */
         public static int getMouseY() {
-                return FrameMouseActions.MouseY - getOffset();
+                return FrameMouseActions.MouseY;
         }
 
@@ -522 +507 @@
                 for (Item i : frame.getItems())
                         if (i.getLink() != null
-                                        && i.getLink().toLowerCase().equals(oldFrame)) {
+                                        && i.getAbsoluteLink().toLowerCase().equals(oldFrame)) {
                                 i.showHighlight(true, BACK_HIGHLIGHT_COLOR);
+                                //check if its an @f item and if so update the buffer
+                                if (i instanceof Picture) {
+                                        Picture p = (Picture)i;
+                                        p.refresh();
+                                }
                         }
 

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

@@ -163 +163 @@
                 _change = value;
 
-                if (_change)
+                if (_change) {
                         setBufferValid(false);
+                        _saved = false;
+                }
         }
 
         // indicates the frame has changed
-        private void change() {
+        public void change() {
                 setChanged(true);
         }
@@ -185 +187 @@
                 }
 
-                return _body;
+                List<Item> visibleItems = new ArrayList<Item>();
+
+                for (Item i : _body) {
+                        if (i.isVisible())
+                                visibleItems.add(i);
+                }
+
+                return visibleItems;
         }
 
@@ -200 +209 @@
                 for (Item i : getItems()) {
                         // only add up normal body text items
-                        if (i instanceof Text && i != _frameName && i != frameTitle
-                                        && !i.isAnnotation()) {
+                        if ((i instanceof Text) && i != frameTitle && !i.isAnnotation()) {
                                 bodyTextItems.add((Text) i);
                         }
@@ -207 +215 @@
 
                 return bodyTextItems;
+
         }
 
@@ -291 +300 @@
                 List<Item> items = getItems();
                 for (Item i : items) {
-                        if (i instanceof Text /* && !i.isAnnotation() */&& i != _frameName)
+                        if (i instanceof Text)
                                 return (Text) i;
                 }
@@ -298 +307 @@
         }
 
-        public Text getName() {
+        public Text getFrameNameItem() {
                 return _frameName;
         }
@@ -372 +381 @@
         }
 
-        /*
-         * public void setItemTemplate(Text template) { if (template != null)
-         * _template = template; else _template = UserSettings.ItemTemplate.copy(); }
-         */
-
         /**
          * Returns any items on this frame that are within the given Shape. Also
@@ -390 +394 @@
 
                 for (Item i : _body)
-                        if (i.intersects(poly)) {// || shape.contains(i.getX(),
-                                // i.getY())){
+                        if (i.isVisible() && i != _frameName && i.intersects(poly)) {
                                 if (!results.contains(i))
                                         results.add(i);
-                                /*
-                                 * List<Item> connected = i.getConnected(); for(Item item :
-                                 * connected) if(!results.contains(item))
-                                 * results.add(item);//All(i.getConnected());
-                                 */
                         }
 
                 for (Overlay o : _overlays)
                         results.addAll(o.Frame.getItemsWithin(poly));
-
-                /*
-                 * ArrayList<Dot> toInclude = new ArrayList<Line>(0); //remove lines
-                 * that do not have a point anchored in the polygon for(Item i :
-                 * results){ if(i instanceof Line){ Line line = (Line) i;
-                 * if(!(results.contains(line.getStartDot())) &&
-                 * !(results.contains(line.getEndDot()))) removeLines.add(line); } }
-                 * 
-                 * results.removeAll(removeLines);
-                 */
 
                 return results;
@@ -442 +430 @@
         }
 
-        /**
-         * Adjusts a frameset name so a period is appended if it ends in a digit.
-         * This form of the frameset name is used when referencing frames in the
-         * frame set.
-         * 
-         * @param frameset
-         * @return
-         */
-        public static String GetFramesetNameAdjusted(String frameset) {
-                return frameset
-                                + (Character.isDigit(frameset.charAt(frameset.length() - 1)) ? "."
-                                                : "");
-        }
-
         public void setFrameName(String framename) {
                 int num = Conversion.getFrameNumber(framename);
@@ -477 +451 @@
 
                 if (_frameName != null) {
-                        removeItem(_frameName);
                         id = _frameName.getID();
-                } else
+                } else {
                         id = -1 * getNextItemID();
-
+                }
                 _frameName = new Text(id);
+                _frameName.setMaxSize(FrameGraphics.getMaxFrameSize());
                 _frameName.setText(getFramesetNameAdjusted() + _number);
                 _frameName.setPosition(FrameGraphics.getMaxFrameSize().width
@@ -488 +462 @@
                                 - org.expeditee.io.Conversion.X_ADJUST,
                                 org.expeditee.io.Conversion.Y_ADJUST);
-                addItem(_frameName);
-
                 setChanged(oldchange);
         }
@@ -603 +575 @@
                 if (item != null) {
                         if (_body.contains(item)) {
-                                System.out.println("Item (" + item.getClass().getSimpleName()
-                                                + ") with ID " + item.getID() + " already in body.");
+                                // System.out.println("Item (" + item.getClass().getSimpleName()
+                                // + ") with ID " + item.getID() + " already in body.");
                                 return;
                         }
@@ -687 +659 @@
 
                 // if the change was to characteristics
-                if (_body.contains(undo)) {
+                if (undo.isVisible() && _body.contains(undo)) {
                         Item old = _body.get(_body.indexOf(undo));
                         _body.set(_body.indexOf(old), undo);
@@ -742 +714 @@
         }
 
-        public Item getFrameNameItem() {
-                return _frameName;
-        }
-
         /**
          * Returns the format version of this Frame
@@ -858 +826 @@
                 for (int i = ind - 1; i >= 0; i--) {
                         Item check = _body.get(i);
-
-                        if (FrameUtils.inSameColumn(check, current))
+                        if (check.isVisible() && FrameUtils.inSameColumn(check, current))
                                 return check;
                 }
@@ -912 +879 @@
                 for (int i = _body.indexOf(from); i < _body.size(); i++) {
                         Item item = _body.get(i);
-                        if (isNormalTextItem(item)) {
+                        if (item.isVisible() && isNormalTextItem(item)) {
                                 if (FrameUtils.inSameColumn(from, item))
                                         column.add(item);
@@ -983 +950 @@
 
                 List<Item> copies = ItemUtils.CopyItems(toMergeWith.getItems());
+                copies.remove(toMergeWith.getFrameNameItem());
 
                 for (Item i : copies) {
@@ -1010 +978 @@
                                         else if (FrameIO
                                                         .isValidFrameName(((Text) i).getFirstLine())) {
+                                                // If we get hear we are merging frames
                                                 merge(FrameIO.LoadFrame(((Text) i).getFirstLine()));
                                         }
@@ -1025 +994 @@
         public void clear() {
                 List<Item> newBody = new ArrayList<Item>(0);
-
                 for (Item i : _body)
-                        if (i.isAnnotation() || i == getName() || i == getTitle())
+                        if (i.isAnnotation() || i == getFrameNameItem() || i == getTitle())
                                 newBody.add(i);
 
@@ -1069 +1037 @@
                         return getAnnotationTemplate();
                 case '/':
+                case '#':
                         return getCodeCommentTemplate();
                 default:
@@ -1099 +1068 @@
                 return d;
         }
-
-        /**
-         * Creates a JMenu from the Items present on this Frame and adds it to the
-         * Menus on the Display
-         */
-        /*
-         * public void createMenu() { for (Item i : _body) { if (ItemUtils.isTag(i,
-         * ItemUtils.TAG_MENU) && i.getLink() != null) { Frame nextMenu =
-         * FrameIO.LoadFrame(i.getLink()); JMenu menu = nextMenu.createSubMenu();
-         * DisplayIO.addMenu(menu); } } }
-         */
-
-        /**
-         * Creates a new JMenu from the Items present on this Frame
-         * 
-         * @return The newly created JMenu
-         */
-        /*
-         * private JMenu createSubMenu() { Text frameTitle = getTitle();
-         * 
-         * if (frameTitle == null) FrameUtils.Parse(this);
-         * 
-         * if (frameTitle == null || frameTitle.getFirstLine() == null) return null;
-         * 
-         * JMenu menu = new JMenu(frameTitle.getFirstLine());
-         * 
-         * boolean literal = false; String litTitle = null;
-         * 
-         * for (Item i : _body) { // if the @lit tag is active if (literal) {
-         * literal = false; if (litTitle == null) litTitle = ((Text)
-         * i).getFirstLine(); JMenuItem item = new JMenuItem(litTitle);
-         * item.addActionListener(new MenuAction(i, true)); menu.add(item); //
-         * non-annotation items with links or actions are put on the // menu } else
-         * if (i != _frameName && i instanceof Text && !i.isAnnotation() &&
-         * (i.getLink() != null || i.getAction() != null)) { JMenuItem item = new
-         * JMenuItem(((Text) i).getText().get(0)); item.addActionListener(new
-         * MenuAction(i, false)); menu.add(item); // if this is another menu frame }
-         * else if (i.getLink() != null && ItemUtils.isTag(i, ItemUtils.TAG_MENU)) {
-         * Frame nextMenu = FrameIO.LoadFrame(i.getLink());
-         * menu.add(nextMenu.createSubMenu()); // if this menu is continued on
-         * another frame } else if (i.getLink() != null && ItemUtils.isTag(i,
-         * ItemUtils.TAG_MENU_NEXT)) {
-         * 
-         * Frame nextMenu = FrameIO.LoadFrame(i.getLink()); JMenu nmenu =
-         * nextMenu.createSubMenu(); for(int m = 0; m < nmenu.getComponentCount();
-         * m++) menu.add(nmenu.getComponent(m)); // if this is a @lit tag, then the
-         * next item is copied } else if (ItemUtils.isTag(i, ItemUtils.TAG_LITERAL)) {
-         * literal = true; String title = ItemUtils.StripTag(((Text)
-         * i).getFirstLine(), ItemUtils.GetTag(ItemUtils.TAG_LITERAL)); if
-         * (title.length() > 0) litTitle = title; else litTitle = null; } }
-         * 
-         * return menu; }
-         */
-
-        /*
-         * private class MenuAction implements ActionListener { private Item _source =
-         * null;
-         * 
-         * private boolean _copy = false;
-         * 
-         * public MenuAction(Item source, boolean copy) { _source = source; _copy =
-         * copy; }
-         * 
-         * public void actionPerformed(ActionEvent ae) { if (_copy) { Item copy =
-         * _source.copy(); copy.setX(DisplayIO.getMouseX());
-         * copy.setY(DisplayIO.getMouseY()); FrameMouseActions.pickup(copy); return; }
-         * 
-         * if (_source.getAction() != null) { _source.performActions(); } else {
-         * FrameUtils.DisplayFrame(_source.getLink()); } } }
-         */
 
         public boolean isSaved() {

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

@@ -9 +9 @@
 
         private String _name;
-        
+
         private final static int START_Y = 40;
 
@@ -20 +20 @@
         private int _maxX = 0;
 
-        private int _lastY =  START_Y;
+        private int _lastY = START_Y;
 
         private Text _Mnext = new Text(-1, "@Next");
@@ -31 +31 @@
 
         public FrameCreator(String name, boolean recreate) {
-                int num = -1;
-                if (!recreate)
-                        num = FrameIO.getLastNumber(name);
-
                 Frame toUse = null;
-
-                if (num == -1)
-                        toUse = FrameIO.CreateFrameset(name, FrameIO.HELP_PATH);
-                else
-                        toUse = FrameIO.CreateFrame(name, name, null);
-
+                try {
+                        toUse = FrameIO
+                                        .CreateFrameset(name, FrameIO.PROFILE_PATH, recreate);
+                } catch (Exception e) {
+                        if (toUse == null)
+                                toUse = FrameIO.CreateFrame(name, name, null);
+                }
                 _name = name;
                 _lastY += toUse.getTitle().getPosition().y;
@@ -57 +54 @@
          * at the newly created Frame, and _lastY is reset
          */
-        public void createNextFrame() {
-                Frame newFrame = FrameIO.CreateFrame(_current.getFramesetName(),
-                                _name, null);
+        public boolean createNextFrame() {
+                try {
+                        Frame newFrame = FrameIO.CreateFrame(_current.getFramesetName(),
+                                        _name, null);
 
-                // add link to previous frame
-                _prev = _Mprev.copy();
-                _prev.setID(newFrame.getNextItemID());
-                _prev.setLink(_current.getFrameName());
-                newFrame.addItem(_prev);
+                        // add link to previous frame
+                        _prev = _Mprev.copy();
+                        _prev.setID(newFrame.getNextItemID());
+                        _prev.setLink(_current.getFrameName());
+                        newFrame.addItem(_prev);
 
-                // add link to new frame
-                _next = _Mnext.copy();
-                _next.setID(_current.getNextItemID());
-                _next.setLink(newFrame.getFrameName());
-                _current.addItem(_next);
-                FrameIO.SaveFrame(_current, false);
+                        // add link to new frame
+                        _next = _Mnext.copy();
+                        _next.setID(_current.getNextItemID());
+                        _next.setLink(newFrame.getFrameName());
+                        _current.addItem(_next);
+                        FrameIO.SaveFrame(_current, false);
 
-                // update\reset globals
-                _current = newFrame;
-                _lastY = START_Y + _current.getTitle().getPosition().y;;
-                _lastX = START_X;
-                _maxX = 0;
+                        // update\reset globals
+                        _current = newFrame;
+                        _lastY = START_Y + _current.getTitle().getPosition().y;
+                        ;
+                        _lastX = START_X;
+                        _maxX = 0;
+                        return true;
+                } catch (Exception e) {
+                        return false;
+                }
         }
 
-        public void addItem(Item toAdd) {
-                // if we have reached the end of the Y axis, try moving over on the X
-                // axis
-                if (_lastY >= _Mprev.getY() - _Mprev.getBoundsHeight()) {
-                        _lastX = _maxX + 10;
-                        _lastY = START_Y;
+        public boolean addItem(Item toAdd) {
+                try {
+                        // if we have reached the end of the Y axis, try moving over on the
+                        // X
+                        // axis
+                        if (_lastY >= _Mprev.getY() - _Mprev.getBoundsHeight()) {
+                                _lastX = _maxX + 10;
+                                _lastY = START_Y;
+                        }
+
+                        // if there is no more room on the X axis, we have to start a new
+                        // frame
+                        if (toAdd.getBoundsWidth() + _lastX > FrameGraphics.getMaxSize().width) {
+                                createNextFrame();
+                        }
+
+                        toAdd.setPosition(_lastX, _lastY);
+                        toAdd.setOffset(0, 0);
+                        toAdd.setID(_current.getNextItemID());
+
+                        _current.addItem(toAdd);
+                        // _current.addAllItems(items);
+
+                        FrameIO.SaveFrame(_current, false);
+
+                        _lastY = toAdd.getY() + toAdd.getBoundsHeight();
+                        _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
+                        return true;
+                } catch (Exception e) {
+                        return false;
                 }
-
-                // if there is no more room on the X axis, we have to start a new frame
-                if (toAdd.getBoundsWidth() + _lastX > FrameGraphics.getMaxSize().width) {
-                        createNextFrame();
-                }
-
-                toAdd.setPosition(_lastX, _lastY);
-                toAdd.setOffset(0, 0);
-                toAdd.setID(_current.getNextItemID());
-
-                /*
-                 * List<Item> items = new ArrayList<Item>(4);
-                 * 
-                 * items.add(_current.getName()); items.add(_current.getTitle());
-                 * items.add(_prev); items.add(_next);
-                 * 
-                 * _current.getItems().removeAll(items);
-                 * 
-                 * //new system.agents.Format().process(_current);
-                 * 
-                 * //FrameUtils.Align(items, toAdd, true);
-                 */
-                _current.addItem(toAdd);
-                // _current.addAllItems(items);
-
-                FrameIO.SaveFrame(_current, false);
-
-                _lastY = toAdd.getY() + toAdd.getBoundsHeight();
-                _maxX = Math.max(toAdd.getX() + toAdd.getBoundsWidth(), _maxX);
         }
 

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

@@ -126 +126 @@
 
                 // Mike assumes this is the height of the Message window?
-                _MaxSize.setSize(max.width, max.height - DisplayIO.getOffset()
-                                - MESSAGE_BUFFER_HEIGHT);
+                _MaxSize.setSize(max.width, max.height - MESSAGE_BUFFER_HEIGHT);
                 if (DisplayIO.getCurrentFrame() != null) {
                         DisplayIO.getCurrentFrame().setBuffer(null);
@@ -183 +182 @@
                 if (g != null
                                 && (!isAudienceMode()
-                                                || (isAudienceMode() && !i.isAnnotation()) || i == FrameUtils.LastEdited))
-                        // do not paint the name of overlay frames
-                        if (i.getParent() == null
-                                        || i.getParent() == DisplayIO.getCurrentFrame()
-                                        || i.getParent() == DisplayIO.getOppositeFrame()
-                                        || i != i.getParent().getName()) {
-                                Graphics2D tg = (Graphics2D) g.create();
-                                i.paint(tg);
-                                tg.dispose();
-
-                        }
+                                                || (isAudienceMode() && !i.isAnnotation()) || i == FrameUtils.LastEdited)) {
+                        /*
+                         * // do not paint the name of overlay frames if (i.getParent() ==
+                         * null || i.getParent() == DisplayIO.getCurrentFrame() ||
+                         * i.getParent() == DisplayIO.getOppositeFrame() || i !=
+                         * i.getParent().getFrameNameItem()) {
+                         */
+                        Graphics2D tg = (Graphics2D) g.create();
+                        i.paint(tg);
+                        tg.dispose();
+                }
         }
 
@@ -230 +229 @@
 
                         Graphics2D bg = (Graphics2D) buffer.getGraphics();
-                        // Text items should automatically be Anti-Aliased now
-                        /*
-                         * bg.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                         * RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-                         */
 
                         // Nicer looking lines, but may be too jerky while
@@ -252 +246 @@
                         else {
                                 paintItems.addAll(toPaint.getItems());
-                                paintItems.remove(toPaint.getFrameNameItem());
                         }
                         PaintPictures(bg, paintItems);
@@ -307 +300 @@
                                 PaintLines(bg, Frame.FreeItems);
                         }
-
+                        if (paintOverlay) {
+                                PaintItem(bg, toPaint.getFrameNameItem());
+                        }
                         bg.dispose();
                 }
@@ -377 +372 @@
                         // set the clipping area
                         ((Graphics2D) g).setClip(0, 0, DisplayIO.getMiddle() - 1,
-                                        _MaxSize.height + DisplayIO.getOffset());
-                        g.drawImage(left, 0, DisplayIO.getOffset(),
+                                        _MaxSize.height);
+                        g.drawImage(left, 0, 0, DisplayIO.DEFAULT_BACKGROUND, null);
+                        ((Graphics2D) g).setClip(null);
+                        g.drawImage(right, DisplayIO.getMiddle() + 1, 0,
                                         DisplayIO.DEFAULT_BACKGROUND, null);
-                        ((Graphics2D) g).setClip(null);
-                        g.drawImage(right, DisplayIO.getMiddle() + 1,
-                                        DisplayIO.getOffset(), DisplayIO.DEFAULT_BACKGROUND, null);
 
                         // otherwise, just draw whichever side is active
                 } else {
                         if (DisplayIO.getCurrentSide() == 0)
-                                g.drawImage(left, 0, DisplayIO.getOffset(),
-                                                DisplayIO.DEFAULT_BACKGROUND, null);
+                                g.drawImage(left, 0, 0, DisplayIO.DEFAULT_BACKGROUND, null);
                         else
-                                g.drawImage(right, 0, DisplayIO.getOffset(),
-                                                DisplayIO.DEFAULT_BACKGROUND, null);
+                                g.drawImage(right, 0, 0, DisplayIO.DEFAULT_BACKGROUND, null);
                 }
                 // draw the message area
-                g.drawImage(_MessageBuffer, 0, _MaxSize.height + DisplayIO.getOffset(),
-                                null);
+                g.drawImage(_MessageBuffer, 0, _MaxSize.height, null);
                 g.dispose();
         }
@@ -484 +475 @@
          */
         public static void Highlight(Item i, boolean val, boolean changeMouse) {
-                if ((i instanceof Line/* Dot */)) {
-                        List<Item> connected = i.getAllConnected();
-
-                        for (Item conn : connected)
-                                conn.showHighlight(val);
+                if ((i instanceof Line)) {
+                        // Check if within 20% of the end of the line
+                        Line l = (Line) i;
+                        Item toDisconnect = l.getEndPointToDisconnect(
+                                        FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+
+                        if (toDisconnect != null) {
+                                if (Frame.itemAttachedToCursor())
+                                        return;
+
+                                // unhighlight all the other dots
+                                for (Item conn : toDisconnect.getAllConnected()) {
+                                        conn.showHighlight(false);
+                                }
+                                // highlight the dot that will be in disconnect mode
+                                toDisconnect.showDisconnectHighlight(val);
+                                toDisconnect.setFilledHighlight(true);
+                        } else {
+                                List<Item> connected = i.getAllConnected();
+                                for (Item conn : connected) {
+                                        conn.showHighlight(val);
+                                        conn.setFilledHighlight(false);
+                                }
+                        }
                 } else {
                         i.showHighlight(val);
+                        i.setFilledHighlight(true);
                 }
 
@@ -517 +528 @@
          */
         public static void DisplayMessage(String message) {
-                DisplayMessage(message, Color.BLACK);
+                DisplayMessageAlways(message);
         }
 
@@ -528 +539 @@
                 displayMessage(message.getFirstLine(), message.getLink(), message
                                 .getColor());
-                Misc.Beep();
+                // Misc.Beep();
         }
 

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

@@ -4 +4 @@
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -130 +132 @@
         public static Frame LoadFrame(String frameName) {
                 // If the frame name is a positive integer add the frameset name
-                if (isPositiveInteger(frameName)){
-                        assert(false);
+                if (isPositiveInteger(frameName)) {
+                        assert (false);
                         frameName = DisplayIO.getCurrentFrame().getFramesetNameAdjusted()
                                         + frameName;
@@ -160 +162 @@
 
                 return loaded;
+        }
+
+        /**
+         * Gets a list of all the framesets available to the user
+         * 
+         * @return a string containing a list of all the available framesets on
+         *         separate lines
+         */
+        public static String getFramesetList() {
+                StringBuffer list = new StringBuffer();
+
+                for (String path : UserSettings.FrameDirs) {
+                        for (File f : (new File(path)).listFiles()) {
+                                if (f.isDirectory()) {
+                                        list.append(f.getName()).append('\n');
+                                }
+                        }
+                }
+                // remove the final new line char
+                list.deleteCharAt(list.length() - 1);
+                return list.toString();
         }
 
@@ -267 +290 @@
 
         public static Frame LoadPrevious(Frame current) {
+                checkTDFC(current);
+
                 // the current name and number
                 String name = current.getFramesetNameAdjusted();
@@ -292 +317 @@
          */
         public static Frame LoadNext(Frame current) {
+                checkTDFC(current);
 
                 // the current name and number
@@ -318 +344 @@
                 FrameGraphics.DisplayMessage("This is the last frame in the frameset");
                 return null;
+        }
+
+        /**
+         * This method checks if the current frame has just been created with TDFC.
+         * If it has the frame is saved regardless of whether it has been edited or
+         * not and the TDFC item property is cleared. This is to ensure that the
+         * link is saved on the parent frame.
+         * 
+         * @param current
+         */
+        private static void checkTDFC(Frame current) {
+                if (FrameMouseActions.getTdfcItem() != null) {
+                        FrameMouseActions.setTdfcItem(null);
+                        current.change();
+                }
         }
 
@@ -331 +372 @@
                 }
 
-                String adjustedName = Frame.GetFramesetNameAdjusted(framesetName);
+                String adjustedName = FrameUtils.GetFramesetNameAdjusted(framesetName);
 
                 // loop backwards until a frame that exists is found
@@ -368 +409 @@
          */
         public static boolean DeleteFrame(Frame toDelete) throws IOException {
+                if (toDelete == null)
+                        return false;
+
                 SaveFrame(toDelete);
 
@@ -374 +418 @@
                 int lastNumber = FrameIO.getLastNumber(DELETED_FRAMES);
                 String framePath;
-                if (lastNumber < 0) {
+                try{
                         // create the new frameset
                         Frame one = FrameIO.CreateFrameset(DELETED_FRAMES, toDelete.path);
                         framePath = one.path;
                         lastNumber = 0;
-                } else {
+                } catch(Exception e){
                         Frame zero = FrameIO.LoadFrame(DELETED_FRAMES + "0");
                         framePath = zero.path;
@@ -426 +470 @@
                 SuspendCache();
 
-                String adjustFramesetName = Frame.GetFramesetNameAdjusted(frameset);
+                String adjustFramesetName = FrameUtils
+                                .GetFramesetNameAdjusted(frameset);
                 Frame template = null;
                 if (templateFrame == null)
@@ -520 +565 @@
          * @return The first Frame of the new Frameset (Frame.1)
          */
-        public static Frame CreateFrameset(String frameset, String path) {
-                String conversion = frameset + " --> ";
-
-                // ensure the framename is valid
-                frameset = NameValidation(frameset);
-
-                if (frameset == null)
-                        return null;
-
-                conversion += frameset;
-                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Frameset Name: "
-                                + conversion);
-                conversion = frameset;
-
-                /**
-                 * TODO: Update this to exclude any\all invalid filename characters
-                 */
-                // ignore annotation character
-                if (frameset.startsWith("@"))
-                        frameset = frameset.substring(1);
-
-                conversion += " --> " + frameset;
-                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Name: " + conversion);
-
-                // create the new Frameset directory
-                File dir = new File(path + frameset.toLowerCase() + File.separator);
-
-                dir.mkdirs();
-
-                // create the new INF file
-                try {
-                        WriteINF(path, frameset, frameset + getFramesetExtension(frameset));
-                } catch (IOException ioe) {
-                        ioe.printStackTrace();
-                        Logger.Log(ioe);
-                }
-
-                SuspendCache();
-                // copy the default .0 and .1 files
-                Frame base;
-                try {
-                        base = LoadFrame(UserSettings.DefaultFrame);
-                } catch (Exception e) {
-                        base = new Frame();
-                }
-                ResumeCache();
-
-                base.resetDateCreated();
-                base.setFrameset(frameset);
-                base.setFrameNumber(0);
-                base.path = path;
-                SaveFrame(base, false);
-
-                base.resetDateCreated();
-                base.setFrameNumber(1);
-                base.setTitle(frameset);
-                SaveFrame(base, true);
-
-                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Created new frameset: "
-                                + frameset);
-
-                return base;
+        public static Frame CreateFrameset(String frameset, String path) throws Exception{
+                return CreateFrameset(frameset, path, false);
         }
 
@@ -600 +585 @@
 
                 // String must begin with a letter and end with a digit
-                if (!Character.isLetter(frameName.charAt(0))
+                if (!(Character.isLetter(frameName.charAt(0)) || Character.isDigit(frameName.charAt(0)))
                                 || !Character.isDigit(frameName.charAt(frameName.length() - 1)))
                         return false;
 
-                int dotIndex = frameName.indexOf(".");
-                // All the characters inbetween first and last must be letters
-                // or digits
+                int dotIndex = frameName.lastIndexOf('.');
+                // All the characters between first and last must be letters
+                // or digits or period
                 for (int i = 1; i < frameName.length(); i++) {
                         if (dotIndex > 0 && i > dotIndex) {
@@ -645 +630 @@
 
                 if (toSave == null)
+                        return "";
+
+                if (!toSave.hasChanged() || toSave.isSaved())
                         return "";
 
@@ -713 +701 @@
                         }
                 } catch (IOException ioe) {
-                        ioe.printStackTrace();
+                        // ioe.printStackTrace();
                         Logger.Log(ioe);
+                        return null;
                 }
 
@@ -724 +713 @@
         }
 
-        public static Frame CreateNewProfile(String username) {
+        public static Frame CreateNewProfile(String username) throws Exception{
                 Frame profile = CreateFrameset(username, PROFILE_PATH);
                 FrameUtils.CreateDefaultProfile(profile);
@@ -782 +771 @@
         }
 
-        private static String NameValidation(String toValidate) {
+        private static String NameValidation(String toValidate) throws Exception{
                 String result = "";
 
@@ -791 +780 @@
                         // check for illegal characters
                         if (ILLEGAL_CHARS.contains("" + cur)) {
-                                FrameGraphics
-                                                .DisplayMessage("Frameset name contains illegal character '"
+                                throw new Exception("Frameset name contains illegal character '"
                                                                 + cur + "' at position " + (i + 1));
-                                return null;
                         }
 
@@ -808 +795 @@
 
                                 if (result.length() >= MAX_NAME_LENGTH) {
-                                        FrameGraphics
-                                                        .DisplayMessage("Frameset name is too long (Max "
+                                        throw new Exception("Frameset name is too long (Max "
                                                                         + MAX_NAME_LENGTH + " characters)");
-                                        return null;
                                 }
                         }
@@ -832 +817 @@
                 // do auto shrinking of the title
                 Text titleItem = newFrame.getTitle();
-                
-                while(titleItem.getBoundsWidth() + titleItem.getX() > newFrame.getFrameNameItem().getX() ) {
+
+                while (titleItem.getBoundsWidth() + titleItem.getX() > newFrame
+                                .getFrameNameItem().getX()) {
                         titleItem.setSize(titleItem.getSize() - 1);
                 }
-                        
 
                 return newFrame;
@@ -850 +835 @@
          *         frame)
          */
-        public static Frame CreateNewFrameset(String name) {
+        public static Frame CreateNewFrameset(String name) throws Exception{
                 String path = DisplayIO.getCurrentFrame().path;
 
@@ -896 +881 @@
         }
 
+        public static Boolean DoesFramesetExist(String framesetName) {
+                String zeroFrame = FrameUtils.GetFramesetNameAdjusted(framesetName) + '0';
+                return FrameIO.DoesFrameExist(zeroFrame);
+        }
+
+        public static Frame CreateFrameset(String frameset, String path,
+                        boolean recreate) throws Exception{
+                String conversion = frameset + " --> ";
+
+                // ensure the framename is valid
+                frameset = NameValidation(frameset);
+
+                if (frameset == null)
+                        throw new Exception("Invalid frameset name");
+
+                if (!recreate && FrameIO.DoesFramesetExist(frameset)) {
+                        throw new Exception("A frameset called " + frameset + " already exists.");
+                }
+
+                conversion += frameset;
+                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Frameset Name: "
+                                + conversion);
+                conversion = frameset;
+
+                /**
+                 * TODO: Update this to exclude any\all invalid filename characters
+                 */
+                // ignore annotation character
+                if (frameset.startsWith("@"))
+                        frameset = frameset.substring(1);
+
+                conversion += " --> " + frameset;
+                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Name: " + conversion);
+
+                // create the new Frameset directory
+                File dir = new File(path + frameset.toLowerCase() + File.separator);
+
+                dir.mkdirs();
+
+                // create the new INF file
+                try {
+                        WriteINF(path, frameset, frameset + getFramesetExtension(frameset));
+                } catch (IOException ioe) {
+                        ioe.printStackTrace();
+                        Logger.Log(ioe);
+                }
+
+                SuspendCache();
+                // copy the default .0 and .1 files
+                Frame base;
+                try {
+                        base = LoadFrame(UserSettings.DefaultFrame);
+                } catch (Exception e) {
+                        base = new Frame();
+                }
+                ResumeCache();
+
+                base.resetDateCreated();
+                base.setFrameset(frameset);
+                base.setFrameNumber(0);
+                base.setTitle(base.getFramesetNameAdjusted() + "0");
+                base.path = path;
+                base.change();
+                SaveFrame(base, false);
+
+                base.resetDateCreated();
+                base.setFrameNumber(1);
+                base.setTitle(frameset);
+                base.change();
+                SaveFrame(base, true);
+
+                Logger.Log(Logger.SYSTEM, Logger.NEW_FRAMESET, "Created new frameset: "
+                                + frameset);
+
+                return base;
+        }
+
+        public static boolean DeleteFrameset(String framesetName) {
+                if (!FrameIO.DoesFramesetExist(framesetName))
+                        return false;
+
+                for (String path : UserSettings.FrameDirs) {
+                        String source = path + framesetName.toLowerCase() + File.separator;
+                        File framesetDirectory = new File(source);
+                        if (framesetDirectory.exists()) {
+                                for (File f : framesetDirectory.listFiles())
+                                        f.delete();
+                                return framesetDirectory.delete();
+                        }
+                }
+                return false;
+        }
+
+        public static boolean CopyFrameset(String framesetToCopy,
+                        String copiedFrameset) throws Exception {
+                if (!FrameIO.DoesFramesetExist(framesetToCopy))
+                        return false;
+                if (FrameIO.DoesFramesetExist(copiedFrameset))
+                        return false;
+                // search through all the directories to find the frameset we are
+                // copying
+                for (String path : UserSettings.FrameDirs) {
+                        String source = path + framesetToCopy.toLowerCase()
+                                        + File.separator;
+                        File framesetDirectory = new File(source);
+                        if (framesetDirectory.exists()) {
+                                // copy the frameset
+                                File copyFramesetDirectory = new File(path
+                                                + copiedFrameset.toLowerCase() + File.separator);
+                                if (!copyFramesetDirectory.mkdirs())
+                                        return false;
+                                // copy each of the frames
+                                for (File f : framesetDirectory.listFiles()) {
+                                        String copyPath = copyFramesetDirectory.getAbsolutePath()
+                                                        + File.separator + f.getName();
+                                        FrameIO.copyFile(f.getAbsolutePath(), copyPath);
+                                }
+                                return true;
+                        }
+                }
+                return false;
+        }
+
+        public static void copyFile(String existingFile, String newFileName)
+                        throws Exception {
+                FileInputStream is = new FileInputStream(existingFile);
+                FileOutputStream os = new FileOutputStream(newFileName, false);
+                int data;
+                while ((data = is.read()) != -1) {
+                        os.write(data);
+                }
+                os.flush();
+                os.close();
+                is.close();
+        }
+
+        /**
+         * Saves a frame regardless of whether or not the frame is marked as having
+         * been changed.
+         * 
+         * @param frame
+         *            the frame to save
+         * @return the contents of the frame or null if it could not be saved
+         */
+        public static String ForceSaveFrame(Frame frame) {
+                frame.change();
+                return SaveFrame(frame, false);
+        }
+
 }

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -18 +19 @@
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
-import org.expeditee.items.ItemPermission;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
@@ -25 +25 @@
 
 public class FrameKeyboardActions implements KeyListener {
+
+        private static Text _toRemove = null;
 
         // these numbers correspond to the Function Key numbers (0 = Escape key)
@@ -81 +83 @@
                                 // remove the link for alt+l
                                 if (ch == 'l') {
-                                        FrameUtils.getCurrentItem().Item.setLink(null);
+                                        FrameUtils.getCurrentItem().setLink(null);
                                         FrameGraphics.Repaint();
                                 }
@@ -91 +93 @@
         }
 
-        private static void processChar(char ch) {
-
-                ItemPermission ip = FrameUtils.getCurrentItem();
+        public static void processChar(char ch) {
+
+                Item on = FrameUtils.getCurrentItem();
 
                 // permission check
-                if (ip != null && ip.Permission < ItemPermission.PERMISSION_FULL) {
+                if (on != null && on.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to edit this item");
@@ -102 +104 @@
                 }
 
-                Item on = null;
-
-                if (ip != null)
-                        on = ip.Item;
+                if (_toRemove != null && on != _toRemove) {
+                        assert (_toRemove.getLength() == 0);
+                        // This line is to protect mistaken removal of items if there is a
+                        // bug...
+                        if (_toRemove.getLength() == 0)
+                                DisplayIO.getCurrentFrame().removeItem(_toRemove);
+                }
+                _toRemove = null;
 
                 // ignore delete and backspace if in free space
@@ -124 +130 @@
                         on = null;
 
+                // DisplayIO.UpdateTitle();
+
                 Text text = (Text) on;
-
-                // DisplayIO.UpdateTitle();
-
                 // if this text is empty but has not been removed (such as from
                 // ESC-pushdown)
@@ -135 +140 @@
                                 replaceText(text);
                         else {
-                                DisplayIO.getCurrentFrame().removeItem(text);
                                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
                         }
@@ -163 +167 @@
                 // away)
                 if (text.isEmpty()) {
+                        _toRemove = text;
+
                         if (text.getAction() != null)
                                 text.setActionMark(true);
@@ -170 +176 @@
                                 replaceText(text);
                         else {
-                                DisplayIO.getCurrentFrame().removeItem(text);
+                                // DisplayIO.getCurrentFrame().removeItem(text);
                                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
                         }
@@ -241 +247 @@
 
         private void move(int direction) {
-                ItemPermission ip = FrameUtils.getCurrentItem();
+                Item ip = FrameUtils.getCurrentItem();
 
                 if (ip == null) {
@@ -250 +256 @@
                 }
 
-                Item on = ip.Item;
+                Item on = ip;
                 if (on instanceof Text) {
                         // When the user hits the left and right button with mouse
@@ -341 +347 @@
 
         /**
+         * 
+         * @param text
+         * @param yPos
+         * @return the new yPos for the next item
+         */
+        private static int addTextItemToCurrentFrame(String text, int yPos) {
+                if (text.trim().length() > 0) {
+                        Text textItem = createText();
+                        textItem.setText(text.substring(0, text.length() - 1));
+                        textItem.setY(yPos);
+                        DisplayIO.getCurrentFrame().addItem(textItem);
+                        return textItem.getY() + textItem.getBoundsHeight();
+                }
+                return yPos;
+        }
+
+        /**
          * Processes all control character keystrokes. Currently Ctrl+C and Ctrl+V
          * are copy and paste, all other keystrokes are ignored.
@@ -356 +379 @@
                                                 .getTransferData(DataFlavor.stringFlavor));
 
-                                ItemPermission clicked = FrameUtils.getCurrentItem();
+                                Item clicked = FrameUtils.getCurrentItem();
 
                                 if (clicked != null) {
                                         // check permissions
-                                        if (clicked.Permission < ItemPermission.PERMISSION_FULL
-                                                        && clicked.Item.getParent() != null
-                                                        && clicked.Item.getParent().getName() != clicked.Item) {
+                                        if (clicked.Permission < Item.PERMISSION_FULL
+                                                        && clicked.getParent() != null
+                                                        && clicked.getParent().getFrameNameItem() != clicked) {
                                                 FrameGraphics.DisplayMessage("Insufficient Permission");
                                                 return;
@@ -372 +395 @@
                                         clipboard.add(text);
                                         List<Item> left = FrameMouseActions.merge(clipboard,
-                                                        clicked.Item);
+                                                        clicked);
                                         FrameMouseActions.anchor(left);
                                 } else {
@@ -382 +405 @@
 
                                         // separate the clipboard content into items based on
-                                        // blank
-                                        // lines
+                                        // blank lines
                                         while (st.hasMoreTokens()) {
                                                 String s = st.nextToken();
                                                 // if this is a blank line, then it is an item separator
                                                 if (s.trim().length() == 0) {
-                                                        if (temp.trim().length() > 0) {
-                                                                Text text = createText();
-                                                                text.setText(temp);
-                                                                text.setY(y);
-                                                                DisplayIO.getCurrentFrame().addItem(text);
-                                                                y = text.getY() + text.getBoundsHeight();
-                                                        }
+                                                        y = addTextItemToCurrentFrame(temp, y);
                                                         temp = "";
                                                 } else {
-                                                        if (st.hasMoreTokens()) {
-                                                                temp += s + "\n";
-                                                                st.nextToken(); // Skip '\n' separator
-                                                        } else {
-                                                                temp += s;
-                                                        }
+                                                        temp += s + "\n";
+                                                        if (st.hasMoreTokens())
+                                                                st.nextToken();
                                                 }
                                         }
                                         // the last item will not be finished by the above loop
-                                        if (temp.trim().length() > 1) {
-                                                Text text = createText();
-                                                text.setText(temp);
-                                                text.setY(y);
-                                                DisplayIO.getCurrentFrame().addItem(text);
-                                                temp = "";
-                                        }
+                                        addTextItemToCurrentFrame(temp, y);
                                 }
 
@@ -422 +429 @@
                         // if this is a copy command
                 } else if (ch.charAt(0) == KeyEvent.VK_C) {
-                        ItemPermission ip = FrameUtils.getCurrentItem();
-
-                        if (ip != null && ip.Permission < ItemPermission.PERMISSION_COPY) {
+                        Item ip = FrameUtils.getCurrentItem();
+
+                        if (ip != null && ip.Permission < Item.PERMISSION_COPY) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient permission to copy that item");
@@ -432 +439 @@
                         Item on = null;
                         if (ip != null)
-                                on = ip.Item;
+                                on = ip;
 
                         if (on == null || !(on instanceof Text))
@@ -511 +518 @@
          */
         private static Text getCurrentTextItem() {
-                ItemPermission ip = FrameUtils.getCurrentItem();
-
-                if (ip != null && ip.Permission < ItemPermission.PERMISSION_FULL) {
+                Item ip = FrameUtils.getCurrentItem();
+
+                if (ip != null && ip.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to copy that item");
@@ -521 +528 @@
                 Item on = null;
                 if (ip != null)
-                        on = ip.Item;
+                        on = ip;
 
                 if (on == null || !(on instanceof Text))
@@ -535 +542 @@
         public static void functionKey(int key) {
                 // get whatever the user is pointing at
-                ItemPermission on = FrameUtils.getCurrentItem();
+                Item on = FrameUtils.getCurrentItem();
 
                 // check for enclosed mode
-                if (on == null || on.Item == null) {
-                        List<ItemPermission> enclosed = FrameUtils.getCurrentItems();
+                if (on == null || on == null) {
+                        List<Item> enclosed = FrameUtils.getCurrentItems();
 
                         if (enclosed != null && enclosed.size() > 0) {
@@ -549 +556 @@
                                 // items
                                 boolean resizeLines = true;
-                                for (ItemPermission ip : enclosed) {
-                                        if (ip.Item != null) {
-                                                if (!(ip.Item instanceof Line)
-                                                                && !(ip.Item instanceof Dot)) {
+                                for (Item ip : enclosed) {
+                                        if (ip != null) {
+                                                if (!(ip instanceof Line) && !(ip instanceof Dot)) {
                                                         resizeLines = false;
                                                         break;
@@ -559 +565 @@
                                 }
 
-                                for (ItemPermission ip : enclosed) {
-                                        if (ip.Item != null && !(connected.indexOf(ip.Item) > 0))
+                                for (Item ip : enclosed) {
+                                        if (ip != null && !(connected.indexOf(ip) > 0))
                                                 switch (key) {
                                                 case SIZE_UP:
                                                         if (resizeLines
-                                                                        || (!(ip.Item instanceof Line) && !(ip.Item instanceof Dot)))
+                                                                        || (!(ip instanceof Line) && !(ip instanceof Dot)))
                                                                 SetSize(ip, 1, false);
                                                         break;
                                                 case SIZE_DOWN:
                                                         if (resizeLines
-                                                                        || (!(ip.Item instanceof Line) && !(ip.Item instanceof Dot)))
+                                                                        || (!(ip instanceof Line) && !(ip instanceof Dot)))
                                                                 SetSize(ip, -1, false);
                                                         break;
@@ -654 +660 @@
          *            indicate the cursor is in free space.
          */
-        private static void Drop(ItemPermission ip) {
+        private static void Drop(Item ip) {
                 String newItemText = DEFAULT_NEW_ITEM_TEXT;
 
@@ -664 +670 @@
                 Item toDropFrom = null;
                 if (ip != null)
-                        toDropFrom = ip.Item;
+                        toDropFrom = ip;
 
                 // if the cursor is in free space then the drop will happen from the
@@ -751 +757 @@
                                         Frame moreFrame = DisplayIO.getCurrentFrame();
                                         moreFrame.setTitle(firstFrame.getTitle().getTextNoList());
-                                        //need to move the mouse to the top of the frame if there wasnt an @start on it
+                                        // need to move the mouse to the top of the frame if there
+                                        // wasnt an @start on it
                                         if (!mouseMoved) {
-                                                Drop(new ItemPermission(moreFrame.getTitle(), ItemPermission.PERMISSION_FULL));
+                                                Item moreTitle = moreFrame.getTitle();
+                                                moreTitle.Permission = Item.PERMISSION_FULL;
+                                                Drop(moreTitle);
                                         }
-                                        
+
                                         // Add the bullet text to the item
-                                        dummyItem.setPosition(DisplayIO.getMouseX(),
-                                                        DisplayIO.getMouseY());
+                                        dummyItem.setPosition(DisplayIO.getMouseX(), DisplayIO
+                                                        .getMouseY());
                                 } else {
                                         FrameGraphics
@@ -945 +954 @@
          *            with resizing
          */
-        private static void SetSize(ItemPermission ip, int diff, boolean moveCursor) {
+        private static void SetSize(Item ip, int diff, boolean moveCursor) {
                 List<Item> toSize;
                 // the mouse is only moved when the Item is on the frame, not free
@@ -962 +971 @@
                 } else {
                         // check permissions
-                        if (ip.Permission < ItemPermission.PERMISSION_FULL) {
+                        if (ip.Permission < Item.PERMISSION_FULL) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient permission to change the size of that item");
                                 return;
                         }
-                        toSet = ip.Item;
+                        toSet = ip;
 
                         toSize = toSet.getConnected();
@@ -1054 +1063 @@
                         return;
 
-                Item toSet = item;// .Item;
+                Item toSet = item;// ;
                 Color color = toSet.getFillColor();
 
-                color = ColorUtils.getNextColor(color, Item.COLOR_WHEEL);
+                color = ColorUtils.getNextColor(color, Item.FILL_COLOR_WHEEL);
 
                 // TODO what happens if the above statement returns null??
@@ -1074 +1083 @@
          *            The Item whose colour is to be changed
          */
-        private static void SetColor(ItemPermission ip) {
+        private static void SetColor(Item ip) {
                 // first determine the next color
                 Color color = null;
@@ -1086 +1095 @@
                         // change the background color if the user is pointing on the
                         // frame name
-                } else if (ip.Item == DisplayIO.getCurrentFrame().getName()) {
+                } else if (ip == DisplayIO.getCurrentFrame().getFrameNameItem()) {
                         DisplayIO.getCurrentFrame().toggleBackgroundColor();
                         return;
                 } else {
                         // check permissions
-                        if (ip.Permission < ItemPermission.PERMISSION_FULL) {
+                        if (ip.Permission < Item.PERMISSION_FULL) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient permission to change that item's color");
                                 return;
                         }
-                        color = ip.Item.getColor();
+                        color = ip.getColor();
                 }
 
@@ -1110 +1119 @@
                                 i.setColor(color);
                 } else {
-                        Item toSet = ip.Item;
+                        Item toSet = ip;
                         toSet.setColor(color);
                         toSet.getParent().setChanged(true);
@@ -1125 +1134 @@
          *            The Item to toggle
          */
-        private static void ToggleAnnotation(ItemPermission toToggle) {
+        private static void ToggleAnnotation(Item toToggle) {
                 if (toToggle == null) {
                         FrameGraphics.DisplayMessage("There is no Item selected to toggle");
@@ -1132 +1141 @@
 
                 // check permissions
-                if (toToggle.Permission < ItemPermission.PERMISSION_FULL) {
+                if (toToggle.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to toggle that item's annotation");
@@ -1138 +1147 @@
                 }
 
-                toToggle.Item.setAnnotation(!toToggle.Item.isAnnotation());
-                toToggle.Item.getParent().setChanged(true);
+                toToggle.setAnnotation(!toToggle.isAnnotation());
+                toToggle.getParent().setChanged(true);
                 FrameGraphics.Repaint();
         }
@@ -1149 +1158 @@
          *            The Item to toggle
          */
-        private static void ToggleFontStyle(ItemPermission toToggle) {
+        private static void ToggleFontStyle(Item toToggle) {
                 if (toToggle == null) {
                         FrameGraphics.DisplayMessage("There is no Item selected to toggle");
@@ -1156 +1165 @@
 
                 // check permissions
-                if (toToggle.Permission < ItemPermission.PERMISSION_FULL) {
+                if (toToggle.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to toggle that item's annotation");
@@ -1162 +1171 @@
                 }
 
-                if (toToggle.Item instanceof Text) {
-                        Text text = (Text) toToggle.Item;
+                if (toToggle instanceof Text) {
+                        Text text = (Text) toToggle;
                         text.toggleFontStyle();
 
@@ -1177 +1186 @@
          *            The Item to toggle
          */
-        private static void ToggleFontFamily(ItemPermission toToggle) {
+        private static void ToggleFontFamily(Item toToggle) {
                 if (toToggle == null) {
                         FrameGraphics.DisplayMessage("There is no Item selected to toggle");
@@ -1184 +1193 @@
 
                 // check permissions
-                if (toToggle.Permission < ItemPermission.PERMISSION_FULL) {
+                if (toToggle.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to toggle that item's annotation");
@@ -1190 +1199 @@
                 }
 
-                if (toToggle.Item instanceof Text) {
-                        Text text = (Text) toToggle.Item;
+                if (toToggle instanceof Text) {
+                        Text text = (Text) toToggle;
                         text.toggleFontFamily();
 
@@ -1207 +1216 @@
          *            The Item to prepend the date to, or null
          */
-        private static void AddDate(ItemPermission toAdd) {
+        private static void AddDate(Item toAdd) {
                 String date1 = Logger.EasyDateFormat("ddMMMyyyy[HH:mm]");
                 String date2 = Logger.EasyDateFormat("ddMMMyyyy");
@@ -1216 +1225 @@
                 boolean append = false;
 
-                // if the user is pointing at an item, add the date where ever the cursor is pointing
+                // if the user is pointing at an item, add the date where ever the
+                // cursor is pointing
                 if (toAdd != null) {
-                        if (toAdd.Item instanceof Text) {
+                        if (toAdd instanceof Text) {
                                 // permission check
-                                if (toAdd.Permission < ItemPermission.PERMISSION_FULL) {
+                                if (toAdd.Permission < Item.PERMISSION_FULL) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficicent permission to add the date to that item");
                                         return;
                                 }
-                                
-                                Text textItem = (Text) toAdd.Item;
-                                
+
+                                Text textItem = (Text) toAdd;
+
                                 String text = textItem.getTextNoList();
 
@@ -1253 +1263 @@
                                         }
                                 }
-                                
+
                                 if (prepend) {
                                         // add the date to the text item
@@ -1265 +1275 @@
                                                 DisplayIO.setCursorPosition(textItem.getPosition());
                                 } else {
-                                        for(int i = 0; i < date1.length(); i++) {
+                                        for (int i = 0; i < date1.length(); i++) {
                                                 processChar(date1.charAt(i));
                                         }
@@ -1294 +1304 @@
          * @param name
          */
-        private static void CreateFrameset(ItemPermission ip) {
-                if (ip == null || !(ip.Item instanceof Text)) {
+        private static void CreateFrameset(Item ip) {
+                if (ip == null || !(ip instanceof Text)) {
                         FrameGraphics
                                         .DisplayMessage("There is no selected item to use for the Frameset name");
@@ -1302 +1312 @@
 
                 // check permissions
-                if (ip.Permission < ItemPermission.PERMISSION_FULL) {
+                if (ip.Permission < Item.PERMISSION_FULL) {
                         FrameGraphics
                                         .DisplayMessage("Insufficient permission to create a frameset from this item");
@@ -1308 +1318 @@
                 }
 
-                Text text = (Text) ip.Item;
-
-                // create the new frameset
-                Frame linkTo = FrameIO.CreateNewFrameset(text.getFirstLine());
-                DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-
-                // if the frameset was created successfully
-                if (linkTo != null) {
+                Text text = (Text) ip;
+                try {
+                        // create the new frameset
+                        Frame linkTo = FrameIO.CreateNewFrameset(text.getFirstLine());
+                        DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+
                         text.setLink(linkTo.getFrameName());
 
                         text.getParent().setChanged(true);
                         FrameUtils.DisplayFrame(linkTo, true);
-                } else {
+                        linkTo.moveMouseToDefaultLocation();
+                        // this needs to be done if the user doesnt move the mouse before
+                        // doing
+                        // tdfc while the cursor is set to the text cursor
+                        DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+                } catch (IOException ioe) {
                         FrameGraphics
                                         .ErrorMessage("An error occured when trying to create the new frameset");
+                } catch (Exception e) {
                 }
         }
@@ -1332 +1346 @@
          *            This Item is currently ignored
          */
-        private static void ToggleAudience(ItemPermission ignored) {
+        private static void ToggleAudience(Item ignored) {
                 FrameGraphics.ToggleAudienceMode();
         }
 
-        private static void ToggleXRayMode(ItemPermission ignored) {
+        private static void ToggleXRayMode(Item ignored) {
                 FrameGraphics.ToggleXRayMode();
         }
@@ -1347 +1361 @@
          */
         /*
-         * private static void RunFirstMenuItem(ItemPermission ignored) {
+         * private static void RunFirstMenuItem(Item ignored) {
          * DisplayIO.activateMenuItem(0, 0); }
          */
@@ -1357 +1371 @@
          *            This Item is currently ignored
          */
-        private static void Repaint(ItemPermission ignored) {
+        private static void Repaint(Item ignored) {
                 FrameUtils.Parse(DisplayIO.getCurrentFrame());
                 FrameGraphics.ForceRepaint();

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

@@ -17 +17 @@
 import org.expeditee.actions.Actions;
 import org.expeditee.actions.NavigationActions;
+import org.expeditee.agents.Format;
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
-import org.expeditee.items.ItemPermission;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
@@ -71 +71 @@
         private static int _offX;
 
+        // MIKE: Thinks the offsets are used in getting items to draw in the message
+        // window?
         private static int _offY;
 
@@ -88 +90 @@
         private static boolean _isNoOp = false;
 
+        private static boolean _extrude = false;
+
         // keeps track of the last highlighted Item
         private static Item _lastHighlightedItem = null;
@@ -116 +120 @@
         }
 
+        static int _mouseDown = 0;
+
         private static MouseEvent _lastMouseClick = null;
 
-        private static ItemPermission _lastClickedOn = null;
-
-        private static List<ItemPermission> _lastClickedIn = null;
+        private static Item _lastClickedOn = null;
+
+        private static List<Item> _lastClickedIn = null;
 
         private static boolean _pulseOn = false;
 
-        private static int _pulseAmount = 2;
+        private static final int PULSE_AMOUNT = 2;
 
         private static Timer _MouseTimer = new Timer(LITTLE_MOUSE_PAUSE,
@@ -131 +137 @@
                                         // check if we are in free space
                                         if (_lastClickedOn == null && Frame.FreeItems.size() == 0) {
-                                                System.out.println("SuperBack!");
-                                                leftButton(null);
+                                                // System.out.println("SuperBack!");
                                                 _MouseTimer.setDelay(ZERO_MOUSE_PAUSE);
+                                                back();
                                         } else {
-                                                _pulseOn = !_pulseOn;
-
-                                                if (_MouseTimer.getDelay() == LITTLE_MOUSE_PAUSE)
-                                                        _MouseTimer.setDelay(LITTLE_MOUSE_PAUSE + 1);
-                                                else
-                                                        _MouseTimer.setDelay(BIG_MOUSE_PAUSE);
                                                 if (FrameUtils.getCurrentItem() == null) {
-                                                        for (Item i : Frame.FreeItems) {
-                                                                if (i instanceof Line) {
-                                                                        Line line = (Line) i;
-                                                                        if (_pulseAmount < 4
-                                                                                        && line.getThickness() < 0)
-                                                                                _pulseAmount = 4;
-
-                                                                        if (_pulseOn)
-                                                                                line.setThickness(line.getThickness()
-                                                                                                + _pulseAmount);
-                                                                        else
-                                                                                line.setThickness(line.getThickness()
-                                                                                                - _pulseAmount);
-
-                                                                        line.toggleArrow();
+                                                        // Check if we are toggling arrowhead
+                                                        if (Frame.FreeItems.size() <= 2) {
+                                                                for (Item i : Frame.FreeItems) {
+                                                                        if (i instanceof Line) {
+                                                                                ((Line) i).toggleArrow();
+                                                                        }
                                                                 }
+                                                                FrameGraphics.Repaint();
                                                         }
-                                                        FrameGraphics.Repaint();
                                                 }
                                                 _MouseTimer.stop();
                                         }
+                                }
+                        });
+
+        private static void setPulse(boolean pulseOn) {
+                if (_pulseOn == pulseOn)
+                        return;
+                int amount = PULSE_AMOUNT;
+                if (!pulseOn)
+                        amount *= -1;
+                _pulseOn = pulseOn;
+
+                for (Item i : _lastClickedOn.getAllConnected()) {
+                        if (i instanceof Line) {
+                                Line line = (Line) i;
+                                line.setThickness(line.getThickness() + amount);
+                        }
+                }
+                FrameGraphics.Repaint();
+        }
+
+        private static Timer _ExtrudeMouseTimer = new Timer(BIG_MOUSE_PAUSE,
+                        new ActionListener() {
+                                public void actionPerformed(ActionEvent ae) {
+                                        setPulse(true);
+                                        _extrude = true;
+                                        _ExtrudeMouseTimer.stop();
                                 }
                         });
@@ -176 +193 @@
          */
         public void mousePressed(MouseEvent e) {
+                _mouseDown += e.getButton();
                 _lastMouseClickDate = new Date();
                 _lastClickedOn = FrameUtils.getCurrentItem();
                 // load any frame if necessary
-                ItemPermission on = _lastClickedOn;
+                Item on = _lastClickedOn;
 
                 _lastClickedIn = FrameUtils.getCurrentItems();
@@ -186 +204 @@
                 if (e.getButton() == MouseEvent.BUTTON1) {
                         SessionStats.AddFrameEvent("Ld");
+                        _extrude = false;
                 } else if (e.getButton() == MouseEvent.BUTTON2) {
                         SessionStats.AddFrameEvent("Md");
+                        _extrude = false;
                 } else if (e.getButton() == MouseEvent.BUTTON3) {
                         SessionStats.AddFrameEvent("Rd");
@@ -193 +213 @@
 
                 _lastMouseClick = e;
-                _MouseTimer.start();
+
+                // Only start the timer when in free space when the user double clicks
+                // to do super back
+                // TODO change this so that there are separate timers for super back and
+                // the other
+                // Long depress actions if that is what is wanted.
+                if (_lastClickedOn == null && Frame.FreeItems.size() == 0) {
+                        // System.out.println(e.getClickCount());
+                        if (e.getClickCount() >= 2) {
+                                _MouseTimer.start();
+                        }
+                } else if (_lastClickedOn != null && Frame.FreeItems.size() == 0
+                                && e.getButton() == MouseEvent.BUTTON3) {
+                        _ExtrudeMouseTimer.start();
+
+                } else {
+                        _MouseTimer.start();
+                }
 
                 // pre-cache the frame if it is linked
-                if (on != null && on.Item.getLink() != null && on.Item.isLinkValid()) {
-                        FrameIO.Precache(on.Item.getLink());
+                if (on != null && on.getLink() != null && on.isLinkValid()) {
+                        FrameIO.Precache(on.getLink());
                 }
 
@@ -231 +268 @@
 
                 // if the user is ranging text
-                if (on != null && on.Item instanceof Text && !_isDelete) {
-                        _lastRanged = (Text) on.Item;
+                if (on != null && on instanceof Text && !_isDelete) {
+                        _lastRanged = (Text) on;
                         // set start-drag point
                         _lastRanged.setSelectionStart(DisplayIO.getMouseX(), DisplayIO
@@ -238 +275 @@
                 }
 
-                if (on != null && on.Item instanceof Picture
+                if (on != null && on instanceof Picture
                                 && e.getButton() == MouseEvent.BUTTON3 && !_isDelete) {
-                        _lastCropped = (Picture) on.Item;
+                        _lastCropped = (Picture) on;
                         // set start crop point
                         _lastCropped.setStartCrop(DisplayIO.getMouseX(), DisplayIO
@@ -250 +287 @@
         // This is where all the processing happens
         public void mouseReleased(MouseEvent e) {
+                _mouseDown -= e.getButton();
                 updateCursor();
+
+                // System.out.println(e.getX() + ", " + e.getY());
 
                 Text lastRanged = _lastRanged;
@@ -275 +315 @@
                 FrameUtils.ResponseTimer.restart();
 
+                _ExtrudeMouseTimer.stop();
                 _MouseTimer.stop();
-                _MouseTimer.setDelay(LITTLE_MOUSE_PAUSE);
-
-                if (_pulseOn) {
-                        for (Item i : Frame.FreeItems) {
-                                if (i instanceof Line) {
-                                        Line line = (Line) i;
-                                        line.setThickness(line.getThickness() - _pulseAmount);
-                                }
-                        }
-                        _pulseOn = false;
-                }
-
-                // if the user was performing actions, stop now
-                if (_pulseAmount < 0) {
-                        _pulseAmount = 2;
-                        return;
-                }
-
-                // reset pulse value
-                _pulseAmount = 2;
+                setPulse(false);
 
                 if (Actions.isAgentRunning()) {
@@ -315 +337 @@
 
                 // get whatever the user was pointing at
-                ItemPermission clickedOn = _lastClickedOn;
-                List<ItemPermission> clickedIn = _lastClickedIn;
+                Item clickedOn = _lastClickedOn;
+                List<Item> clickedIn = _lastClickedIn;
 
                 MouseX = e.getX();
                 MouseY = e.getY();
 
-                List<ItemPermission> releasedIn = FrameUtils.getCurrentItems();
-                ItemPermission releasedOn = FrameUtils.getCurrentItem();
+                List<Item> releasedIn = FrameUtils.getCurrentItems();
+                Item releasedOn = FrameUtils.getCurrentItem();
 
                 if (_isNoOp
-                                && ((releasedOn != null && clickedOn != null && releasedOn.Item != clickedOn.Item) || (releasedOn == null && releasedIn == null))) {
+                                && ((releasedOn != null && clickedOn != null && releasedOn != clickedOn) || (releasedOn == null && releasedIn == null))) {
                         if (_isDelete) {
                                 _isDelete = false;
@@ -335 +357 @@
                         if (_lastHighlightedItem != null)
                                 FrameGraphics.Highlight(_lastHighlightedItem, false, false);
-                        // TODO Michael thinks this code should never be reached and can be
-                        // removed
+
                         if (Frame.itemAttachedToCursor()) {
                                 move(Frame.FreeItems);
@@ -352 +373 @@
                 if (_isDelete) {
                         if (lastRanged != null) {
-                                lastRanged.cutSelectedText();
+
+                                Item i = Frame.getItemAttachedToCursor();
+                                if (i != null && i instanceof Text) {
+                                        lastRanged.replaceSelectedText(((Text) i).getTextNoList());
+                                        Frame.FreeItems.clear();
+                                } else
+                                        lastRanged.cutSelectedText();
                                 lastRanged.clearSelection();
                                 FrameGraphics.Repaint();
@@ -366 +393 @@
                 // if this is an attribute extraction command
                 if (_isAttribute) {
-                        extractAttributes(clickedOn);
+                        if (clickedOn == null) {
+                                new Format().process(DisplayIO.getCurrentFrame());
+                        } else {
+                                extractAttributes(clickedOn);
+                        }
                         _wasDouble = true;
                         _isAttribute = false;
@@ -402 +433 @@
                 }
 
-                // if the user is cropping an imate
-                if (clickedOn != null && clickedOn.Item == _lastCropped
+                // if the user is cropping an image
+                if (clickedOn != null && clickedOn == _lastCropped
                                 && _lastCropped.getCroppedSize() > 0) {
                         Picture cropped = _lastCropped.copy();
-
                         cropped.setParent(null);
                         pickup(cropped);
@@ -412 +442 @@
                 }
 
-                // if the user has cropped an imate, either the above happend or this is
+                // if the user has cropped an image, either the above happend or this is
                 // a no-op
                 if (_lastCropped != null && _lastCropped.getCroppedSize() > 0) {
@@ -448 +478 @@
          * This method handles all left-click actions
          */
-        public static void leftButton(ItemPermission clicked) {
+        public static void leftButton(Item clicked) {
                 // if the user is pointing at something then either follow the link or
                 // do TDFC
+                if (clicked == null) {
+                        // Check if the user is nearby another item...
+                        int mouseX = DisplayIO.getMouseX();
+                        int mouseY = DisplayIO.getMouseY();
+                        // System.out.println(mouseX + "," + mouseY);
+                        for (Item i : DisplayIO.getCurrentFrame().getItems()) {
+                                if (i instanceof Text) {
+                                        if (i.isNear(mouseX, mouseY)) {
+                                                clicked = i;
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
+                if (clicked instanceof Text) {
+                        if (((Text) clicked).getTextNoList().length() == 0)
+                                clicked = null;
+                }
+
                 if (clicked != null) {
                         // check item permissions
-                        if (clicked.Permission < ItemPermission.PERMISSION_FOLLOW_LINKS) {
+                        if (clicked.Permission < Item.PERMISSION_FOLLOW_LINKS) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient Permissions for action on item");
@@ -459 +509 @@
                         }
 
-                        Item clickedOn = clicked.Item;
+                        Item clickedOn = clicked;
+
                         // actions take priority
                         if (_lastMouseClick != null && !_lastMouseClick.isShiftDown()
@@ -480 +531 @@
                         } else {
                                 // check for TDFC permission
-                                if (clicked.Permission < ItemPermission.PERMISSION_TDFC) {
+                                if (clicked.Permission < Item.PERMISSION_TDFC) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient permission to TDFC from that item");
@@ -497 +548 @@
 
                                 tdfc(clickedOn);
-                                DisplayIO.UpdateTitle();
                                 return;
                         }
-                        // if the user is not pointing at something, then this is a back
-                        // command
+                        // if user is not pointing at something,this is a back
                 } else {
                         back();
-                        DisplayIO.UpdateTitle();
                         return;
                 }
         }
 
-        private static boolean doMerging(ItemPermission clicked) {
+        private static boolean doMerging(Item clicked) {
                 if (clicked == null)
                         return false;
@@ -515 +563 @@
                 // System.out.println(Frame.FreeItems.size());
                 if (isRubberBandingRectangle()
-                                && clicked.Item.getAllConnected().contains(
+                                && clicked.getAllConnected().contains(
                                                 Frame.getItemAttachedToCursor()))
                         return true;
@@ -524 +572 @@
                 Item attachedToCursor = Frame.getItemAttachedToCursor();
 
-                if (clicked.Item instanceof Text && !(attachedToCursor instanceof Text)) {
+                if (clicked instanceof Text && !(attachedToCursor instanceof Text)) {
                         return false;
                 }
@@ -534 +582 @@
          * This method handles all middle-click actions
          */
-        private static void middleButton(ItemPermission clicked,
-                        List<ItemPermission> clickedIn) {
+        private static void middleButton(Item clicked, List<Item> clickedIn) {
                 // if the cursor has Items attached
                 if (Frame.itemAttachedToCursor()) {
@@ -542 +589 @@
                         if (doMerging(clicked)) {
                                 // check permissions
-                                if (clicked.Permission < ItemPermission.PERMISSION_FULL
-                                                && clicked.Item.getParent() != null
-                                                && clicked.Item.getParent().getName() != clicked.Item) {
+                                if (clicked.Permission < Item.PERMISSION_FULL
+                                                && clicked.getParent() != null
+                                                && clicked.getParent().getFrameNameItem() != clicked) {
                                         FrameGraphics.DisplayMessage("Insufficient Permission");
                                         return;
                                 }
 
-                                List<Item> left = merge(Frame.FreeItems, clicked.Item);
+                                List<Item> left = merge(Frame.FreeItems, clicked);
                                 anchor(left);
 
@@ -570 +617 @@
                         if (clicked != null) {
                                 // check permissions
-                                if (clicked.Permission < ItemPermission.PERMISSION_FULL) {
+                                if (clicked.Permission < Item.PERMISSION_FULL) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient Permission to pick up item");
@@ -576 +623 @@
                                 }
 
-                                pickup(clicked.Item);
+                                // TODO remove rectangle constraints?
+                                if (clicked instanceof Line) {
+                                        // Check if within 20% of the end of the line
+                                        Line l = (Line) clicked;
+                                        Item toDisconnect = l.getEndPointToDisconnect(
+                                                        _lastMouseClick.getX(), _lastMouseClick.getY());
+
+                                        if (toDisconnect != null) {
+                                                List<Line> lines = toDisconnect.getLines();
+                                                if (lines.size() == 1) {
+                                                        //remove constraints
+                                                        toDisconnect.removeAllConstraints();
+                                                        
+                                                        DisplayIO.setCursorPosition(toDisconnect
+                                                                        .getPosition(), false);
+                                                        pickup(toDisconnect);
+                                                        return;
+                                                }
+                                                // If we are then detatch the line and pick up its end
+                                                // point...
+                                                Frame currentFrame = DisplayIO.getCurrentFrame();
+                                                Item newPoint = toDisconnect.copy();
+                                                newPoint.setID(currentFrame.getNextItemID());
+                                                currentFrame.addItem(newPoint);
+                                                // remove the current item from the connected
+                                                // list for this item
+                                                for (Item i : lines) {
+                                                        if (i == l) {
+                                                                toDisconnect.removeLine(l);
+                                                                break;
+                                                        }
+                                                }
+                                                if (toDisconnect == l.getStartItem()) {
+                                                        l.setStartItem(newPoint);
+                                                } else {
+                                                        l.setEndItem(newPoint);
+                                                }
+
+                                                // remove unneeded constrains
+                                                List<Constraint> constraints = toDisconnect
+                                                                .getConstraints();
+                                                if (constraints != null) {
+                                                        for (Constraint c : constraints) {
+                                                                Item oppositeEnd = l.getOppositeEnd(newPoint);
+                                                                if (c.contains(oppositeEnd)) {
+                                                                        toDisconnect.removeConstraint(c);
+                                                                        oppositeEnd.removeConstraint(c);
+                                                                        break;
+                                                                }
+                                                        }
+                                                }
+
+                                                toDisconnect.showHighlight(false);
+                                                DisplayIO.setCursorPosition(toDisconnect.getPosition(),
+                                                                false);
+                                                pickup(newPoint);
+
+                                                return;
+                                        }
+                                }
+
+                                pickup(clicked);
                                 return;
                                 // otherwise create a line
@@ -583 +691 @@
                                         ArrayList<Item> toPickup = new ArrayList<Item>(clickedIn
                                                         .size());
-                                        for (ItemPermission ip : clickedIn)
-                                                if (ip.Permission >= ItemPermission.PERMISSION_FULL)
-                                                        toPickup.add(ip.Item);
+                                        for (Item ip : clickedIn)
+                                                if (ip.Permission >= Item.PERMISSION_FULL)
+                                                        toPickup.add(ip);
 
                                         pickup(toPickup);
                                         // otherwise the user is creating a line
-                                } else
-                                        createLine();
+                                } else {
+                                        Item on = FrameUtils.onItem(DisplayIO.getCurrentFrame(),
+                                                        MouseX, MouseY);
+                                        Line newLine = createLine();
+                                        // if the user can spot-weld, show the virtual spot
+                                        if (on instanceof Line) {
+                                                Line line = (Line) on;
+                                                newLine.setThickness(line.getThickness());
+                                                newLine.setLinePattern(line.getLinePattern());
+                                                newLine.setColor(line.getColor());
+                                                line.forceMerge(newLine.getStartItem(), MouseX, MouseY);
+                                        }
+                                }
                                 return;
                         }
@@ -626 +745 @@
          * This method handles all right-click action
          */
-        private static void rightButton(ItemPermission clicked,
-                        List<ItemPermission> clickedIn) {
+        private static void rightButton(Item clicked, List<Item> clickedIn) {
                 // if the cursor has Items attached, then anchor a copy of them
                 if (Frame.itemAttachedToCursor()) {
@@ -633 +751 @@
                         // unless it is a point onto somethin other than a point
                         if (clicked != null
-                                        && (!(Frame.getItemAttachedToCursor() instanceof Dot && !(clicked.Item instanceof Dot)))) {
+                                        && (!(Frame.getItemAttachedToCursor() instanceof Dot && !(clicked instanceof Dot)))) {
                                 // check permissions
-                                if (clicked.Permission < ItemPermission.PERMISSION_FULL
-                                                && clicked.Item.getParent().getName() != clicked.Item) {
+                                if (clicked.Permission < Item.PERMISSION_FULL
+                                                && clicked.getParent().getFrameNameItem() != clicked) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient Permission to merge items");
@@ -642 +760 @@
                                 }
 
-                                if (clicked.Item instanceof Text || clicked.Item instanceof Dot) {
+                                if (clicked instanceof Text || clicked instanceof Dot) {
                                         List<Item> copies = null;
 
                                         if (isRubberBandingRectangle()) {
-                                                List<Item> remain = merge(Frame.FreeItems, clicked.Item);
+                                                List<Item> remain = merge(Frame.FreeItems, clicked);
 
                                                 Dot d = getFirstFreeDot();
@@ -654 +772 @@
                                                 updateCursor();
                                                 // pick up a copy of all enclosed items
-                                                List<ItemPermission> items = FrameUtils
-                                                                .getItemsEnclosedBy(
-                                                                                DisplayIO.getCurrentFrame(), d
-                                                                                                .getEnclosedShape());
+                                                List<Item> items = FrameUtils.getItemsEnclosedBy(
+                                                                DisplayIO.getCurrentFrame(), d
+                                                                                .getEnclosedShape());
                                                 if (items != null) {
                                                         ArrayList<Item> toCopy = new ArrayList<Item>(items
                                                                         .size());
-                                                        for (ItemPermission ip : items)
-                                                                if (ip.Permission >= ItemPermission.PERMISSION_COPY)
-                                                                        toCopy.add(ip.Item);
+                                                        for (Item ip : items)
+                                                                if (ip.Permission >= Item.PERMISSION_COPY)
+                                                                        toCopy.add(ip);
 
                                                         copies = copy(toCopy);
@@ -671 +788 @@
                                         } else if (Frame.FreeItems.size() == 2) {
                                                 copies = ItemUtils.UnreelLine(Frame.FreeItems);
-                                                List<Item> leftOver = merge(Frame.FreeItems,
-                                                                clicked.Item);
+                                                List<Item> leftOver = merge(Frame.FreeItems, clicked);
                                                 anchor(leftOver);
                                                 if (copies == null)
@@ -685 +801 @@
                                         } else if (Frame.FreeItems.size() == 1) {
                                                 copies = copy(Frame.FreeItems);
-                                                List<Item> remain = merge(copies, clicked.Item);
+                                                List<Item> remain = merge(copies, clicked);
 
                                                 // ignore items that could not be merged.
@@ -724 +840 @@
                                         updateCursor();
                                         // pick up a copy of all enclosed items
-                                        List<ItemPermission> items = FrameUtils.getItemsEnclosedBy(
-                                                        DisplayIO.getCurrentFrame(), d.getEnclosedShape());
+                                        List<Item> items = FrameUtils.getItemsEnclosedBy(DisplayIO
+                                                        .getCurrentFrame(), d.getEnclosedShape());
                                         if (items != null) {
                                                 ArrayList<Item> toCopy = new ArrayList<Item>(items
                                                                 .size());
-                                                for (ItemPermission ip : items)
-                                                        if (ip.Permission >= ItemPermission.PERMISSION_COPY)
-                                                                toCopy.add(ip.Item);
+                                                for (Item ip : items)
+                                                        if (ip.Permission >= Item.PERMISSION_COPY)
+                                                                toCopy.add(ip);
                                                 toCopy.removeAll(d.getAllConnected());
 
                                                 if (toCopy.size() > 0) {
                                                         pickup(copy(toCopy));
-                                                        DisplayIO.getCurrentFrame().removeAllItems(d.getAllConnected());
+                                                        DisplayIO.getCurrentFrame().removeAllItems(
+                                                                        d.getAllConnected());
                                                 } else {
                                                         pickup(copy(d.getAllConnected()));
@@ -746 +863 @@
                                 if (Frame.FreeItems.size() == 2) {
                                         if (clicked != null) {
-                                                List<Item> leftOver = merge(Frame.FreeItems,
-                                                                clicked.Item);
+                                                List<Item> leftOver = merge(Frame.FreeItems, clicked);
                                                 anchor(leftOver);
                                         }
@@ -766 +882 @@
                                 }
 
+                                if (_extrude) {
+                                        List<Item> originals = new ArrayList<Item>();
+                                        // remove any lines that dont have both endpoints floating
+                                        for (Item i : Frame.FreeItems) {
+                                                if (i.isFloating())
+                                                        originals.add(i);
+                                        }
+                                        if (copies == null)
+                                                copies = ItemUtils.CopyItems(originals, _extrude);
+                                        for (Item i : copies)
+                                                i.setOffset(0, 0);
+                                        anchor(Frame.FreeItems);
+                                        // Move isnt working right for extruding!!
+                                        // move(copies);
+                                        pickup(copies);
+                                        updateCursor();
+                                        FrameGraphics.Repaint();
+                                        return;
+                                }
+
                                 if (copies == null)
-                                        copies = copy(Frame.FreeItems);
+                                        copies = ItemUtils.CopyItems(Frame.FreeItems);
                                 // MIKE: what does the below 2 lines do?
                                 for (Item i : copies)
@@ -784 +920 @@
                         if (clicked != null) {
                                 // check permissions
-                                if (clicked.Permission < ItemPermission.PERMISSION_COPY) {
+                                if (clicked.Permission < Item.PERMISSION_COPY) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient permission to copy item");
@@ -790 +926 @@
                                 }
 
-                                // This happens when the user right clicks on the endpoint of an
-                                // existing line
-                                // check for unreeling
-                                List<Item> copies = ItemUtils.UnreelLine(clicked.Item);
-
+                                List<Item> copies = ItemUtils.UnreelLine(clicked);
+                                // Copies will NOT be null if the user right clicked on a point
                                 if (copies == null) {
-                                        // check if this is picking up a rectangle
-                                        if (clicked.Item instanceof Dot
-                                                        && clicked.Item.getConnected().size() == 3) {
-                                                Dot d = null;
-                                                // only one dot will be present for rectangles
-                                                for (Item i : clicked.Item.getConnected())
-                                                        if (i instanceof Dot && d == null)
-                                                                d = (Dot) i;
-                                                        else if (i instanceof Dot && d != null)
-                                                                d = null;
-
-                                                // if this is indeed a rectangle anchor
-                                                if (d != null) {
-                                                        // pick up a copy of all enclosed items
-                                                        List<ItemPermission> items = FrameUtils
-                                                                        .getItemsEnclosedBy(DisplayIO
-                                                                                        .getCurrentFrame(), d
-                                                                                        .getEnclosedShape());
-                                                        if (items != null) {
-                                                                ArrayList<Item> toCopy = new ArrayList<Item>(
-                                                                                items.size());
-                                                                for (ItemPermission ip : items)
-                                                                        if (ip.Permission >= ItemPermission.PERMISSION_COPY)
-                                                                                toCopy.add(ip.Item);
-
-                                                                List<Item> toPickup = copy(toCopy);
-                                                                clearParent(toPickup);
-                                                                pickup(toPickup);
-                                                        }
-                                                        return;
-                                                }
-                                        }
-                                        copies = copy(clicked.Item);
-                                }
-
+                                        List<Item> originals = clicked.getConnected();
+                                        copies = ItemUtils.CopyItems(originals, _extrude);
+                                }
                                 pickup(copies);
                                 return;
-
                         } else {
-                                // if the user is pointing inside a closed shape, copy the items
-                                // inside
+                                // if user is pointing in a closed shape, copy the items inside
                                 if (clickedIn != null) {
                                         List<Item> toCopy = new ArrayList<Item>(clickedIn.size());
-                                        for (ItemPermission ip : clickedIn)
-                                                if (ip.Permission >= ItemPermission.PERMISSION_COPY)
-                                                        toCopy.add(ip.Item);
+                                        for (Item ip : clickedIn)
+                                                if (ip.Permission >= Item.PERMISSION_COPY)
+                                                        toCopy.add(ip);
 
                                         List<Item> copies = copy(toCopy);
@@ -952 +1051 @@
                         FrameGraphics.Repaint();
                         return;
+                }
+
+                if (_mouseDown == MouseEvent.BUTTON2 && _lastClickedOn == null
+                                && _lastClickedIn == null) {
+                        Item on = FrameUtils.onItem(DisplayIO.getCurrentFrame(), e.getX(),
+                                        e.getY());
+                        // if the user can spot-weld, show the virtual spot
+                        if (Frame.FreeItems.size() == 0 && on instanceof Line) {
+                                Line line = (Line) on;
+                                line.showVirtualSpot(e.getX(), e.getY());
+                        }
                 }
 
@@ -966 +1076 @@
                                 || Math.abs(MouseY - e.getY()) > UserSettings.NoOpThreshold)
                         _isNoOp = true;
+
+                FrameGraphics.Repaint();
         }
 
@@ -1014 +1126 @@
                 if (checkHighlight) {
                         // ByMike: Get the item the mouse is hovering over
-                        ItemPermission click = FrameUtils.getCurrentItem();
+                        Item click = FrameUtils.getCurrentItem();
                         Item on = null;
-
+                        // System.out.println(click);
                         if (click != null) {
-                                on = click.Item;
+                                on = click;
                                 // set the context
                                 if (on instanceof Line)
@@ -1155 +1267 @@
 
         private static void move(List<Item> toMove) {
-                int deltax = toMove.get(0).getX() - (DisplayIO.getMouseX() - _offX);
-                int deltay = toMove.get(0).getY() - (MouseY - _offY);
+                int xPos = (DisplayIO.getMouseX() - _offX);
+
+                Item firstDot = toMove.get(0);
+
+                /*
+                 * for (Item i: toMove) { if (i instanceof Dot){ firstDot = i; break; } }
+                 */
+
+                int deltax = firstDot.getX() - xPos;
+                int deltay = firstDot.getY() - (MouseY - _offY);
 
                 for (Item move : toMove) {
@@ -1175 +1295 @@
         private static void checkTDFCItemWaiting() {
                 // if there is a TDFC Item waiting
-                if (_tdfcItem != null) {
+                if (getTdfcItem() != null) {
                         Frame currentFrame = DisplayIO.getCurrentFrame();
                         boolean change = currentFrame.hasChanged();
@@ -1183 +1303 @@
                         // possible
                         if (!change && !saved) {
-                                _tdfcItem.setLink(null);
-                                _tdfcItem.getParent().setChanged(true);
-                                FrameIO.SaveFrame(_tdfcItem.getParent());
+                                getTdfcItem().setLink(null);
+                                getTdfcItem().getParent().setChanged(true);
+                                FrameIO.SaveFrame(getTdfcItem().getParent());
                                 FrameGraphics.Repaint();
                         } else {
@@ -1192 +1312 @@
                         }
 
-                        _tdfcItem = null;
+                        setTdfcItem(null);
                 }
         }
@@ -1198 +1318 @@
         private static void back() {
                 checkTDFCItemWaiting();
+                
                 DisplayIO.Back();
-
+                
                 // repaint things if necessary
                 if (Frame.itemAttachedToCursor())
@@ -1226 +1347 @@
 
                 linker.setLink("" + next.getFrameNumber());
-                _tdfcItem = linker;
+                setTdfcItem(linker);
+
+                // Set the link for an @Parent annotation item if one is on the frame
+                for (Item i : next.getItems()) {
+                        if ((i instanceof Text) && ItemUtils.isTag(i, ItemUtils.TAG_PARENT)
+                                        && i.getLink() == null)
+                                i.setLink(DisplayIO.getCurrentFrame().getFrameName());
+                }
 
                 FrameUtils.DisplayFrame(next, true);
@@ -1247 +1375 @@
          * 
          * @param toExtract
-         *            ItemPermission containing the Item to extract the attributes
-         *            from.
+         *            Item containing the Item to extract the attributes from.
          */
-        private static void extractAttributes(ItemPermission toExtract) {
-                if (toExtract == null || toExtract.Item == null)
+        private static void extractAttributes(Item toExtract) {
+                if (toExtract == null || toExtract == null)
                         return;
 
@@ -1258 +1385 @@
 
                 Text attribs;
-                Item item = toExtract.Item;
+                Item item = toExtract;
                 // Extract the frames attributes when the user clicks on the frame name
                 if (item.isFrameName())
@@ -1276 +1403 @@
         }
 
-        private static void delete(ItemPermission toDelete) {
+        private static void delete(Item toDelete) {
                 FrameUtils.LastEdited = null;
                 _offX = _offY = 0;
@@ -1282 +1409 @@
                 // check if the user is pointing at the frame's framename
                 if (toDelete != null
-                                && toDelete.Item == DisplayIO.getCurrentFrame().getName()) {
+                                && toDelete == DisplayIO.getCurrentFrame().getFrameNameItem()) {
                         DisplayIO.getCurrentFrame().clear();
                         FrameGraphics.Repaint();
@@ -1293 +1420 @@
                         if (Frame.FreeItems.size() == 1
                                         && Frame.FreeItems.get(0) instanceof Text
-                                        && toDelete != null && toDelete.Item instanceof Text) {
+                                        && toDelete != null && toDelete instanceof Text) {
 
                                 // check permissions
-                                if (toDelete.Permission < ItemPermission.PERMISSION_FULL) {
+                                if (toDelete.Permission < Item.PERMISSION_FULL) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient permission to swap Item text");
@@ -1302 +1429 @@
                                 }
 
-                                Text anchored = (Text) toDelete.Item;
+                                Text anchored = (Text) toDelete;
                                 Text free = (Text) Frame.FreeItems.get(0);
 
@@ -1329 +1456 @@
                         // if the user is pointing inside a closed shape, delete all
                         // items inside it
-                        List<ItemPermission> items = FrameUtils.getCurrentItems();
+                        List<Item> items = FrameUtils.getCurrentItems();
 
                         if (items != null) {
                                 ArrayList<Item> toRemove = new ArrayList<Item>(items.size());
-                                for (ItemPermission ip : items)
-                                        if (ip.Permission >= ItemPermission.PERMISSION_FULL) {
-                                                toRemove.add(ip.Item);
+                                for (Item ip : items)
+                                        if (ip.Permission >= Item.PERMISSION_FULL) {
+                                                toRemove.add(ip);
                                         }
 
@@ -1352 +1479 @@
                 } else {
                         // check permissions
-                        if (toDelete.Permission < ItemPermission.PERMISSION_FULL) {
+                        if (toDelete.Permission < Item.PERMISSION_FULL) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient permission to delete item");
@@ -1358 +1485 @@
                         }
 
-                        Frame current = toDelete.Item.getParent();
+                        Frame current = toDelete.getParent();
 
                         current.setChanged(true);
@@ -1364 +1491 @@
                         List<Item> toUndo = new LinkedList<Item>();
 
-                        if (toDelete.Item instanceof Dot) {
-                                toUndo.addAll(deleteDot((Dot) toDelete.Item));
+                        if (toDelete instanceof Dot) {
+                                toUndo.addAll(deleteDot((Dot) toDelete));
                         } else
-                                toUndo.addAll(copy(toDelete.Item.getConnected()));
+                                toUndo.addAll(copy(toDelete.getConnected()));
 
                         current.addAllToUndo(toUndo);
-                        current.removeAllItems(toDelete.Item.getConnected());
+                        current.removeAllItems(toDelete.getConnected());
                         // reset the mouse cursor
                         updateCursor();
@@ -1429 +1556 @@
                 }
 
-                // check for rectangle deletion
-                if (itemList.size() == 3) {
-                        boolean rectangle = false;
-                        Dot dot = null;
-                        // check that this is indeed a rectangle
-                        for (Item check : itemList) {
-                                if (dot == null && check instanceof Dot)
-                                        dot = (Dot) check;
-                                else if (check != dot && !dot.getLines().contains(check)) {
-                                        rectangle = false;
-                                        break;
-                                } else
-                                        rectangle = true;
-                        }
-
-                        // if this is a rectangle, remove the entire rectangle
-                        if (rectangle) {
-                                // List<Item> copy = copy(dot.getAllConnected());
-                                current.addAllToUndo(dot.getAllConnected());
-                                current.removeAllItems(dot.getAllConnected());
-                                itemList.clear();
-                                // reset the mouse cursor
-                                updateCursor();
-                                FrameGraphics.Repaint();
-                                return;
-                        }
-                }
+                // Mike: What is the point of the code below
+                // It causes problems when deleting three items off the cursor which
+                // include a non dot or line item
+                /*
+                 * // check for rectangle deletion if (itemList.size() == 3) { boolean
+                 * rectangle = false; Dot dot = null; // check that this is indeed a
+                 * rectangle for (Item check : itemList) { if (dot == null && check
+                 * instanceof Dot) dot = (Dot) check; else if (check != dot &&
+                 * !dot.getLines().contains(check)) { rectangle = false; break; } else
+                 * rectangle = true; } // if this is a rectangle, remove the entire
+                 * rectangle if (rectangle) { // List<Item> copy =
+                 * copy(dot.getAllConnected());
+                 * current.addAllToUndo(dot.getAllConnected());
+                 * current.removeAllItems(dot.getAllConnected()); itemList.clear(); //
+                 * reset the mouse cursor updateCursor(); FrameGraphics.Repaint();
+                 * return; } }
+                 */
 
                 current.removeAllItems(itemList);
@@ -1516 +1633 @@
 
         public static List<Item> merge(List<Item> merger, Item mergee) {
-                if (mergee.getParent().getName() == mergee) {
+                if (mergee.getParent().getFrameNameItem() == mergee) {
                         return mergee.getParent().merge(merger);
                 }
@@ -1614 +1731 @@
                                                 // TODO tidy this up... the text override of this method
                                                 // doesnt use the parametres MouseY and MouseX!!
-                                                res = mergee.merge(i, DisplayIO.getMouseX(), MouseY
-                                                                - DisplayIO.getOffset());
+                                                res = mergee.merge(i, DisplayIO.getMouseX(), MouseY);
                                                 if (res != null) {
                                                         remain.add(res);
@@ -1621 +1737 @@
                                         }
                                 } else {
-                                        res = mergee.merge(i, DisplayIO.getMouseY(), MouseY
-                                                        - DisplayIO.getOffset());
+                                        res = mergee.merge(i, DisplayIO.getMouseY(), MouseY);
                                         if (res != null)
                                                 remain.addAll(res.getConnected());
@@ -1696 +1811 @@
         }
 
-        private static void createLine() {
+        private static Line createLine() {
                 // create the two endpoints
                 Dot end = new Dot(DisplayIO.getRealMouseX(), DisplayIO.getMouseY(),
@@ -1712 +1827 @@
                 // attach the line to the cursor
                 pickup(end);
+
+                return line;
         }
 
@@ -1730 +1847 @@
 
         public static void anchor(Item toAnchor) {
+                // System.out.println("Anchor:" + toAnchor.getX() + "," +
+                // toAnchor.getY());
+
                 Frame current = DisplayIO.getCurrentFrame();
                 // toAnchor.anchor(current);
@@ -1803 +1923 @@
                                         else
                                                 line.toggleArrowHeadLength(arg0.getWheelRotation());
+                                        line.getParent().change();
                                         FrameGraphics.Repaint();
                                 }
@@ -1816 +1937 @@
                                 FrameKeyboardActions.functionKey(rotationType);
                 } else if (clicks == MOUSE_WHEEL_THRESHOLD) {
-                        ItemPermission ip = FrameUtils.getCurrentItem();
+                        Item ip = FrameUtils.getCurrentItem();
 
                         // if the user is not pointing to any item
@@ -1825 +1946 @@
                         } else {
                                 // check permissions
-                                if (ip.Permission < ItemPermission.PERMISSION_FULL) {
+                                if (ip.Permission < Item.PERMISSION_FULL) {
                                         FrameGraphics
                                                         .DisplayMessage("Insufficient permission to change the size of that item");
@@ -1832 +1953 @@
                         }
 
-                        if (ip.Item instanceof Line) {
-                                Line line = (Line) ip.Item;
+                        if (ip instanceof Line) {
+                                Line line = (Line) ip;
                                 line.toggleDashed(arg0.getWheelRotation());
+                                line.getParent().change();
                                 FrameGraphics.Repaint();
                                 return;
@@ -1879 +2001 @@
                 return isDelete(_lastMouseClick);
         }
+
+        public static void setTdfcItem(Item _tdfcItem) {
+                FrameMouseActions._tdfcItem = _tdfcItem;
+        }
+
+        public static Item getTdfcItem() {
+                return _tdfcItem;
+        }
 }

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

@@ -12 +12 @@
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
-import org.expeditee.items.ItemPermission;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
@@ -187 +186 @@
                                 space = MINIMUM_INTERITEM_SPACING;
 
-                        if (above != curr.getName() && above != curr.getTitle())
+                        if (above != curr.getFrameNameItem() && above != curr.getTitle())
                                 x = above.getX();
 
@@ -493 +492 @@
                                 UserSettings.NoOpThreshold = getInt(item,
                                                 UserSettings.NoOpThreshold);
-                        else if (ItemUtils.isTag(item, "@InitialWidth:")){
-                                UserSettings.InitialWidth= getInt(item,
-                                                UserSettings.InitialWidth);}
-                        else if (ItemUtils.isTag(item, "@InitialHeight:")){
-                                UserSettings.InitialHeight= getInt(item,
-                                                UserSettings.InitialHeight);}
-                        else if (ItemUtils.isTag(item, "@Logging:")) {
+                        else if (ItemUtils.isTag(item, "@InitialWidth:")) {
+                                UserSettings.InitialWidth = getInt(item,
+                                                UserSettings.InitialWidth);
+                        } else if (ItemUtils.isTag(item, "@InitialHeight:")) {
+                                UserSettings.InitialHeight = getInt(item,
+                                                UserSettings.InitialHeight);
+                        } else if (ItemUtils.isTag(item, "@Logging:")) {
                                 UserSettings.Logging = getBoolean(item, UserSettings.Logging);
                         } else if (ItemUtils.isTag(item, ItemUtils.TAG_ITEM_TEMPLATE)) {
@@ -647 +646 @@
 
                 // Text title = null;
-                // Text template = UserSettings.ItemTemplate.copy();
+                // Text template = UserSettingsTemplate.copy();
 
                 ArrayList<Overlay> overlays = new ArrayList<Overlay>();
@@ -708 +707 @@
                                         // Parse(overlay);
                                         if (overlay != null && !overlays.contains(overlay))
-                                                overlays.add(new Overlay(overlay,
-                                                                ItemPermission.PERMISSION_NONE));
+                                                overlays
+                                                                .add(new Overlay(overlay, Item.PERMISSION_NONE));
                                 }
 
@@ -717 +716 @@
                                         String link = i.getLink();
                                         if (FrameIO.isPositiveInteger(link))
-                                                link = toParse.getFramesetNameAdjusted()
-                                                                + link;
+                                                link = toParse.getFramesetNameAdjusted() + link;
                                         Frame overlay = FrameIO.LoadFrame(link);
                                         // Parse(overlay);
@@ -726 +724 @@
                                                                 .getFirstLine());
                                                 // default permission (if none is specified)
-                                                int perm = ItemPermission.PERMISSION_FOLLOW_LINKS;
+                                                int perm = Item.PERMISSION_FOLLOW_LINKS;
 
                                                 try {
@@ -735 +733 @@
                                                                 level = level.toLowerCase().trim();
                                                                 if (level.equals("none"))
-                                                                        perm = ItemPermission.PERMISSION_NONE;
+                                                                        perm = Item.PERMISSION_NONE;
                                                                 else if (level.equals("links")
                                                                                 || level.equals("link"))
-                                                                        perm = ItemPermission.PERMISSION_FOLLOW_LINKS;
+                                                                        perm = Item.PERMISSION_FOLLOW_LINKS;
                                                                 else if (level.equals("copy"))
-                                                                        perm = ItemPermission.PERMISSION_COPY;
+                                                                        perm = Item.PERMISSION_COPY;
                                                                 else if (level.equals("tdfc"))
-                                                                        perm = ItemPermission.PERMISSION_TDFC;
+                                                                        perm = Item.PERMISSION_TDFC;
                                                                 else if (level.equals("full")
                                                                                 || level.equals("all"))
-                                                                        perm = ItemPermission.PERMISSION_FULL;
+                                                                        perm = Item.PERMISSION_FULL;
                                                                 else
                                                                         FrameGraphics
@@ -794 +792 @@
                                 }
 
-                                if (toParse.getFrameNumber() > 0
-                                                && ItemUtils.isTag(i, ItemUtils.TAG_PARENT)
-                                                && i.getLink() == null)
-                                        i.setLink(DisplayIO.getCurrentFrame().getFrameName());
-
                         } catch (Exception e) {
                                 Logger.Log(e);
@@ -833 +826 @@
          * @return The Item at the given coordinates, or NULL if none is found.
          */
-        private static ItemPermission onItem(Frame toCheck, int x, int y) {
+        public static Item onItem(Frame toCheck, int x, int y) {
                 if (toCheck == null)
                         return null;
 
-                List<ItemPermission> possibles = new ArrayList<ItemPermission>(0);
+                List<Item> possibles = new ArrayList<Item>(0);
 
                 // if the mouse is in the message area
@@ -843 +836 @@
                         // check the individual message items
                         for (Text message : FrameGraphics.Messages) {
-                                if (message != null && message.contains(x, y))
-                                        possibles.add(new ItemPermission(message,
-                                                        ItemPermission.PERMISSION_COPY));
+                                if (message != null) {
+                                        if (message.contains(x, y)) {
+                                                message.Permission = Item.PERMISSION_COPY;
+                                        }
+                                        possibles.add(message);
+                                }
                         }
 
                         // check the link to the message frame
                         if (FrameGraphics.MessageLink != null) {
-                                if (FrameGraphics.MessageLink.contains(x, y))
-                                        possibles.add(new ItemPermission(FrameGraphics.MessageLink,
-                                                        ItemPermission.PERMISSION_COPY));
+                                if (FrameGraphics.MessageLink.contains(x, y)) {
+                                        FrameGraphics.MessageLink.Permission = Item.PERMISSION_COPY;
+                                }
+                                possibles.add(FrameGraphics.MessageLink);
                         }
                         // otherwise, the mouse is on the frame
@@ -860 +857 @@
                                         && !Frame.FreeItems.contains(LastEdited)
                                         && LastEdited.getParent() == DisplayIO.getCurrentFrame()
-                                        && LastEdited.getParent().getItems().contains(LastEdited))
-                                return new ItemPermission(LastEdited,
-                                                ItemPermission.PERMISSION_FULL);
-                        else
+                                        && LastEdited.getParent().getItems().contains(LastEdited)) {
+                                LastEdited.Permission = Item.PERMISSION_FULL;
+                                return LastEdited;
+                        } else
                                 LastEdited = null;
-
+                        
                         ArrayList<Item> checkList = new ArrayList<Item>();
                         checkList.addAll(toCheck.getItems());
+                        checkList.add(toCheck.getFrameNameItem());
                         for (Item i : checkList) {
                                 // do not check annotation items in audience mode
@@ -873 +871 @@
                                         if (i.contains(x, y) && !Frame.FreeItems.contains(i)) {
                                                 // names have copy permissions only
-                                                if (i == toCheck.getName())
-                                                        possibles.add(new ItemPermission(i,
-                                                                        ItemPermission.PERMISSION_TDFC));
-                                                else
-                                                        possibles.add(new ItemPermission(i,
-                                                                        ItemPermission.PERMISSION_FULL));
+                                                if (i == toCheck.getFrameNameItem()) {
+                                                        i.Permission = Item.PERMISSION_TDFC;
+                                                        possibles.add(i);
+                                                } else {
+                                                        i.Permission = Item.PERMISSION_FULL;
+                                                        possibles.add(i);
+                                                }
                                         }
                                 }
@@ -884 +883 @@
 
                         for (Overlay o : toCheck.getOverlays()) {
-                                if (o.Level > ItemPermission.PERMISSION_NONE) {
-                                        ItemPermission i = onItem(o.Frame, x, y);
+                                if (o.Level > Item.PERMISSION_NONE) {
+                                        Item i = onItem(o.Frame, x, y);
 
                                         // the message is included above with full permissions,
-                                        // it
-                                        // should be ignored here
+                                        // it should be ignored here
                                         if (i != null
-                                                        && /* i.Item != FrameGraphics.TextMessage && */i.Item
+                                                        && /* i != FrameGraphics.TextMessage && */i
                                                                         .getID() > 0) {
                                                 if (o.Level < i.Permission)
@@ -910 +908 @@
 
                 // return closest x,y pair to mouse
-                ItemPermission closest = possibles.get(0);
-                int distance = (int) Math.sqrt(Math.pow(Math.abs(closest.Item.getX()
-                                - x), 2)
-                                + Math.pow(Math.abs(closest.Item.getY() - y), 2));
-
-                for (ItemPermission ip : possibles) {
-                        Item i = ip.Item;
+                Item closest = possibles.get(0);
+                int distance = (int) Math.sqrt(Math
+                                .pow(Math.abs(closest.getX() - x), 2)
+                                + Math.pow(Math.abs(closest.getY() - y), 2));
+
+                for (Item ip : possibles) {
+                        Item i = ip;
 
                         int d = (int) Math.sqrt(Math.pow(Math.abs(i.getX() - x), 2)
@@ -928 +926 @@
                                  * TODO: Remove line\dot specification
                                  */
-                                if ((!(closest.Item instanceof Dot && i instanceof Line))
-                                                && (!(closest.Item instanceof Text && i instanceof Line)))
+                                if ((!(closest instanceof Dot && i instanceof Line))
+                                                && (!(closest instanceof Text && i instanceof Line)))
                                         closest = ip;
 
@@ -939 +937 @@
         }
 
-        public static ItemPermission getCurrentItem() {
+        public static Item getCurrentItem() {
                 return onItem(DisplayIO.getCurrentFrame(), DisplayIO.getMouseX(),
                                 DisplayIO.getMouseY());
         }
 
-        public static List<ItemPermission> getCurrentItems() {
-                /*
-                 * // update enclosed shapes Frame current =
-                 * DisplayIO.getCurrentFrame(); List<Item> items = current.getItems();
-                 * ArrayList<Dot> dots = new ArrayList<Dot>(0);
-                 * 
-                 * for (Item i : items) if (i instanceof Dot) dots.add((Dot) i);
-                 * 
-                 * ArrayList<Polygon> possibles = new ArrayList<Polygon>(0); ArrayList<Dot>
-                 * used = new ArrayList<Dot>(0);
-                 * 
-                 * for (Dot d : dots) if (d.isEnclosed()) { boolean skip = false; //
-                 * check for duplicate enclosures for (Dot seen : used) { if
-                 * (seen.getEnclosingDots().contains(d)) { skip = true; break; } }
-                 * 
-                 * if (!skip) { Polygon p = d.getEnclosedShape(); if (p
-                 * .contains(DisplayIO.getMouseX(), DisplayIO .getMouseY())) {
-                 * possibles.add(p); used.add(d); } } }
-                 * 
-                 * if (possibles.size() == 0) return null; // if there is only one
-                 * possibility, return it if (possibles.size() == 1) { return
-                 * getItemsEnclosedBy(current, possibles.get(0)); //otherwise, determine
-                 * which polygon is closest to the cursor }else{
-                 * Collections.sort(possibles, new Comparator<Polygon>(){ public int
-                 * compare(Polygon p1, Polygon p2) { int closest = Integer.MAX_VALUE;
-                 * int close2 = Integer.MAX_VALUE;
-                 * 
-                 * int mouseX = DisplayIO.getMouseX(); int mouseY =
-                 * DisplayIO.getMouseY();
-                 * 
-                 * for(int i = 0; i < p1.npoints; i++){ int diff =
-                 * Math.abs(p1.xpoints[i] - mouseX) + Math.abs(p1.ypoints[i] - mouseY);
-                 * int diff2 = Integer.MAX_VALUE;
-                 * 
-                 * if(i < p2.npoints) diff2 = Math.abs(p2.xpoints[i] - mouseX) +
-                 * Math.abs(p2.ypoints[i] - mouseY);
-                 * 
-                 * if(diff < Math.abs(closest)){ close2 = closest; closest = diff; }else
-                 * if(diff < Math.abs(close2)) close2 = diff;
-                 * 
-                 * if(diff2 < Math.abs(closest)){ close2 = closest; closest = -diff2;
-                 * }else if(diff2 < Math.abs(close2)) close2 = diff2; }
-                 * 
-                 * if(closest > 0 && close2 > 0) return -10;
-                 * 
-                 * if(closest < 0 && close2 < 0) return 10;
-                 * 
-                 * 
-                 * if(closest > 0) return -10;
-                 * 
-                 * return 10; }
-                 * 
-                 * }); return getItemsEnclosedBy(current, possibles.get(0)); }
-                 */
+        public static List<Item> getCurrentItems() {
 
                 List<Dot> enclosure = getEnclosingDots();
@@ -1089 +1034 @@
         }
 
-        public static List<ItemPermission> getItemsEnclosedBy(Frame frame,
-                        Polygon poly) {
+        public static List<Item> getItemsEnclosedBy(Frame frame, Polygon poly) {
                 List<Item> contained = frame.getItemsWithin(poly);
 
-                ArrayList<ItemPermission> results = new ArrayList<ItemPermission>(
-                                contained.size());
+                ArrayList<Item> results = new ArrayList<Item>(contained.size());
 
                 // check for correct permissions
                 for (Item item : contained) {
                         // if the item is on the frame
-                        if (item.getParent() == frame || item.getParent() == null)
+                        if (item.getParent() == frame || item.getParent() == null) {
                                 // TODO this is a bit of a hack...
                                 // the
@@ -1113 +1056 @@
                                 // is
                                 // created...
-                                results.add(new ItemPermission(item,
-                                                ItemPermission.PERMISSION_FULL));
-                        // otherwise, it must be on an overlay frame
-                        else {
+                                item.Permission = Item.PERMISSION_FULL;
+                                results.add(item);
+                                // otherwise, it must be on an overlay frame
+                        } else {
                                 for (Overlay overlay : frame.getOverlays())
                                         if (overlay.Frame == item.getParent()) {
-                                                results.add(new ItemPermission(item, overlay.Level));
+                                                item.Permission = overlay.Level;
+                                                results.add(item);
                                                 break;
                                         }
@@ -1155 +1099 @@
                 yPos += spacing;
 
-                profile.addText(xPos, yPos, "@InitialWidth: " + UserSettings.InitialWidth, null);
+                profile.addText(xPos, yPos, "@InitialWidth: "
+                                + UserSettings.InitialWidth, null);
                 yPos += spacing;
 
-                profile.addText(xPos, yPos, "@InitialHeight: " + UserSettings.InitialHeight, null);
+                profile.addText(xPos, yPos, "@InitialHeight: "
+                                + UserSettings.InitialHeight, null);
                 yPos += spacing;
 
@@ -1175 +1121 @@
                 yPos = intialYPos;
 
-                Text help = profile.addText(xPos, yPos, "Expeditee Help", null);
-                help.setSize(25);
-                help.setFontStyle("Bold");
-                help.setFamily("SansSerif");
-                help.setColor(Item.COLOR_WHEEL[3]);
-
-                xPos = 625;
                 // Iterate through the help folder and add links
                 File helpDirectory = new File(FrameIO.HELP_PATH);
                 if (helpDirectory != null) {
-                        for (File helpFrameset : helpDirectory.listFiles()) {
-                                String framesetName = helpFrameset.getName();
-                                Frame indexFrame = FrameIO.LoadFrame(framesetName
-                                                + FrameIO.getFramesetExtension(framesetName));
-                                // Look through the folder for help index pages
-                                if (indexFrame != null
-                                                && ItemUtils.FindTag(indexFrame.getItems(),
-                                                                "@HelpIndex") != null) {
-                                        yPos += spacing;
-                                        t = profile.addText(xPos, yPos, indexFrame
-                                                        .getFramesetName(), null);
-                                        t.setLink(indexFrame.getFrameName());
+                        File[] helpFramesets = helpDirectory.listFiles();
+                        if (helpFramesets != null) {
+
+                                // Add the title for the help index
+                                Text help = profile.addText(xPos, yPos, "Expeditee Help", null);
+                                help.setSize(25);
+                                help.setFontStyle("Bold");
+                                help.setFamily("SansSerif");
+                                help.setColor(Item.COLOR_WHEEL[3]);
+
+                                xPos = 625;
+
+                                for (File helpFrameset : helpFramesets) {
+                                        String framesetName = helpFrameset.getName();
+                                        Frame indexFrame = FrameIO.LoadFrame(framesetName
+                                                        + FrameIO.getFramesetExtension(framesetName));
+                                        // Look through the folder for help index pages
+                                        if (indexFrame != null
+                                                        && ItemUtils.FindTag(indexFrame.getItems(),
+                                                                        "@HelpIndex") != null) {
+                                                yPos += spacing;
+                                                t = profile.addText(xPos, yPos, indexFrame
+                                                                .getFramesetName(), null);
+                                                t.setLink(indexFrame.getFrameName());
+                                        }
                                 }
                         }
@@ -1204 +1156 @@
                 FrameIO.SaveFrame(profile);
         }
+
+        /**
+         * Adjusts a frameset name so a period is appended if it ends in a digit.
+         * This form of the frameset name is used when referencing frames in the
+         * frame set.
+         * 
+         * @param frameset
+         * @return
+         */
+        public static String GetFramesetNameAdjusted(String frameset) {
+                return frameset
+                                + (Character.isDigit(frameset.charAt(frameset.length() - 1)) ? "."
+                                                : "");
+        }
 }

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

@@ -32 +32 @@
 
         private boolean _filled = true;
+        
+        protected boolean _filledHighlight = false;
 
         public Dot(int id) {
@@ -108 +110 @@
                 if (isHighlighted()) {
                         g.setColor(getHighlightColor());
-                        g.drawPolygon(getPolygon());
+                        // Draw the highlighting rectangle surrounding the dot
+                        // this is drawn even if its part of a rectangle
+                        if (_filledHighlight)
+                                g.fillPolygon(getPolygon());
+                        else
+                                g.drawPolygon(getPolygon());
                 }
 
@@ -346 +353 @@
                 return "P " + getID();
         }
+        
+        @Override
+        public void setFilledHighlight(boolean value) {
+                _filledHighlight = value;
+        }
+        
+        @Override
+        public void delete() {
+                super.delete();
+                
+                for(Line l: this.getLines())
+                        l.delete();
+        }
 }

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

@@ -33 +33 @@
  * 
  */
-public abstract class Item implements Comparable<Item>, Runnable {
-
+public abstract class Item implements Comparable<Item>, Runnable { 
+
+        public static int PERMISSION_NONE = 0;
+        public static int PERMISSION_FOLLOW_LINKS = 1;
+        public static int PERMISSION_COPY = 2;
+        public static int PERMISSION_TDFC = 3;
+        public static int PERMISSION_FULL = 4;
+
+        public static final int NEAR_DISTANCE = 15;
+        
         /**
          * The default Color to draw highlighting in
@@ -43 +51 @@
 
         public static final Color DEPRESSED_HIGHLIGHT = Color.GREEN;
+        
+        public static final Color DISCONNECT_HIGHLIGHT = Color.BLUE;
 
         public static final Color LINK_COLOR = Color.BLACK;
@@ -63 +73 @@
         public static final int MARGIN_LEFT = 20;
 
-        private Point _offset = new Point(0, 0);
-
-        private int _x;
-
-        private int _y;
-
-        private int _id;
-
-        private String _creationDate = null;
-
-        private boolean _linkMark = true;
-
-        private boolean _actionMark = true;
-
-        private boolean _highlight = true;
-
-        private boolean _isHighlighted = false;
-
-        // private boolean _isValidLink = true;
-
-        private Dimension _maxSize = null;
-
-        private String _owner = null;
-
-        private String _link = null;
-
-        private StringBuffer _data = new StringBuffer();
-
-        private List<String> _actionCursorEnter = null;
-
-        private List<String> _actionCursorLeave = null;
-
-        private List<String> _actionEnterFrame = null;
-
-        private List<String> _actionLeaveFrame = null;
-
-        private Color _colorFill = null;
-
-        private Color _color = null;
-
-        private Color _highlightColor = DEFAULT_HIGHLIGHT;
-
-        private Color _colorBackground = null;
-
-        private Color _colorTopShadow = null;
-
-        private Color _colorBottomShadow = null;
-
-        // the link\action circle
-        private Polygon _circle = null;
-
-        // the invalid link cross
-        private Polygon _circleCross = null;
-
-        private Frame _parent = null;
-
-        protected int _highlightThickness = 2;
-
-        // arrowhead parameters
-        private int _arrowheadLength = 0;
-
-        private double _arrowheadRatio = 0;
-
-        private Polygon _arrowhead = null;
-
-        // the list of lines that this point is part of.
-        private List<Line> _lines = new ArrayList<Line>();
-
-        private int[] _linePattern = null;
-
-        private boolean _floating = false;
-
-        // list of points constrained with this point
-        private List<Constraint> _constraints = null;
-
+        protected static final double DEFAULT_ARROWHEAD_RATIO = 0.5;
+        
         public static final Color GREEN = Color.GREEN.darker();
 
@@ -148 +85 @@
                         DisplayIO.DEFAULT_BACKGROUND };
 
+        public static final Color[] FILL_COLOR_WHEEL = { Color.BLACK, new Color(255,150,150),
+                new Color(150,150,255), new Color(150,255,150), new Color(255,150,255), new Color(255,255,100),
+                DisplayIO.DEFAULT_BACKGROUND };
+
         public static final int UNCHANGED_CURSOR = -100;
 
@@ -160 +101 @@
         public static final int JUSTIFICATION_NONE = -1;
 
+        // private boolean _isValidLink = true;
+
         public static final int JUSTIFICATION_FULL = 0;
 
@@ -171 +114 @@
 
         public static final int POINTTYPE_CIRCLE = 0;
-
-        private LinkedList<String> _actions = null;
-
-        private String _link_frameset = null;
-
-        private String _link_template = null;
-
-        private String _fillPattern = null;
-
-        protected Item() {
-                _creationDate = Logger.EasyDateFormat("ddMMMyyyy:HHmm");
-        }
-
-        /**
-         * Items are sorted by their Y coordinate on the screen.
-         * 
-         * @param i
-         *            The Item to compare this Item to
-         * @return a negative integer, zero, or a positive integer as this object is
-         *         less than, equal to, or greater than the specified object.
-         */
-        public int compareTo(Item i) {
-                return getY() - i.getY();
-        }
-
-        public static int getGravity() {
-                return org.expeditee.gui.UserSettings.Gravity;
-        }
-
-        public static boolean showLineHighlight() {
-                return org.expeditee.gui.UserSettings.LineHighlight;
-        }
-
-        public boolean equals(Object o) {
-                if (o instanceof Item) {
-                        Item i = (Item) o;
-                        return i.getID() == getID()
-                                        && ((i.getParent() == _parent) || (i.getParent() != null && i
-                                                        .getParent().equals(_parent)));
-
-                } else
-                        return false;
-        }
-
-        /**
-         * Adds a given line to the list of lines that this Point is an end for.
-         * 
-         * @param line
-         *            The Line that this Point is an end of.
-         */
-        public void addLine(Line line) {
-                if (_lines.contains(line)) {
-                        return;
-                }
-
-                line.setColor(getColor());
-                line.setSize(getSize());
-                line.setLinePattern(getLinePattern());
-
-                _lines.add(line);
-        }
-
-        /**
-         * Removes the given Line from the list of lines that this Dot is an end
-         * for.
-         * 
-         * @param line
-         *            The Line that this Dot is no longer an end of.
-         */
-        public void removeLine(Line line) {
-                _lines.remove(line);
-        }
-
-        /**
-         * Returns a list of Lines where this Dot is an end.
-         * 
-         * @return A list of the Lines that this Dot is an end for or null if no
-         *         Lines have been added.
-         */
-        public List<Line> getLines() {
-                return _lines;
-        }
-
-        public void setLines(List<Line> lines) {
-                _lines = lines;
-
-                for (Line line : lines)
-                        line.setLinePattern(getLinePattern());
-        }
-
-        public void setLinePattern(int[] pattern) {
-                _linePattern = pattern;
-
-                for (Line line : getLines())
-                        line.setLinePattern(pattern);
-        }
-
-        public int[] getLinePattern() {
-                return _linePattern;
-        }
-
-        /**
-         * Clears the list of Lines that this Dot is an end of. Note: This only
-         * clears this Dot's list and does not have any affect on the Lines or other
-         * Dots.
-         */
-        public void removeAllLines() {
-                _lines.clear();
-        }
-
-        /**
-         * Returns the list of IDs of the Lines that this Dot is an end of.
-         * 
-         * @return The list of Line IDs that this point is part of.
-         */
-        public String getLineIDs() {
-                String lineID = null;
-
-                if (_lines.size() > 0) {
-                        lineID = "" + _lines.get(0).getID();
-
-                        for (int i = 1; i < _lines.size(); i++)
-                                lineID += " " + _lines.get(i).getID();
-                }
-
-                return lineID;
-        }
-
-        /**
-         * Sets the list of lines that this point is part of (may be set to null).
-         * 
-         * @param lineID
-         *            A String of line ID numbers separated by spaces.
-         */
-        public void setLineIDs(String lineID) {
-        }
-
-        public void setFloating(boolean val) {
-                _floating = val;
-        }
-
-        public boolean isFloating() {
-                return _floating;
-        }
-
-        /**
-         * Returns a List of any Constraints that this Dot is a memeber of.
-         * 
-         * @return a List of Constraints that this Dot is a member of.
-         */
-        public List<Constraint> getConstraints() {
-                return _constraints;
-        }
-
-        public String getConstraintIDs() {
-                if (_constraints == null || _constraints.size() == 0)
-                        return null;
-
-                String cons = "";
-
-                for (Constraint c : _constraints)
-                        cons += c.getID() + " ";
-
-                return cons.trim();
-        }
-
-        public void setConstraintIDs(String IDs) {
-        };
-
-        /**
-         * Adds the given Constraint to this Dot
-         * 
-         * @param c
-         *            The Constraint to set this Dot as a member of.
-         */
-        public void addConstraint(Constraint c) {
-                if (_constraints == null)
-                        _constraints = new ArrayList<Constraint>();
-
-                // do not add duplicate constraint
-                if (_constraints.contains(c))
-                        return;
-
-                _constraints.add(c);
-        }
-
-        public void setConstraints(List<Constraint> constraints) {
-                _constraints = constraints;
-        }
-
-        public void removeAllConstraints() {
-                if (_constraints != null)
-                        _constraints.clear();
-        }
-
-        /**
-         * Removes the given Constraint from the list of constraintss that this Dot
-         * is a part of.
-         * 
-         * @param c
-         *            The Constraint that this Dot is no longer a part of.
-         */
-        public void removeConstraint(Constraint c) {
-                _constraints.remove(c);
-        }
-
-        /**
-         * Returns the ID of this Item, which must be unique for the Frame.
-         * 
-         * @return The ID of this Item.
-         */
-        public int getID() {
-                return _id;
-        }
-
-        /**
-         * Sets the ID of this Item to the given Integer. Note: Items with ID's < 0
-         * are not saved
-         * 
-         * @param newID
-         *            The new ID to assign this Item.
-         */
-        public void setID(int newID) {
-                _id = newID;
-        }
-
-        /**
-         * Returns the Y coordinate of this Item on the screen
-         * 
-         * @return The Y coordinate of this Item on the screen
-         */
-        public int getY() {
-                return _y;
-        }
-
-        /**
-         * Returns the X coordinate of this Item on the screen
-         * 
-         * @return The X coordinate of this Item on the screen
-         */
-        public int getX() {
-                return _x;
-        }
-
-        /**
-         * Sets the position of this item on the screen
-         * 
-         * @param x
-         *            The new X coordinate
-         * @param y
-         *            The new Y coordinate
-         */
-        public void setPosition(int x, int y) {
-                _x = x;
-                _y = y;
-
-                updatePolygon();
-
-                // update the position of any dots that are constrained by this one
-                if (_constraints != null) {
-                        for (Constraint c : _constraints) {
-                                Item other = c.getOppositeEnd(this);
-
-                                // only set the position if the other dot is still fixed to the
-                                // frame
-                                if (!other.isFloating()) {
-                                        if (c.getConstraintType() == Constraint.HORIZONTAL
-                                                        && other.getY() != getY())
-                                                other.setY(getY());
-
-                                        if (c.getConstraintType() == Constraint.VERTICAL
-                                                        && other.getX() != getX())
-                                                other.setX(getX());
-                                }
-                        }
-                }
-
-                for (Line line : getLines())
-                        line.updatePolygon();
-        }
-
-        public void setPosition(Point position) {
-                setPosition(position.x, position.y);
-        }
-
-        public Point getPosition() {
-                return new Point(getX(), getY());
-        }
-
-        /**
-         * Sets the position of this Item on the X axis
-         * 
-         * @param newX
-         *            The position on the X axis to assign to this Item
-         */
-        public void setX(int newX) {
-                setPosition(newX, getY());
-        }
-
-        /**
-         * Sets the position of this Item on the Y axis
-         * 
-         * @param newY
-         *            The position on the Y axis to assign to this Item
-         */
-        public void setY(int newY) {
-                setPosition(getX(), newY);
-        }
-
-        /**
-         * Returns the name of a Frame that this Item links to, or null if this Item
-         * has no link.
-         * 
-         * @return The name of a Frame that this Item links to (if any) or null if
-         *         this Item does not link to anything.
-         */
-        public String getLink() {
-                return _link;
-        }
-
-        public String getAbsoluteLink() {
-                if (_link == null)
-                        return null;
-                assert (_parent!= null);
-                if (_parent == null)
-                        return null;
-
-                // if its a relative link then return absolute
-                if (FrameIO.isPositiveInteger(_link)) {
-                        return _parent.getFramesetNameAdjusted()
-                                        + Conversion.getFrameNumber(_link);
-                }
-                return _link;
-        }
-
-        /**
-         * Links this item to the given Frame, this may be set to null to remove a
-         * link.
-         * 
-         * @param frameName
-         *            The name of the Frame to link this item to.
-         */
-        public void setLink(String frameName) {
-                _link = frameName;
-        }
-
-        /*
-         * public void setLinkValid(boolean val) { _isValidLink = val; }
-         */
-
-        /**
-         * Tests if the item link is a valid framename, that is, the String must
-         * begin with a character, end with a number with 0 or more letters and
-         * numbers in between. If there is a dot in the framename all the chars
-         * after it must be digits.
-         * 
-         * @return True if the given framename is proper, false otherwise.
-         */
-        public boolean isLinkValid() {
-                if (FrameIO.isPositiveInteger(getLink()))
-                        return true;
-
-                if (FrameIO.isValidFrameName(getLink()))
-                        return true;
-                return false;
-        }
-
-        public void setLinkFrameset(String frameset) {
-                _link_frameset = frameset;
-        }
-
-        public String getLinkFrameset() {
-                return _link_frameset;
-        }
-
-        public void setLinkTemplate(String template) {
-                _link_template = template;
-        }
-
-        public String getLinkTemplate() {
-                return _link_template;
-        }
-
-        /**
-         * Adds an action to this Item.
-         * 
-         * @param action
-         *            The KMS action language to add to this Item
-         */
-        public void addAction(String action) {
-                if (action == null || action.equals("")) {
-                        return;
-                }
-
-                if (_actions == null)
-                        _actions = new LinkedList<String>();
-                _actions.add(action);
-        }
-
-        /**
-         * Sets any action code (KMS action language) that should be associated with
-         * this Item Each entry in the list is one line of code
-         * 
-         * @param actions
-         *            The lines of code to associate with this Item
-         */
-        public void setAction(List<String> actions) {
-                if (actions == null || actions.size() == 0)
-                        _actions = null;
-                else
-                        _actions = new LinkedList<String>(actions);
-        }
-
-        /**
-         * Returns a list of any action code (KMS action language) that is currently
-         * associated with this Item
-         * 
-         * @return A List of action code associated with this Item, or null if none
-         *         has been assigned.
-         */
-        public List<String> getAction() {
-                return _actions;
-        }
-
-        public String getFirstAction() {
-                if (_actions == null)
-                        return null;
-                return _actions.getFirst();
-        }
-
-        /**
-         * Displays this item directly on the screen. Note: All Items are
-         * responsible for their own drawing, buffering, etc.
-         * 
-         * @param g
-         *            The Graphics to draw this Item on.
-         */
-        public abstract void paint(Graphics2D g);
-
-        /**
-         * Every Item has an area around it defined by a Shape (typically a
-         * rectangle), this method returns true if the given x,y pair lies within
-         * the area and false otherwise.
-         * 
-         * @param x
-         *            The x coordinate to check
-         * @param y
-         *            The y coordinate to check
-         * @return True if the Shape around this Item contains the given x,y pair,
-         *         false otherwise.
-         */
-        public boolean contains(int x, int y) {
-                return getPolygon().contains(x, y);
-        }
-
-        /**
-         * Returns the Shape that surrounds this Item representing this Item's
-         * 'gravity'.
-         * 
-         * @return The Shape (rectangle) surrounding this Item, which represents
-         *         this Items 'gravity'.
-         */
-        public abstract Polygon getPolygon();
-
-        public Area getArea() {
-                return new Area(getPolygon());
-        }
-
-        protected abstract void updatePolygon();
-
-        /**
-         * Returns the height (in pixels) of this Item's surrounding area.
-         * 
-         * @return The height (in pixels) of this Item's surrounding area as
-         *         returned by getArea().
-         */
-        public int getBoundsHeight() {
-                return getPolygon().getBounds().height;
-        }
-
-        /**
-         * Returns the width (in pixels) of this Item's surrounding area.
-         * 
-         * @return The width (in pixels) of this Item's surrounding area as returned
-         *         by getArea().
-         */
-        public int getBoundsWidth() {
-                return getPolygon().getBounds().width;
-        }
-
-        /**
-         * Checks if the given Shape intersects with the Shape around this Item.
-         * Note: Both Shape objects should be rectangles for this to work properly.
-         * 
-         * @param s
-         *            The Shape to check.
-         * @return True if the two Shapes overlap, False otherwise.
-         */
-        public boolean intersects(Polygon p) {
-                if (p == null)
-                        return false;
-
-                // return p.getBounds().intersects(getArea().getBounds());
-                Area a = new Area(p);
-                a.intersect(this.getArea());
-                return !a.isEmpty();
-        }
-
-        /**
-         * Paints any highlighting of this Item. This may include changing the
-         * thickness (lines) or painting a box around the item (Text, Images). If
-         * val is True then the Graphics Color is changed to the highlight Color, if
-         * False then the Graphics Color is left unchanged (for clearing of
-         * highlighting).
-         * 
-         * @param val
-         *            True if this Item should be highlighted, false if the
-         *            highlighting is being cleared.\
-         * @return The desired mouse cursor when this Item is highlighted (negative
-         *         means no change)
-         */
-        public int showHighlight(boolean val) {
-                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                return showHighlight(val, DEFAULT_HIGHLIGHT);
-        }
-
-        public int showDepressedHighlight(boolean val) {
-                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
-                return showHighlight(val, DEPRESSED_HIGHLIGHT);
-        }
-
-        public int showHighlight(boolean val, Color c) {
-                _isHighlighted = val;
-                if (c != null)
-                        _highlightColor = c;
-                else
-                        _highlightColor = DEFAULT_HIGHLIGHT;
-
-                return Item.UNCHANGED_CURSOR;
-        }
-
-        /**
-         * Returns True if this Item is currently highlighted.
-         * 
-         * @return True if this Item is currently highlighted on the screen, False
-         *         otherwise.
-         */
-        public boolean isHighlighted() {
-                return _isHighlighted;
-        }
-
-        public Color getHighlightColor() {
-                return _highlightColor;
-        }
-
-        /**
-         * Returns a deep copy of this Item, note: it is up to the receiver to
-         * change the Item ID etc as necessary.
-         * 
-         * @return A deep copy of this Item.
-         */
-        public abstract Item copy();
 
         public static void DuplicateItem(Item source, Item dest) {
@@ -777 +158 @@
                         dest.setID(source.getID());
                 }
+        }
+
+        public static int getGravity() {
+                return org.expeditee.gui.UserSettings.Gravity;
+        }
+
+        public static boolean showLineHighlight() {
+                return org.expeditee.gui.UserSettings.LineHighlight;
+        }
+        
+        private Point _offset = new Point(0, 0);
+
+        private int _x;
+
+        private int _y;
+
+        private int _id;
+
+        private String _creationDate = null;
+
+        private boolean _linkMark = true;
+
+        private boolean _actionMark = true;
+
+        private boolean _highlight = true;
+
+        private boolean _isHighlighted = false;
+
+        private Dimension _maxSize = null;
+
+        private String _owner = null;
+
+        private String _link = null;
+
+        private StringBuffer _data = new StringBuffer();
+
+        private List<String> _actionCursorEnter = null;
+
+        private List<String> _actionCursorLeave = null;
+
+        private List<String> _actionEnterFrame = null;
+
+        private List<String> _actionLeaveFrame = null;
+
+        public int Permission = PERMISSION_FULL;
+
+        private Color _colorFill = null;
+        
+        private Color _color = null;
+
+        private Color _highlightColor = DEFAULT_HIGHLIGHT;
+
+        private Color _colorBackground = null;
+
+        private Color _colorTopShadow = null;
+
+        private Color _colorBottomShadow = null;
+
+        // the link\action circle
+        private Polygon _circle = null;
+
+        // the invalid link cross
+        private Polygon _circleCross = null;
+
+        private Frame _parent = null;
+
+        protected int _highlightThickness = 2;
+
+        // arrowhead parameters
+        private int _arrowheadLength = 0;
+
+        private double _arrowheadRatio = DEFAULT_ARROWHEAD_RATIO;
+
+        private Polygon _arrowhead = null;
+
+        // the list of lines that this point is part of.
+        private List<Line> _lines = new ArrayList<Line>();
+
+        private int[] _linePattern = null;
+
+        private boolean _floating = false;
+
+        // list of points constrained with this point
+        private List<Constraint> _constraints = null;
+
+        private LinkedList<String> _actions = null;
+        
+        private String _link_frameset = null;
+
+        private String _link_template = null;
+
+        private String _fillPattern = null;
+        
+        private boolean _visible = true;
+
+        protected Item() {
+                _creationDate = Logger.EasyDateFormat("ddMMMyyyy:HHmm");
+        }
+
+        /**
+         * Adds an action to this Item.
+         * 
+         * @param action
+         *            The KMS action language to add to this Item
+         */
+        public void addAction(String action) {
+                if (action == null || action.equals("")) {
+                        return;
+                }
+
+                if (_actions == null)
+                        _actions = new LinkedList<String>();
+                _actions.add(action);
+        }
+
+        public void addAllConnected(List<Item> connected) {
+                if (!connected.contains(this))
+                        connected.add(this);
+
+                for (Line line : getLines()) {
+                        if (!connected.contains(line))
+                                line.addAllConnected(connected);
+                }
+        }
+
+        /**
+         * Adds the given Constraint to this Dot
+         * 
+         * @param c
+         *            The Constraint to set this Dot as a member of.
+         */
+        public void addConstraint(Constraint c) {
+                if (_constraints == null)
+                        _constraints = new ArrayList<Constraint>();
+
+                // do not add duplicate constraint
+                if (_constraints.contains(c))
+                        return;
+
+                _constraints.add(c);
+        }
+
+        /**
+         * Adds a given line to the list of lines that this Point is an end for.
+         * 
+         * @param line
+         *            The Line that this Point is an end of.
+         */
+        public void addLine(Line line) {
+                if (_lines.contains(line)) {
+                        return;
+                }
+
+                line.setColor(getColor());
+                line.setSize(getSize());
+                line.setLinePattern(getLinePattern());
+
+                _lines.add(line);
+        }
+
+        /**
+         * Items are sorted by their Y coordinate on the screen.
+         * 
+         * @param i
+         *            The Item to compare this Item to
+         * @return a negative integer, zero, or a positive integer as this object is
+         *         less than, equal to, or greater than the specified object.
+         */
+        public int compareTo(Item i) {
+                return getY() - i.getY();
+        }
+
+        /**
+         * Every Item has an area around it defined by a Shape (typically a
+         * rectangle), this method returns true if the given x,y pair lies within
+         * the area and false otherwise.
+         * 
+         * @param x
+         *            The x coordinate to check
+         * @param y
+         *            The y coordinate to check
+         * @return True if the Shape around this Item contains the given x,y pair,
+         *         false otherwise.
+         */
+        public boolean contains(int x, int y) {
+                return getPolygon().contains(x, y);
+        }
+
+        /**
+         * Returns a deep copy of this Item, note: it is up to the receiver to
+         * change the Item ID etc as necessary.
+         * 
+         * @return A deep copy of this Item.
+         */
+        public abstract Item copy();
+
+        public void delete() {
+                setVisible(false);
+        }
+
+        public boolean equals(Object o) {
+                if (o instanceof Item) {
+                        Item i = (Item) o;
+                        return i.getID() == getID()
+                                        && ((i.getParent() == _parent) || (i.getParent() != null && i
+                                                        .getParent().equals(_parent)));
+
+                } else
+                        return false;
+        }
+
+        final public String getAbsoluteLink() {
+                String link = getLink();
+                
+                if (link == null)
+                        return null;
+                //assert (_parent!= null);
+                if (_parent == null){
+                        //if parent is null it is an item on the message box
+                        //so it must already be absolute
+                        assert(!FrameIO.isPositiveInteger(link));
+                        return link;
+                }
+
+                // if its a relative link then return absolute
+                if (FrameIO.isPositiveInteger(link)) {
+                        return _parent.getFramesetNameAdjusted()
+                                        + Conversion.getFrameNumber(link);
+                }
+                return link;
+        }
+
+        /**
+         * Returns a list of any action code (KMS action language) that is currently
+         * associated with this Item
+         * 
+         * @return A List of action code associated with this Item, or null if none
+         *         has been assigned.
+         */
+        public List<String> getAction() {
+                return _actions;
+        }
+
+        public List<String> getActionCursorEnter() {
+                return _actionCursorEnter;
+        }
+
+        public List<String> getActionCursorLeave() {
+                return _actionCursorLeave;
+        }
+
+        public List<String> getActionEnterFrame() {
+                return _actionEnterFrame;
+        }
+
+        public List<String> getActionLeaveFrame() {
+                return _actionLeaveFrame;
+        };
+
+        public boolean getActionMark() {
+                return _actionMark;
+        }
+
+        public List<Item> getAllConnected() {
+                List<Item> list = new LinkedList<Item>();
+                addAllConnected(list);
+                return list;
+        }
+
+        public Area getArea() {
+                return new Area(getPolygon());
+        }
+
+        public String getArrow() {
+                if (!hasVisibleArrow())
+                        return null;
+
+                String ratio = "" + getArrowheadRatio();
+                if (ratio.length() - ratio.indexOf(".") > 2)
+                        ratio = ratio.substring(0, ratio.indexOf(".") + 3);
+
+                return getArrowheadLength() + " " + ratio;
+        }
+
+        public Polygon getArrowhead() {
+                return _arrowhead;
+        }
+
+        public int getArrowheadLength() {
+                return _arrowheadLength;
+        }
+
+        public double getArrowheadRatio() {
+                return _arrowheadRatio;
+        }
+
+        public Color getBackgroundColor() {
+                return _colorBackground;
+        }
+
+        /**
+         * Returns the Color being used to shade the bottom half of this Item's
+         * border. This can be NULL if no Color is being used
+         * 
+         * @return The Color displayed on the bottom\right half of this Item's
+         *         border.
+         */
+        public Color getBottomShadowColor() {
+                return _colorBottomShadow;
+        }
+
+        /**
+         * Returns the height (in pixels) of this Item's surrounding area.
+         * 
+         * @return The height (in pixels) of this Item's surrounding area as
+         *         returned by getArea().
+         */
+        public int getBoundsHeight() {
+                return getPolygon().getBounds().height;
+        }
+
+        /**
+         * Returns the width (in pixels) of this Item's surrounding area.
+         * 
+         * @return The width (in pixels) of this Item's surrounding area as returned
+         *         by getArea().
+         */
+        public int getBoundsWidth() {
+                return getPolygon().getBounds().width;
+        }
+
+        protected Polygon getCircle() {
+                if (_circle == null) {
+                        int points = 16;
+
+                        double radians = 0.0;
+                        int xPoints[] = new int[points];
+                        int yPoints[] = new int[xPoints.length];
+
+                        for (int i = 0; i < xPoints.length; i++) {
+                                // circle looks best if these values are not related to gravity
+                                xPoints[i] = (int) (3.5 * Math.cos(radians)) + 6;// (2 *
+                                // GRAVITY);
+                                yPoints[i] = (int) (3.5 * Math.sin(radians)) + 3;// GRAVITY;
+                                radians += (2.0 * Math.PI) / xPoints.length;
+                        }
+
+                        _circle = new Polygon(xPoints, yPoints, xPoints.length);
+                }
+
+                return _circle;
+        }
+
+        protected Polygon getCircleCross() {
+
+                if (_circleCross == null) {
+                        _circleCross = new Polygon();
+
+                        Rectangle bounds = getCircle().getBounds();
+                        int x1 = (int) bounds.getMinX();
+                        int x2 = (int) bounds.getMaxX();
+                        int y1 = (int) bounds.getMinY();
+                        int y2 = (int) bounds.getMaxY();
+                        int midX = ((x2 - x1) / 2) + x1;
+                        int midY = ((y2 - y1) / 2) + y1;
+
+                        _circleCross.addPoint(x1, y1);
+                        _circleCross.addPoint(x2, y2);
+                        _circleCross.addPoint(midX, midY);
+                        _circleCross.addPoint(x1, y2);
+                        _circleCross.addPoint(x2, y1);
+                        _circleCross.addPoint(midX, midY);
+                }
+
+                return _circleCross;
+        }
+
+        public Color getColor() {
+                return _color;
+        }
+
+        public List<Item> getConnected() {
+                List<Item> conn = new LinkedList<Item>();
+                conn.add(this);
+
+                conn.addAll(getLines());
+                return conn;
+        }
+
+        public String getConstraintIDs() {
+                if (_constraints == null || _constraints.size() == 0)
+                        return null;
+
+                String cons = "";
+
+                for (Constraint c : _constraints)
+                        cons += c.getID() + " ";
+
+                return cons.trim();
+        }
+
+        /*
+         * public void setLinkValid(boolean val) { _isValidLink = val; }
+         */
+
+        /**
+         * Returns a List of any Constraints that this Dot is a memeber of.
+         * 
+         * @return a List of Constraints that this Dot is a member of.
+         */
+        public List<Constraint> getConstraints() {
+                return _constraints;
+        }
+
+        public String getData() {
+                if (_data != null && _data.length() > 0)
+                        return _data.toString();
+                return null;
+        }
+
+        public String getDateCreated() {
+                return _creationDate;
+        }
+
+        public Color getFillColor() {
+                return _colorFill;
+        }
+
+        public String getFillPattern() {
+                return _fillPattern;
+        }
+
+        public String getFirstAction() {
+                if (_actions == null)
+                        return null;
+                return _actions.getFirst();
+        }
+
+        public boolean getHighlight() {
+                return _highlight;
+        }
+
+        public Color getHighlightColor() {
+                return _highlightColor;
+        }
+
+        /**
+         * Returns the ID of this Item, which must be unique for the Frame.
+         * 
+         * @return The ID of this Item.
+         */
+        public int getID() {
+                return _id;
+        }
+
+        /**
+         * Returns the list of IDs of the Lines that this Dot is an end of.
+         * 
+         * @return The list of Line IDs that this point is part of.
+         */
+        public String getLineIDs() {
+                String lineID = null;
+
+                if (_lines.size() > 0) {
+                        lineID = "" + _lines.get(0).getID();
+
+                        for (int i = 1; i < _lines.size(); i++)
+                                lineID += " " + _lines.get(i).getID();
+                }
+
+                return lineID;
+        }
+
+        public int[] getLinePattern() {
+                return _linePattern;
+        }
+
+        /**
+         * Returns a list of Lines where this Dot is an end.
+         * 
+         * @return A list of the Lines that this Dot is an end for or null if no
+         *         Lines have been added.
+         */
+        public List<Line> getLines() {
+                return _lines;
+        }
+
+        /**
+         * Returns the name of a Frame that this Item links to, or null if this Item
+         * has no link.
+         * 
+         * @return The name of a Frame that this Item links to (if any) or null if
+         *         this Item does not link to anything.
+         */
+        public String getLink() {
+                return _link;
+        }
+
+        public String getLinkFrameset() {
+                return _link_frameset;
+        }
+
+        public boolean getLinkMark() {
+                return _linkMark;
+        }
+
+        public String getLinkTemplate() {
+                return _link_template;
+        }
+
+        public Dimension getMaxSize() {
+                return _maxSize;
+        }
+
+        public Point getOffset() {
+                return _offset;
+        }
+
+        public String getOwner() {
+                return _owner;
+        }
+        
+        public Color getPaintBackgroundColor() {
+                if (_colorBackground == null) {
+                        if (getParent() != null && getParent().getBackgroundColor() != null)
+                                return getParent().getBackgroundColor();
+
+                        return DEFAULT_BACKGROUND;
+                }
+
+                return _colorBackground;
+        }
+
+        /**
+         * Returns the foreground Color of this Item.
+         * 
+         * @return The Color of this item (foreground)
+         */
+        public Color getPaintColor() {
+                if (_color == null) {
+                        if (getParent() != null)
+                                return getParent().getPaintForegroundColor();
+
+                        if (DisplayIO.getCurrentFrame() == null)
+                                return DEFAULT_FOREGROUND;
+
+                        return DisplayIO.getCurrentFrame().getPaintForegroundColor();
+                }
+
+                return _color;
+        }
+
+        protected Color getPaintHighlightColor() {
+                if (getParent() != null
+                                && getParent().getPaintBackgroundColor()
+                                                .equals(_highlightColor))
+                        return getParent().getPaintForegroundColor();
+
+                return _highlightColor;
+        }
+
+        public Frame getParent() {
+                return _parent;
+        }
+
+        /**
+         * Returns the Shape that surrounds this Item representing this Item's
+         * 'gravity'.
+         * 
+         * @return The Shape (rectangle) surrounding this Item, which represents
+         *         this Items 'gravity'.
+         */
+        public abstract Polygon getPolygon();
+
+        public Point getPosition() {
+                return new Point(getX(), getY());
+        }
+
+        /**
+         * Returns the size of this Item. For Text this is the Font size, for Lines
+         * and Dots this is the thickness.
+         * 
+         * @return The size of this Item.
+         */
+        public abstract int getSize();
+
+        public float getThickness() {
+                return 0;
+        }
+
+        /**
+         * Returns the Color being used to shade the top half of this Item's border.
+         * This can be NULL if no Color is being used
+         * 
+         * @return The Color displayed on the top\left half of this Item's border.
+         */
+        public Color getTopShadowColor() {
+                return _colorTopShadow;
+        }
+
+        public String getTypeAndID() {
+                return "T " + getID();
+        }
+
+        public int getWidth() {
+                return 0;
+        }
+
+        /**
+         * Returns the X coordinate of this Item on the screen
+         * 
+         * @return The X coordinate of this Item on the screen
+         */
+        public int getX() {
+                return _x;
+        }
+
+        /**
+         * Returns the Y coordinate of this Item on the screen
+         * 
+         * @return The Y coordinate of this Item on the screen
+         */
+        public int getY() {
+                return _y;
+        }
+
+        protected boolean hasVisibleArrow() {
+                return false;
+        }
+
+        /**
+         * Checks if the given Shape intersects with the Shape around this Item.
+         * Note: Both Shape objects should be rectangles for this to work properly.
+         * 
+         * @param s
+         *            The Shape to check.
+         * @return True if the two Shapes overlap, False otherwise.
+         */
+        public boolean intersects(Polygon p) {
+                if (p == null)
+                        return false;
+                
+                // return p.getBounds().intersects(getArea().getBounds());
+                Area a = new Area(p);
+                
+                a.intersect(this.getArea());
+                return !a.isEmpty();
+        }
+
+        /**
+         * Note: Pictures always return False, as they should be drawn even when no
+         * other annotation Items are.
+         * 
+         * @return True if this Item is an annotation, False otherwise.
+         */
+        public abstract boolean isAnnotation();
+
+        public boolean isFloating() {
+                return _floating;
+        }
+
+        public boolean isFrameName() {
+                if (this.getParent() == null || this.getParent().getFrameNameItem() != this)
+                        return false;
+                return true;
+        }
+
+        public boolean isFrameTitle() {
+                if (this.getParent() == null || this.getParent().getTitle() != this)
+                        return false;
+                return true;
+        }
+
+        /**
+         * Returns True if this Item is currently highlighted.
+         * 
+         * @return True if this Item is currently highlighted on the screen, False
+         *         otherwise.
+         */
+        public boolean isHighlighted() {
+                return _isHighlighted;
+        }
+
+        /**
+         * Tests if the item link is a valid framename, that is, the String must
+         * begin with a character, end with a number with 0 or more letters and
+         * numbers in between. If there is a dot in the framename all the chars
+         * after it must be digits.
+         * 
+         * @return True if the given framename is proper, false otherwise.
+         */
+        public boolean isLinkValid() {
+                if (FrameIO.isPositiveInteger(getLink()))
+                        return true;
+
+                if (FrameIO.isValidFrameName(getLink()))
+                        return true;
+                return false;
+        }
+
+        public boolean isNear(int x, int y) {
+                
+                
+                int xLeft = getPolygon().getBounds().x;
+                int yTop = getPolygon().getBounds().y;
+                
+                return (x > xLeft - NEAR_DISTANCE && y > yTop - NEAR_DISTANCE 
+                                && x < xLeft + getBoundsWidth() + NEAR_DISTANCE
+                                && y < yTop + getBoundsHeight() + NEAR_DISTANCE);
+        }
+
+        /**
+         * Checks if this item is a frame title.
+         * 
+         * @return true if the item is a frame title
+         */
+        /*
+         * public boolean isTitle() { // check if the title has been assigned if
+         * (getID() >= 0 && this instanceof Text) if (getX() < 200 && getY() <
+         * getSize() + system.io.KMSConversion.Y_ADJUST) return true; return false; }
+         */
+
+        public boolean isOldTag() {
+                if (this instanceof Text)
+                        if (((Text) this).getText().get(0).toLowerCase().equals("@old"))
+                                return true;
+                return false;
         }
 
@@ -797 +905 @@
 
         /**
-         * Sets the maximum coordinates on the screen that this item may occupy.
-         * This is used by Text items to compute word-wrapping lengths.
-         * 
-         * @param d
-         *            The Maximum size of the Frame containing this Item.
-         */
-        public void setMaxSize(Dimension d) {
-                if (d != null) {
-                        _maxSize = d;
-                        updatePolygon();
-                }
-        }
-
-        public Dimension getMaxSize() {
-                return _maxSize;
-        }
-
-        public Color getColor() {
-                return _color;
-        }
-
-        /**
-         * Returns the foreground Color of this Item.
-         * 
-         * @return The Color of this item (foreground)
-         */
-        public Color getPaintColor() {
-                if (_color == null) {
-                        if (getParent() != null)
-                                return getParent().getPaintForegroundColor();
-
-                        if (DisplayIO.getCurrentFrame() == null)
-                                return DEFAULT_FOREGROUND;
-
-                        return DisplayIO.getCurrentFrame().getPaintForegroundColor();
-                }
-
-                return _color;
-        }
-
-        protected Color getPaintHighlightColor() {
-                if (getParent() != null
-                                && getParent().getPaintBackgroundColor()
-                                                .equals(_highlightColor))
-                        return getParent().getPaintForegroundColor();
-
-                return _highlightColor;
+         * Displays this item directly on the screen. Note: All Items are
+         * responsible for their own drawing, buffering, etc.
+         * 
+         * @param g
+         *            The Graphics to draw this Item on.
+         */
+        public abstract void paint(Graphics2D g);
+
+        /**
+         * This method performs all the actions in an items list. If it contains a
+         * link as well the link is used as the source frame for all acitons.
+         */
+        public void performActions() {
+                Frame sourceFrame = null;
+                // if a link exists make it the source frame for this action
+                if (getLink() != null) {
+                        sourceFrame = FrameUtils.getFrame(getLink());
+                }
+                // if no link exists or the link is bad then use the
+                // currently displayed frame as the source frame for the
+                // action
+                if (sourceFrame == null) {
+                        sourceFrame = DisplayIO.getCurrentFrame();
+                }
+
+                for (String s : getAction()) {
+                        Actions.PerformAction(sourceFrame, this, s);
+                }
+        }
+
+        public void removeAllConstraints() {
+                if (_constraints != null)
+                        _constraints.clear();
+        }
+
+        /**
+         * Clears the list of Lines that this Dot is an end of. Note: This only
+         * clears this Dot's list and does not have any affect on the Lines or other
+         * Dots.
+         */
+        public void removeAllLines() {
+                _lines.clear();
+        }
+
+        /**
+         * Removes the given Constraint from the list of constraintss that this Dot
+         * is a part of.
+         * 
+         * @param c
+         *            The Constraint that this Dot is no longer a part of.
+         */
+        public void removeConstraint(Constraint c) {
+                _constraints.remove(c);
+        }
+
+        /**
+         * Removes the given Line from the list of lines that this Dot is an end
+         * for.
+         * 
+         * @param line
+         *            The Line that this Dot is no longer an end of.
+         */
+        public void removeLine(Line line) {
+                _lines.remove(line);
+        }
+
+        public void run() {
+                try {
+                        AgentStats.reset();
+                        FrameGraphics
+                                        .DisplayMessage("Running SimpleProgram...", Color.BLUE);
+                        Simple.RunFrameAndReportError(this, new Context());
+                        Simple.ProgramFinished();
+                        FrameGraphics.DisplayMessage(AgentStats.getStats(), GREEN);
+                } catch (ConcurrentModificationException ce) {
+                        ce.printStackTrace();
+                } catch (Exception e) {
+                        FrameGraphics.LinkedErrorMessage(e.getMessage());
+                        Simple.ProgramFinished();
+                }
+        }
+
+        /**
+         * Check if it has a relative link if so make it absolute.
+         * 
+         */
+        public void setAbsoluteLink() {
+                if (_link == null)
+                        return;
+                // Check if all the characters are digits and hence it is a relative
+                // link
+                for (int i = 0; i < _link.length(); i++) {
+                        if (!Character.isDigit(_link.charAt(i)))
+                                return;
+                }
+
+                // Make it an absolute link
+                String framesetName;
+
+                if (_parent == null)
+                        framesetName = DisplayIO.getCurrentFrame()
+                                        .getFramesetNameAdjusted();
+                else
+                        framesetName = _parent.getFramesetNameAdjusted();
+
+                _link = framesetName + _link;
+        }
+
+        /**
+         * Sets any action code (KMS action language) that should be associated with
+         * this Item Each entry in the list is one line of code
+         * 
+         * @param actions
+         *            The lines of code to associate with this Item
+         */
+        public void setAction(List<String> actions) {
+                if (actions == null || actions.size() == 0)
+                        _actions = null;
+                else
+                        _actions = new LinkedList<String>(actions);
+        }
+
+        public void setActionCursorEnter(List<String> enter) {
+                _actionCursorEnter = enter;
+        }
+
+        public void setActionCursorLeave(List<String> leave) {
+                _actionCursorLeave = leave;
+        }
+
+        public void setActionEnterFrame(List<String> enter) {
+                _actionEnterFrame = enter;
+        }
+
+        public void setActionLeaveFrame(List<String> leave) {
+                _actionLeaveFrame = leave;
+        }
+
+        public void setActionMark(boolean val) {
+                _actionMark = val;
+        }
+
+        /**
+         * Sets whether this Item is an Annotation.
+         * 
+         * @param val
+         *            True if this Item is an Annotation, False otherwise.
+         */
+        public abstract void setAnnotation(boolean val);
+
+        /**
+         * Used to set this Line as an Arrow. If length and ratio are 0, no arrow is
+         * shown.
+         * 
+         * @param length
+         *            The how far down the shaft of the line the arrowhead should
+         *            come.
+         * @param ratio
+         *            The ratio of the arrow's length to its width.
+         */
+        public void setArrow(int length, double ratio) {
+                _arrowheadLength = length;
+                _arrowheadRatio = ratio;
+                updateArrowPolygon();
+        }
+
+        public void setArrowhead(Polygon arrow) {
+                _arrowhead = arrow;
+        }
+
+        public void setArrowheadLength(int length) {
+                _arrowheadLength = length;
+                updateArrowPolygon();
+        }
+
+        public void setArrowheadRatio(double ratio) {
+                _arrowheadRatio = ratio;
+                updateArrowPolygon();
+        }
+
+        public void setBackgroundColor(Color c) {
+                _colorBackground = c;
+        }
+
+        /**
+         * Sets the Color to use on the bottom and right sections of this Item's
+         * border. If top is NULL, then the Item's background Color will be used.
+         * 
+         * @param top
+         *            The Color to display in the bottom and right sections of this
+         *            Item's border.
+         */
+        public void setBottomShadowColor(Color bottom) {
+                _colorBottomShadow = bottom;
         }
 
@@ -859 +1114 @@
         }
 
-        /**
-         * Returns the Color being used to shade the top half of this Item's border.
-         * This can be NULL if no Color is being used
-         * 
-         * @return The Color displayed on the top\left half of this Item's border.
-         */
-        public Color getTopShadowColor() {
-                return _colorTopShadow;
-        }
-
-        /**
-         * Sets the Color to use on the top and left sections of this Item's border.
-         * If top is NULL, then the Item's background Color will be used.
-         * 
-         * @param top
-         *            The Color to display in the top and left sections of this
-         *            Item's border.
-         */
-        public void setTopShadowColor(Color top) {
-                _colorTopShadow = top;
-        }
-
-        /**
-         * Returns the Color being used to shade the bottom half of this Item's
-         * border. This can be NULL if no Color is being used
-         * 
-         * @return The Color displayed on the bottom\right half of this Item's
-         *         border.
-         */
-        public Color getBottomShadowColor() {
-                return _colorBottomShadow;
-        }
-
-        /**
-         * Sets the Color to use on the bottom and right sections of this Item's
-         * border. If top is NULL, then the Item's background Color will be used.
-         * 
-         * @param top
-         *            The Color to display in the bottom and right sections of this
-         *            Item's border.
-         */
-        public void setBottomShadowColor(Color bottom) {
-                _colorBottomShadow = bottom;
-        }
-
-        protected Polygon getCircle() {
-                if (_circle == null) {
-                        int points = 16;
-
-                        double radians = 0.0;
-                        int xPoints[] = new int[points];
-                        int yPoints[] = new int[xPoints.length];
-
-                        for (int i = 0; i < xPoints.length; i++) {
-                                // circle looks best if these values are not related to gravity
-                                xPoints[i] = (int) (3.5 * Math.cos(radians)) + 6;// (2 *
-                                // GRAVITY);
-                                yPoints[i] = (int) (3.5 * Math.sin(radians)) + 3;// GRAVITY;
-                                radians += (2.0 * Math.PI) / xPoints.length;
-                        }
-
-                        _circle = new Polygon(xPoints, yPoints, xPoints.length);
-                }
-
-                return _circle;
-        }
-
-        protected Polygon getCircleCross() {
-
-                if (_circleCross == null) {
-                        _circleCross = new Polygon();
-
-                        Rectangle bounds = getCircle().getBounds();
-                        int x1 = (int) bounds.getMinX();
-                        int x2 = (int) bounds.getMaxX();
-                        int y1 = (int) bounds.getMinY();
-                        int y2 = (int) bounds.getMaxY();
-                        int midX = ((x2 - x1) / 2) + x1;
-                        int midY = ((y2 - y1) / 2) + y1;
-
-                        _circleCross.addPoint(x1, y1);
-                        _circleCross.addPoint(x2, y2);
-                        _circleCross.addPoint(midX, midY);
-                        _circleCross.addPoint(x1, y2);
-                        _circleCross.addPoint(x2, y1);
-                        _circleCross.addPoint(midX, midY);
-                }
-
-                return _circleCross;
-        }
-
-        public void setFillColor(Color c) {
-                _colorFill = c;
-
-                for (Line line : _lines) {
-                        Item other = line.getOppositeEnd(this);
-                        if (other.getFillColor() != c)
-                                other.setFillColor(c);
-                }
-        }
-
-        public void setBackgroundColor(Color c) {
-                _colorBackground = c;
-        }
-
-        public Color getBackgroundColor() {
-                return _colorBackground;
-        }
-
-        public Color getPaintBackgroundColor() {
-                if (_colorBackground == null) {
-                        if (getParent() != null && getParent().getBackgroundColor() != null)
-                                return getParent().getBackgroundColor();
-
-                        return DEFAULT_BACKGROUND;
-                }
-
-                return _colorBackground;
-        }
-
-        public Color getFillColor() {
-                return _colorFill;
-        }
-
-        /**
-         * Returns the size of this Item. For Text this is the Font size, for Lines
-         * and Dots this is the thickness.
-         * 
-         * @return The size of this Item.
-         */
-        public abstract int getSize();
-
-        /**
-         * Sets the size of this Item. For Text this is the Font size. For Lines and
-         * Dots this is the thickness.
-         */
-        public abstract void setSize(int size);
-
-        /**
-         * Sets whether this Item is an Annotation.
-         * 
-         * @param val
-         *            True if this Item is an Annotation, False otherwise.
-         */
-        public abstract void setAnnotation(boolean val);
-
-        /**
-         * Note: Pictures always return False, as they should be drawn even when no
-         * other annotation Items are.
-         * 
-         * @return True if this Item is an annotation, False otherwise.
-         */
-        public abstract boolean isAnnotation();
-
-        public List<Item> getConnected() {
-                List<Item> conn = new LinkedList<Item>();
-                conn.add(this);
-
-                conn.addAll(getLines());
-                return conn;
-        }
-
-        public List<Item> getAllConnected() {
-                List<Item> list = new LinkedList<Item>();
-                addAllConnected(list);
-                return list;
-        }
-
-        public void addAllConnected(List<Item> connected) {
-                if (!connected.contains(this))
-                        connected.add(this);
-
-                for (Line line : getLines()) {
-                        if (!connected.contains(line))
-                                line.addAllConnected(connected);
-                }
-        }
-
-        public void setOffset(Point p) {
-                _offset.setLocation(p);
-        }
-
-        public void setOffset(int x, int y) {
-                _offset.setLocation(x, y);
-        }
-
-        public Point getOffset() {
-                return _offset;
-        }
-
-        public void setParent(Frame frame) {
-                _parent = frame;
-        }
-
-        public Frame getParent() {
-                return _parent;
-        }
-
-        public void setActionMark(boolean val) {
-                _actionMark = val;
-        }
-
-        public boolean getActionMark() {
-                return _actionMark;
-        }
-
-        public void setLinkMark(boolean val) {
-                _linkMark = val;
-        }
-
-        public boolean getLinkMark() {
-                return _linkMark;
-        }
-
-        public void setOwner(String own) {
-                _owner = own;
-        }
-
-        public String getOwner() {
-                return _owner;
-        }
-
-        public void setHighlight(boolean val) {
-                _highlight = val;
-        }
-
-        public boolean getHighlight() {
-                return _highlight;
-        }
-
-        public String getData() {
-                if (_data != null && _data.length() > 0)
-                        return _data.toString();
-                return null;
+        public void setConstraintIDs(String IDs) {
+        }
+
+        public void setConstraints(List<Constraint> constraints) {
+                _constraints = constraints;
         }
 
@@ -1102 +1128 @@
         }
 
-        public List<String> getActionCursorEnter() {
-                return _actionCursorEnter;
-        }
-
-        public void setActionCursorEnter(List<String> enter) {
-                _actionCursorEnter = enter;
-        }
-
-        public List<String> getActionCursorLeave() {
-                return _actionCursorLeave;
-        }
-
-        public void setActionCursorLeave(List<String> leave) {
-                _actionCursorLeave = leave;
-        }
-
-        public List<String> getActionEnterFrame() {
-                return _actionEnterFrame;
-        }
-
-        public void setActionEnterFrame(List<String> enter) {
-                _actionEnterFrame = enter;
-        }
-
-        public List<String> getActionLeaveFrame() {
-                return _actionLeaveFrame;
-        }
-
-        public void setActionLeaveFrame(List<String> leave) {
-                _actionLeaveFrame = leave;
+        /**
+         * Sets the created date of this Frame to the given String.
+         * 
+         * @param date
+         *            The date to use for this Frame.
+         */
+        public void setDateCreated(String date) {
+                _creationDate = date;
+        }
+
+        public void setFillColor(Color c) {
+                _colorFill = c;
+
+                for (Line line : _lines) {
+                        Item other = line.getOppositeEnd(this);
+                        if (other.getFillColor() != c)
+                                other.setFillColor(c);
+                }
+        }
+
+        public void setFilledHighlight(boolean value) {
         }
 
@@ -1138 +1155 @@
         }
 
-        public String getFillPattern() {
-                return _fillPattern;
-        }
-
-        /**
-         * Used to set this Line as an Arrow. If length and ratio are 0, no arrow is
-         * shown.
-         * 
-         * @param length
-         *            The how far down the shaft of the line the arrowhead should
-         *            come.
-         * @param ratio
-         *            The ratio of the arrow's length to its width.
-         */
-        public void setArrow(int length, double ratio) {
-                _arrowheadLength = length;
-                _arrowheadRatio = ratio;
-                updateArrowPolygon();
-        }
-
-        public int getArrowheadLength() {
-                return _arrowheadLength;
-        }
-
-        public double getArrowheadRatio() {
-                return _arrowheadRatio;
-        }
-
-        public void setArrowheadLength(int length) {
-                _arrowheadLength = length;
-                updateArrowPolygon();
-        }
-
-        public void setArrowheadRatio(double ratio) {
-                _arrowheadRatio = ratio;
-                updateArrowPolygon();
-        }
-
+        public void setFloating(boolean val) {
+                _floating = val;
+        }
+
+        public void setHighlight(boolean val) {
+                _highlight = val;
+        }
+
+        /**
+         * Sets the ID of this Item to the given Integer. Note: Items with ID's < 0
+         * are not saved
+         * 
+         * @param newID
+         *            The new ID to assign this Item.
+         */
+        public void setID(int newID) {
+                _id = newID;
+        }
+
+        /**
+         * Sets the list of lines that this point is part of (may be set to null).
+         * 
+         * @param lineID
+         *            A String of line ID numbers separated by spaces.
+         */
+        public void setLineIDs(String lineID) {
+        }
+
+        public void setLinePattern(int[] pattern) {
+                _linePattern = pattern;
+
+                for (Line line : getLines())
+                        line.setLinePattern(pattern);
+        }
+
+        public void setLines(List<Line> lines) {
+                _lines = lines;
+
+                for (Line line : lines)
+                        line.setLinePattern(getLinePattern());
+        }
+
+        /**
+         * Links this item to the given Frame, this may be set to null to remove a
+         * link.
+         * 
+         * @param frameName
+         *            The name of the Frame to link this item to.
+         */
+        public void setLink(String frameName) {
+                _link = frameName;
+        }
+
+        public void setLinkFrameset(String frameset) {
+                _link_frameset = frameset;
+        }
+
+        public void setLinkMark(boolean val) {
+                _linkMark = val;
+        }
+
+        public void setLinkTemplate(String template) {
+                _link_template = template;
+        }
+
+        /**
+         * Sets the maximum coordinates on the screen that this item may occupy.
+         * This is used by Text items to compute word-wrapping lengths.
+         * 
+         * @param d
+         *            The Maximum size of the Frame containing this Item.
+         */
+        public void setMaxSize(Dimension d) {
+                if (d != null) {
+                        _maxSize = d;
+                        updatePolygon();
+                }
+        }
+
+        public void setOffset(int x, int y) {
+                _offset.setLocation(x, y);
+        }
+
+        public void setOffset(Point p) {
+                _offset.setLocation(p);
+        }
+
+        public void setOwner(String own) {
+                _owner = own;
+        }
+
+        public void setParent(Frame frame) {
+                _parent = frame;
+        }
+
+        /**
+         * Sets the position of this item on the screen
+         * 
+         * @param x
+         *            The new X coordinate
+         * @param y
+         *            The new Y coordinate
+         */
+        public void setPosition(int x, int y) {
+                _x = x;
+                _y = y;
+
+                updatePolygon();
+
+                // update the position of any dots that are constrained by this one
+                if (_constraints != null) {
+                        for (Constraint c : _constraints) {
+                                Item other = c.getOppositeEnd(this);
+
+                                // only set the position if the other dot is still fixed to the
+                                // frame
+                                if (!other.isFloating()) {
+                                        if (c.getConstraintType() == Constraint.HORIZONTAL
+                                                        && other.getY() != getY())
+                                                other.setY(getY());
+
+                                        if (c.getConstraintType() == Constraint.VERTICAL
+                                                        && other.getX() != getX())
+                                                other.setX(getX());
+                                }
+                        }
+                }
+
+                for (Line line : getLines())
+                        line.updatePolygon();
+        }
+
+        public void setPosition(Point position) {
+                setPosition(position.x, position.y);
+        }
+
+        public void setRelativeLink() {
+                if (_link == null)
+                        return;
+                assert (_parent != null);
+                // Check if the link is for the current frameset
+                if (_parent.getFramesetName().equalsIgnoreCase(
+                                Conversion.getFrameset(_link))) {
+                        _link = "" + Conversion.getFrameNumber(_link);
+                }
+        }
+
+        /**
+         * Sets the size of this Item. For Text this is the Font size. For Lines and
+         * Dots this is the thickness.
+         */
+        public abstract void setSize(int size);
+
+        public void setThickness(float thick) throws UnsupportedOperationException {
+                throw new UnsupportedOperationException(
+                                "Item type does not support thickness attribute!");
+        }
+
+        /**
+         * Sets the Color to use on the top and left sections of this Item's border.
+         * If top is NULL, then the Item's background Color will be used.
+         * 
+         * @param top
+         *            The Color to display in the top and left sections of this
+         *            Item's border.
+         */
+        public void setTopShadowColor(Color top) {
+                _colorTopShadow = top;
+        }
+
+        public void setWidth(int width) throws UnsupportedOperationException {
+                throw new UnsupportedOperationException(
+                                "Item type does not support width attribute!");
+        }
+
+        /**
+         * Sets the position of this Item on the X axis
+         * 
+         * @param newX
+         *            The position on the X axis to assign to this Item
+         */
+        public void setX(int newX) {
+                setPosition(newX, getY());
+        }
+
+        /**
+         * Sets the position of this Item on the Y axis
+         * 
+         * @param newY
+         *            The position on the Y axis to assign to this Item
+         */
+        public void setY(int newY) {
+                setPosition(getX(), newY);
+        }
+
+        public int showDepressedHighlight(boolean val) {
+                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
+                return showHighlight(val, DEPRESSED_HIGHLIGHT);
+        }
+
+        public int showDisconnectHighlight(boolean val) {
+                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
+                return showHighlight(val, DISCONNECT_HIGHLIGHT);
+        }
+
+        /**
+         * Paints any highlighting of this Item. This may include changing the
+         * thickness (lines) or painting a box around the item (Text, Images). If
+         * val is True then the Graphics Color is changed to the highlight Color, if
+         * False then the Graphics Color is left unchanged (for clearing of
+         * highlighting).
+         * 
+         * @param val
+         *            True if this Item should be highlighted, false if the
+         *            highlighting is being cleared.\
+         * @return The desired mouse cursor when this Item is highlighted (negative
+         *         means no change)
+         */
+        public int showHighlight(boolean val) {
+                _highlightThickness = DEFAULT_HIGHLIGHT_THICKNESS;
+                return showHighlight(val, DEFAULT_HIGHLIGHT);
+        }
+
+        public int showHighlight(boolean val, Color c) {
+                _isHighlighted = val;
+                if (c != null)
+                        _highlightColor = c;
+                else
+                        _highlightColor = DEFAULT_HIGHLIGHT;
+
+                return Item.UNCHANGED_CURSOR;
+        }
         private void updateArrowPolygon() {
                 if (getArrowheadLength() < 0 || getArrowheadRatio() < 0)
@@ -1193 +1404 @@
                 }
         }
-
-        protected boolean hasVisibleArrow() {
-                return false;
-        }
-
-        public String getArrow() {
-                if (!hasVisibleArrow())
-                        return null;
-
-                String ratio = "" + getArrowheadRatio();
-                if (ratio.length() - ratio.indexOf(".") > 2)
-                        ratio = ratio.substring(0, ratio.indexOf(".") + 3);
-
-                return getArrowheadLength() + " " + ratio;
-        }
-
-        public Polygon getArrowhead() {
-                return _arrowhead;
-        }
-
-        public void setArrowhead(Polygon arrow) {
-                _arrowhead = arrow;
-        }
-
-        /**
-         * This method performs all the actions in an items list. If it contains a
-         * link as well the link is used as the source frame for all acitons.
-         */
-        public void performActions() {
-                Frame sourceFrame = null;
-                // if a link exists make it the source frame for this action
-                if (getLink() != null) {
-                        sourceFrame = FrameUtils.getFrame(getLink());
-                }
-                // if no link exists or the link is bad then use the
-                // currently displayed frame as the source frame for the
-                // action
-                if (sourceFrame == null) {
-                        sourceFrame = DisplayIO.getCurrentFrame();
-                }
-
-                for (String s : getAction()) {
-                        Actions.PerformAction(sourceFrame, this, s);
-                }
-        }
-
-        /**
-         * Checks if this item is a frame title.
-         * 
-         * @return true if the item is a frame title
-         */
-        /*
-         * public boolean isTitle() { // check if the title has been assigned if
-         * (getID() >= 0 && this instanceof Text) if (getX() < 200 && getY() <
-         * getSize() + system.io.KMSConversion.Y_ADJUST) return true; return false; }
-         */
-
-        public boolean isOldTag() {
-                if (this instanceof Text)
-                        if (((Text) this).getText().get(0).toLowerCase().equals("@old"))
-                                return true;
-                return false;
-        }
-
-        public boolean isFrameName() {
-                if (this.getParent() == null || this.getParent().getName() != this)
-                        return false;
-                return true;
-        }
-
-        public boolean isFrameTitle() {
-                if (this.getParent() == null || this.getParent().getTitle() != this)
-                        return false;
-                return true;
-        }
-
-        /**
-         * Sets the created date of this Frame to the given String.
-         * 
-         * @param date
-         *            The date to use for this Frame.
-         */
-        public void setDateCreated(String date) {
-                _creationDate = date;
-        }
-
-        public String getDateCreated() {
-                return _creationDate;
-        }
-
-        public float getThickness() {
-                return 0;
-        }
-
-        public void setThickness(float thick) throws UnsupportedOperationException {
-                throw new UnsupportedOperationException(
-                                "Item type does not support thickness attribute!");
-        }
-
-        public void setWidth(int width) throws UnsupportedOperationException {
-                throw new UnsupportedOperationException(
-                                "Item type does not support width attribute!");
-        }
-
-        public int getWidth() {
-                return 0;
-        }
-
-        public void run() {
-                try {
-                        AgentStats.reset();
-                        FrameGraphics
-                                        .DisplayMessage("Running SimpleProgram...", Color.BLUE);
-                        Simple.RunFrameAndReportError(this, new Context());
-                        Simple.ProgramFinished();
-                        FrameGraphics.DisplayMessage(AgentStats.getStats(), GREEN);
-                } catch (ConcurrentModificationException ce) {
-                        ce.printStackTrace();
-                } catch (Exception e) {
-                        FrameGraphics.LinkedErrorMessage(e.getMessage());
-                        Simple.ProgramFinished();
-                }
-        }
-
-        public String getTypeAndID() {
-                return "T " + getID();
-        }
-
-        /**
-         * Check if it has a relative link if so make it absolute.
-         * 
-         */
-        public void setAbsoluteLink() {
-                if (_link == null)
-                        return;
-                // Check if all the characters are digits and hence it is a relative
-                // link
-                for (int i = 0; i < _link.length(); i++) {
-                        if (!Character.isDigit(_link.charAt(i)))
-                                return;
-                }
-
-                // Make it an absolute link
-                String framesetName;
-
-                if (_parent == null)
-                        framesetName = DisplayIO.getCurrentFrame()
-                                        .getFramesetNameAdjusted();
-                else
-                        framesetName = _parent.getFramesetNameAdjusted();
-
-                _link = framesetName + _link;
-        }
-
-        public void setRelativeLink() {
-                if (_link == null)
-                        return;
-                assert (_parent != null);
-                // Check if the link is for the current frameset
-                if (_parent.getFramesetName().equalsIgnoreCase(
-                                Conversion.getFrameset(_link))) {
-                        _link = "" + Conversion.getFrameNumber(_link);
-                }
+        
+        protected abstract void updatePolygon();
+
+        public void setVisible(boolean state) {
+                this._visible = state;
+        }
+
+        public boolean isVisible() {
+                return _visible;
         }
 }

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

@@ -16 +16 @@
 
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
 
 //Static methods that provide functions for the objects\
@@ -402 +403 @@
          */
         public static List<Item> CopyItems(List<Item> toCopy) {
+                return CopyItems(toCopy, false);
+        }
+        public static List<Item> CopyItems(List<Item> toCopy, boolean extrude) {
                 // The copies to return
                 List<Item> copies = new ArrayList<Item>();
@@ -413 +417 @@
 
                 List<Item> seen = new ArrayList<Item>();
-
+                
                 for (Item i : toCopy) {
                         // lines are recreated later
@@ -452 +456 @@
                                 // if this is the frame name, make sure the frame is saved (in
                                 // case it is a TDFC frame)
-                                if (i == i.getParent().getName())
+                                if (i == i.getParent().getFrameNameItem())
                                         i.getParent().setChanged(true);
 
@@ -484 +488 @@
                                 copy.removeAllLines();
                                 copy.removeAllConstraints();
-
+                                
                                 // replace all other instances with the copy
                                 ReplaceAll(lineEnds, i, copy);
                                 ReplaceAll(vConst, i, copy);
                                 ReplaceAll(hConst, i, copy);
+                                
+                                if (extrude) {
+                                        Frame frame = DisplayIO.getCurrentFrame();
+                                        Line newLine = new Line(i,copy, frame.getNextItemID());
+                                        frame.addItem(newLine);
+                                        copies.add(newLine);
+                                }
 
                                 seen.add(i);
@@ -598 +609 @@
                 //copy.setFloating(true);
                 origEnd.setArrowheadLength(0);
-                copy.setArrowheadLength(0);
+                //copy.setArrowheadLength(0);
 
                 List<Item> toReturn = new LinkedList<Item>();
@@ -633 +644 @@
                         return;
 
+                //TODO optimise this code!!
                 // iterate through all the dots
                 for (Dot searchFor : dots) {

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

@@ -14 +14 @@
 import java.util.List;
 
+import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
+
 /**
  * Implements a line that is drawn on the screen. A line is represented as two
@@ -24 +27 @@
 
         private static final int AUTO_ARROWHEAD_LENGTH = -1;
-        
-        private static final double DEFAULT_ARROWHEAD_RATIO = 0.5;
 
         private static final int ARROW_HEAD_TO_LENGTH_RATIO = 8;
@@ -81 +82 @@
                 // initialise the line size
                 float thick;
-                if (_start instanceof Dot)
+
+                if (_start instanceof Dot && _end instanceof Dot)
+                        thick = (((Dot) _start).getThickness() + ((Dot) _end)
+                                        .getThickness()) / 2.0f;
+                else if (_start instanceof Dot)
                         thick = ((Dot) _start).getThickness();
+                else if (_end instanceof Dot)
+                        thick = ((Dot) _end).getThickness();
                 else
-                        thick = _start.getSize();
-
-                if (_end instanceof Dot)
-                        thick += ((Dot) _end).getThickness();
-                else
-                        thick += _end.getSize();
-
-                setLinePattern(_start.getLinePattern());
-                // Set the thickness to be half the value of the end points
-                setThickness(thick / 2.0f);
+                        thick = 1;
+
+                setThickness(thick);
         }
 
@@ -300 +300 @@
                                         BasicStroke.JOIN_MITER));
 
-                        if (_start.isFloating() && !_end.isFloating()) {
-                                paintArrow(g, _start, _startOffset, _endOffset);
-                        } else if (!_start.isFloating() && _end.isFloating()) {
-                                paintArrow(g, _end, _endOffset, _startOffset);
-                        } else {
-                                paintArrow(g, _start, _startOffset, _endOffset);
-                                paintArrow(g, _end, _endOffset, _startOffset);
-                        }
+                        paintArrow(g, _start, _startOffset, _endOffset);
+                        paintArrow(g, _end, _endOffset, _startOffset);
 
                         g.setStroke(_lineStroke);
@@ -326 +320 @@
                 if (showLineHighlight() && isHighlighted()) {
                         g.setColor(getHighlightColor());
+                        g.setStroke(new BasicStroke(MINIMUM_THICKNESS,
+                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
                         ((Graphics2D) g).draw(this.getArea());
                 }
@@ -453 +449 @@
         }
 
+        public Item getEndPointToDisconnect(int x, int y) {
+                Item start = getStartItem();
+                Item end = getEndItem();
+                int deltaX = start.getX() - end.getX();
+                int deltaY = start.getY() - end.getY();
+                int lineLength = (int) Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+
+                int startX = start.getX() - x;
+                int endX = end.getX() - x;
+                int startY = start.getY() - y;
+                int endY = end.getY() - y;
+
+                int distStart = (int) Math.sqrt(startX * startX + startY * startY);
+                int distEnd = (int) Math.sqrt(endX * endX + endY * endY);
+
+                final double THRESHHOLD = Math.min(0.2 * lineLength, 25.0);
+
+                if (distStart < THRESHHOLD) {
+                        return start;
+                } else if (distEnd < THRESHHOLD) {
+                        return end;
+                }
+
+                return null;
+        }
+
         @Override
         public int showHighlight(boolean val) {
@@ -547 +569 @@
                 }
         }
-        
+
         public void autoArrowheadLength() {
                 _end.setArrowheadLength(AUTO_ARROWHEAD_LENGTH);
-                _end.setArrowheadRatio(DEFAULT_ARROWHEAD_RATIO);
         }
 
@@ -570 +591 @@
         }
 
+        /**
+         * This method toggles the arrow on the floating end point of a line. If the
+         * line does not have one floating end and one fixed end this method does
+         * nothing.
+         * 
+         */
         public void toggleArrow() {
                 Item arrow;
@@ -728 +755 @@
         }
 
-        @Override
-        public Item merge(Item merger, int mouseX, int mouseY) {
-                if (!(merger instanceof Dot))
-                        return merger;
-
+        public void showVirtualSpot(int mouseX, int mouseY) {
+                Dot spot = new Dot(mouseX, mouseY, -1);
+                spot.setThickness(Math.max(this.getThickness(), 5));
+                if (this.getColor() != Color.RED)
+                        spot.setColor(Color.RED);
+                else
+                        spot.setColor(Color.BLUE);
+
+                // calculate nearest point on line from spot
+                double slope1;
+                double slope2;
+                double x, y;
+
+                slope1 = (_start.getY() - _end.getY() * 1.0)
+                                / (_start.getX() - _end.getX());
+                slope2 = -1 / slope1;
+
+                // if the line is horizontal
+                if (slope1 == 0) {
+                        x = spot.getX();
+                        y = _start.getY();
+                        // if the line is vertical
+                } else if (slope2 == 0) {
+                        x = _start.getX();
+                        y = spot.getY();
+                        // otherwise, the line is sloped
+                } else {
+                        x = (-1 * slope2 * spot.getX() + spot.getY() - _start.getY() + slope1
+                                        * _start.getX())
+                                        / (slope1 - slope2);
+                        y = slope1 * (x - _start.getX()) + _start.getY();
+                }
+
+                // position spot on the line
+                spot.setPosition((int) x, (int) y);
+                _virtualSpot = spot;
+        }
+
+        public Item forceMerge(Item merger, int mouseX, int mouseY) {
                 Dot spot = (Dot) merger;
-
-                // dots with multiple lines cannot be attached, nor can dots with no
-                // lines
-                if (spot.getLines().size() != 1)
-                        return merger;
-
-                // lines that are in 'connected' mode, also cannot be attached
-                if (spot.getLines().get(0).getOppositeEnd(spot).isFloating())
-                        return merger;
 
                 if (spot.getConstraints() != null)
@@ -783 +835 @@
                 Line temp = copy();
 
-                temp.setID(-1);
+                Frame currentFrame = DisplayIO.getCurrentFrame();
+                temp.setID(currentFrame.getNextItemID());
                 temp.setEndItem(_end);
                 temp.setStartItem(spot);
+                currentFrame.addItem(temp);
 
                 setEndItem(spot);
@@ -793 +847 @@
 
                 return spot;
+        }
+
+        @Override
+        public Item merge(Item merger, int mouseX, int mouseY) {
+                if (!(merger instanceof Dot))
+                        return merger;
+
+                Dot spot = (Dot) merger;
+
+                // dots with multiple lines cannot be attached, nor can dots with no
+                // lines
+                if (spot.getLines().size() != 1)
+                        return merger;
+
+                // lines that are in 'connected' mode, also cannot be attached
+                if (spot.getLines().get(0).getOppositeEnd(spot).isFloating())
+                        return merger;
+
+                return forceMerge(merger, mouseX, mouseY);
         }
 
@@ -840 +913 @@
         public int getLineType() {
                 return 1;
+        }
+
+        @Override
+        public boolean isFloating() {
+                return _start.isFloating() && _end.isFloating();
         }
 
@@ -895 +973 @@
                 }
         }
+
+        public void setFilledHighlight(boolean value) {
+                _start.setFilledHighlight(value);
+                _end.setFilledHighlight(value);
+        }
+
+        @Override
+        public void delete() {
+                super.delete();
+
+                _start.removeLine(this);
+                _end.removeLine(this);
+
+                if (_start.getLines().size() == 0)
+                        _start.delete();
+                if (_end.getLines().size() == 0)
+                        _end.delete();
+        }
 }

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

@@ -106 +106 @@
                 if (path == null && source.getLink() != null) {
                         String link = source.getLink();
-                        if (FrameIO.isPositiveInteger(link)){
+                        if (FrameIO.isPositiveInteger(link)) {
                                 link = source.getParent().getFramesetNameAdjusted() + link;
                         }
@@ -113 +113 @@
                         _image = frame.getBuffer();
                         _isFrame = true;
-
                 } else {
 
@@ -427 +426 @@
                 Picture p;
 
-                if (_isFrame){
+                if (_isFrame) {
                         p = ItemUtils.CreateFramePicture((Text) _source.copy(),
                                         _imageObserver);
-                }else
+                } else
                         p = ItemUtils.CreatePicture((Text) _source.copy(), _imageObserver);
 
@@ -547 +546 @@
         }
 
+        public void refresh() {
+                if (_isFrame) {
+                        String link = _source.getLink();
+                        if (FrameIO.isPositiveInteger(link)) {
+                                link = _source.getParent().getFramesetNameAdjusted() + link;
+                        }
+                        Frame frame = FrameIO.LoadFrame(link);
+                        FrameGraphics.UpdateBuffer(frame, false);
+                        _image = frame.getBuffer();
+                }
+        }
+
 }

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

@@ -33 +33 @@
 public class Text extends Item {
 
+        private String[] _processedCode = null;
+
+        public String[] getProcessedCode() {
+                return _processedCode;
+        }
+
+        public void setProcessedCode(String[] tokens) {
+                _processedCode = tokens;
+        }
+
         public static final String FRAME_NAME_SEPARATOR = " on frame ";
 
@@ -231 +241 @@
 
         }
-        
+
         public void removeEndText(String textToRemove) {
                 int length = _text.length();
@@ -253 +263 @@
                 rebuild(false);
         }
-        
+
         public void appendLine(String text) {
                 if (text == null)
                         text = "";
-                
+
                 if (_text.length() > 0)
                         _text.append('\n');
-                        
+
                 _text.append(text);
                 rebuild(false);
@@ -381 +391 @@
 
         public String cutSelectedText() {
+                return replaceSelectedText("");
+        }
+
+        public String replaceSelectedText(String newText) {
                 if (_selectionStart < 0 || _selectionEnd < 0)
                         return null;
@@ -390 +404 @@
 
                 String s = _text.substring(left, right);
-                for (int i = right; i > left; i--) {
-                        _text.delete(i - 1, i);
-                        if (_text.length() > 0) {
-                                AttributedString inserting = new AttributedString(_text
-                                                .toString());
-                                inserting.addAttribute(TextAttribute.FONT, getPaintFont());
-                                _lineBreaker.deleteChar(inserting.getIterator(), i - 1);
-                        }
-
-                        rejustify();
-                }
+
+                _text.delete(left, right);
+                _text.insert(left, newText);
+                rebuild(true);
 
                 return s;
@@ -409 +416 @@
                         return 0;
 
-                //System.out.println(_selectionStart + ":" + _selectionEnd);
+                // System.out.println(_selectionStart + ":" + _selectionEnd);
 
                 return Math.abs(_selectionEnd - _selectionStart);
@@ -451 +458 @@
                         // otherwise, we are inserting text
                 } else {
+                        _processedCode = null;
                         // determine what line is being pointed to
                         line = getLinePosition(mouseY);
@@ -552 +560 @@
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() /* + DisplayIO.getOffset() */+ y
+                return new Point(x, getY() + y
                                 + (int) caret[1]);
         }
@@ -621 +629 @@
 
                 return new Point((int) (getX() + caret[0]) + getJustOffset(current),
-                                getY() /* + DisplayIO.getOffset() */+ y + (int) caret[1]);
+                                getY() + y + (int) caret[1]);
         }
 
@@ -720 +728 @@
                 Font f = getPaintFont();
                 String s = "";
-                
+
                 if (f.isPlain())
                         s += "Plain";
@@ -732 +740 @@
                 return s;
         }
-        
-        public static final String[] FONT_WHEEL = { "sansserif", "monospaced", "serif", "dialog", "dialoginput" };
+
+        public static final String[] FONT_WHEEL = { "sansserif", "monospaced",
+                        "serif", "dialog", "dialoginput" };
+
         public static final char[] FONT_CHARS = { 's', 'm', 't', 'd', 'i' };
-        
+
+        private static final int NEARBY_GRAVITY = 2;
+
         public void toggleFontFamily() {
                 String fontFamily = getFamily().toLowerCase();
-                //set it to the first font by default
+                // set it to the first font by default
                 setFamily(FONT_WHEEL[0]);
-                
+
                 for (int i = 0; i < FONT_WHEEL.length - 3; i++) {
-                        if(fontFamily.equals(FONT_WHEEL[i])){
-                                setFamily(FONT_WHEEL[i+1]);
+                        if (fontFamily.equals(FONT_WHEEL[i])) {
+                                setFamily(FONT_WHEEL[i + 1]);
                                 break;
                         }
                 }
         }
-        
+
         public void toggleFontStyle() {
                 Font currentFont = getPaintFont();
@@ -882 +894 @@
 
         @Override
+        public boolean intersects(Polygon p) {
+                if (super.intersects(p)) {
+                        int textY = getY();
+
+                        for (TextLayout text : _textLayouts) {
+                                // check left and right of each box
+                                Rectangle textOutline = text.getLogicalHighlightShape(0,
+                                                text.getCharacterCount()).getBounds();
+                                textOutline.translate(getX(), textY);
+                                if (p.intersects(textOutline))
+                                        return true;
+                                textY += getLineDrop(text);
+                        }
+                }
+                return false;
+        }
+
+        @Override
         public boolean contains(int mouseX, int mouseY) {
+                return contains(mouseX, mouseY, getGravity() * NEARBY_GRAVITY);
+        }
+
+        public boolean contains(int mouseX, int mouseY, int gravity) {
                 mouseX += getOffset().x;
                 mouseY += getOffset().y;
@@ -888 +922 @@
                 int textY = getY();
                 int textX = getX();
-                int gravity = getGravity() * 2;
 
                 Rectangle outline = getPolygon().getBounds();
@@ -1009 +1042 @@
                 while ((layout = _lineBreaker.nextLayout(width)) != null) {
                         // for some reason lineBreaker will not break on newline
-                        // characters
-                        // so they have to be check manually
+                        // characters so they have to be check manually
                         int start = _lineOffsets.get(_lineOffsets.size() - 1);
 
@@ -1369 +1401 @@
                                 return;
 
-                        //Remove 'a: ' from the begining if it is there
-                        if (_text.length() > 3 && _text.charAt(0) == 'a' && _text.charAt(1) == ':'){
+                        // Remove 'a: ' from the begining if it is there
+                        if (_text.length() > 3 && _text.charAt(0) == 'a'
+                                        && _text.charAt(1) == ':') {
                                 _text.delete(0, 2);
                                 while (_text.charAt(0) == ' ')
@@ -1502 +1535 @@
                 Text template = this.copy();
                 template.setID(-1);
-                //The template must have text otherwise the bounds height will be zero!!
-                //This will stop escape drop down from working if there is no item template
+                // The template must have text otherwise the bounds height will be
+                // zero!!
+                // This will stop escape drop down from working if there is no item
+                // template
                 template.setText("@");
                 return template;
         }
+
+        @Override
+        public boolean isNear(int x, int y) {
+                if (super.isNear(x, y)) {
+                        // TODO check that it is actually near one of the lines of space
+                        // return contains(x, y, getGravity() * 2 + NEAR_DISTANCE);
+                        // at the moment contains ignores gravity when checking the top and
+                        // bottom of text lines... so the cursor must be between two text
+                        // lines
+                        int textY = getY();
+                        int textX = getX();
+
+                        for (TextLayout text : _textLayouts) {
+                                // check left and right of each box
+                                Rectangle textOutline = text.getLogicalHighlightShape(0,
+                                                text.getCharacterCount()).getBounds();
+                                
+                                // check if the cursor is within the top, bottom and within the
+                                // gravity of right
+                                if (y - textY > textOutline.y - NEAR_DISTANCE
+                                                && y - textY < textOutline.y + textOutline.height + NEAR_DISTANCE
+                                                && x - textX < textOutline.width + NEAR_DISTANCE)
+                                        return true;
+                                textY += getLineDrop(text);
+                        }
+                }
+                return false;
+        }
+        
+        @Override
+        public void delete() {
+                setVisible(false);
+        }
 }

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

@@ -1 +1 @@
 package org.expeditee.simple;
 
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileReader;
 import java.io.FileWriter;
 
@@ -8 +10 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.items.Text;
 
 public class Context {
@@ -92 +95 @@
                 // Get the values to be set
                 Frame frame = (Frame) pointers_.getVariable(frameVar).getValue();
+                frame.change();
                 String contents = FrameIO.SaveFrame(frame, false);
 
@@ -104 +108 @@
                                 .getValue();
                 bw.close();
+        }
+
+        public void closeReadFile(String fileVar) throws Exception {
+                BufferedReader br = (BufferedReader) pointers_.getVariable(fileVar)
+                                .getValue();
+                br.close();
         }
 
@@ -128 +138 @@
                 if (successVar != null) {
                         Boolean success = currentFile != null;
+                        primitives_.setValue(successVar, new SBoolean(success));
+                }
+        }
+
+        public void readLineFile(String fileVar, String textVar) throws Exception {
+                readLineFile(fileVar, fileVar, null);
+        }
+
+        public void readLineFile(String fileVar, String textVar, String successVar)
+                        throws Exception {
+
+                BufferedReader br = (BufferedReader) pointers_.getVariable(fileVar)
+                                .getValue();
+
+                String text = br.readLine();
+                boolean success = text != null;
+                primitives_.setValue(textVar, text);
+
+                if (successVar != null) {
+                        primitives_.setValue(successVar, new SBoolean(success));
+                }
+        }
+
+        public void readItemFile(String fileVar, String itemVar) throws Exception {
+                readItemFile(fileVar, fileVar, null);
+        }
+
+        public void readItemFile(String fileVar, String itemVar, String successVar)
+                        throws Exception {
+
+                BufferedReader br = (BufferedReader) pointers_.getVariable(fileVar)
+                                .getValue();
+                boolean success = true;
+                try {
+                        Text item = (Text) pointers_.getVariable(itemVar).getValue();
+                        String nextLine = br.readLine();
+                        String text = nextLine;
+                        success = (text != null);
+                        while ((nextLine = br.readLine()) != null)
+                                text += '\n' + nextLine;
+                        item.setText(text);
+                } catch (Exception e) {
+                        success = false;
+                }
+
+                if (successVar != null) {
+                        primitives_.setValue(successVar, new SBoolean(success));
+                }
+        }
+
+        public void openReadFile(String fileNameVar, String fileVar)
+                        throws Exception {
+                openReadFile(fileNameVar, fileVar, null);
+        }
+
+        public void openReadFile(String fileNameVar, String fileVar,
+                        String successVar) throws Exception {
+                // Get the values to be set
+                File filePath = new File(primitives_.getStringValue(fileNameVar));
+                Boolean success = true;
+                BufferedReader currentFile = null;
+                try {
+                        currentFile = new BufferedReader(new FileReader(filePath));
+                } catch (Exception e) {
+                        success = false;
+                }
+                pointers_.setObject(fileVar, currentFile);
+
+                if (successVar != null) {
                         primitives_.setValue(successVar, new SBoolean(success));
                 }
@@ -144 +223 @@
                 }
         }
+
+        public void createFrameset(String framesetNameVar, String successVar)
+                        throws Exception {
+                // Get the values to be set
+                String framesetName = primitives_.getStringValue(framesetNameVar);
+                Frame firstFrame = FrameIO.CreateNewFrameset(framesetName);
+
+                if (successVar != null) {
+                        Boolean success = firstFrame != null;
+                        primitives_.setValue(successVar, new SBoolean(success));
+                }
+
+        }
 }

trunk/src/org/expeditee/stats/SessionStats.java

@@ -16 +16 @@
 public class SessionStats {
 
-        private static final long MILLISECONDS_PER_MINUTE = 6000;
+        private static final long MILLISECONDS_PER_MINUTE = 60000;
 
         private static Date _FrameAccessTime = new Date();
@@ -23 +23 @@
 
         // statistics counters
-        private static final int MOUSE_BUTTONS = 3;
+        private static final int MOUSE_BUTTONS = 4;
 
         private static StringBuffer _FramesEdited = new StringBuffer();
@@ -59 +59 @@
                 stats.append(Logger.EasyDateFormat("ddMMMyyyy")).append("\n");
                 stats.append("SessionTime: ").append(getTimeElapsed()).append("\n");
-                stats.append("DarkTime: ").append( new SimpleDateFormat("m").format(_DarkTime) ).append("\n");
+                
+                long elapsedTime = (new Date()).getTime()-_StartTime.getTime();
+                stats.append("DarkTime: ").append(_DarkTime.getTime()/MILLISECONDS_PER_MINUTE).append("-->" + 
+                                _DarkTime.getTime() * 100 / elapsedTime + "%\n");
                 
                 stats.append(getFrameStats());
@@ -74 +77 @@
                 SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
                 Date currentTime = new Date();
-                Time elapsedTime = new Time(currentTime.getTime()-_StartTime.getTime());
+                long elapsedTime = currentTime.getTime()-_StartTime.getTime();
                 String time = formatter.format(_StartTime);
                 time += " --> " + formatter.format(currentTime);
-                time += " = " + (new SimpleDateFormat("m").format(elapsedTime));
+                time += " = " + (int)(elapsedTime / MILLISECONDS_PER_MINUTE);   //(new SimpleDateFormat("m").format(elapsedTime));
 
                 return time;
@@ -109 +112 @@
         }
 
-        private static int getMinutesUsed() {
+        private static double getMinutesUsed() {
                 long elapsedTime = new Date().getTime() - _StartTime.getTime() - _DarkTime.getTime();
                 
-                return (int) (elapsedTime / MILLISECONDS_PER_MINUTE);
+                return (double) elapsedTime / MILLISECONDS_PER_MINUTE;
         }
 
@@ -145 +148 @@
                 appendStat(stats, "Frames", _CreatedFrames);
                 appendStat(stats, "Escape", _EscapeCount);
-                appendStat(stats, "Left", _MouseCounters[MouseEvent.BUTTON1 - 1]);
-                appendStat(stats, "Middle", _MouseCounters[MouseEvent.BUTTON2 - 1]);
-                appendStat(stats, "Right", _MouseCounters[MouseEvent.BUTTON3 - 1]);
+                appendStat(stats, "Left", _MouseCounters[MouseEvent.BUTTON1]);
+                appendStat(stats, "Middle", _MouseCounters[MouseEvent.BUTTON2]);
+                appendStat(stats, "Right", _MouseCounters[MouseEvent.BUTTON3]);
 
                 return stats.toString();
@@ -169 +172 @@
                         value = 0;
 
-                int perHour = value * 60 / Math.max(1, getMinutesUsed());
+                int perHour = (int)(value * 60 / getMinutesUsed());
 
                 stats.append(value).append(" ").append(name).append(" @ ").append(perHour).append("/hour");
@@ -262 +265 @@
         public static void MouseClicked(int button) {
                 UserEvent();
-                _MouseCounters[button - 1]++;
+                _MouseCounters[button]++;
         }
 
@@ -277 +280 @@
                 return _FramesEdited.toString();
         }
+
+        public static StringBuffer getShortStats() {
+                StringBuffer sb = new StringBuffer();
+                sb.append("FramesA:").append(_AccessedFrames);
+                sb.append(", FramesE:").append(_SavedFrames);
+                sb.append(", ").append(getResponseStats());
+                return sb;
+        }
 }