Changeset 72

Timestamp:

05/23/08 09:02:59 (16 years ago)

Author:

ra33

Message:

Added lots of stuff

Location:

trunk

Files:

• src/org/expeditee/actions/Actions.java (modified) (11 diffs)
• src/org/expeditee/actions/Debug.java (modified) (2 diffs)
• src/org/expeditee/actions/Misc.java (modified) (9 diffs)
• src/org/expeditee/actions/Simple.java (modified) (2 diffs)
• src/org/expeditee/agents/DefaultAgent.java (modified) (2 diffs)
• src/org/expeditee/gui/AttributeUtils.java (modified) (5 diffs)
• src/org/expeditee/gui/Browser.java (modified) (1 diff)
• src/org/expeditee/gui/DisplayIO.java (modified) (14 diffs)
• src/org/expeditee/gui/Frame.java (modified) (12 diffs)
• src/org/expeditee/gui/FrameGraphics.java (modified) (13 diffs)
• src/org/expeditee/gui/FrameIO.java (modified) (10 diffs)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (24 diffs)
• src/org/expeditee/gui/FrameMouseActions.java (modified) (45 diffs)
• src/org/expeditee/gui/FrameUtils.java (modified) (13 diffs)
• src/org/expeditee/gui/UserSettings.java (modified) (1 diff)
• src/org/expeditee/io/Conversion.java (modified) (13 diffs)
• src/org/expeditee/io/ExpReader.java (modified) (1 diff)
• src/org/expeditee/io/ItemWriter.java (modified) (4 diffs)
• src/org/expeditee/io/KMSReader.java (modified) (6 diffs)
• src/org/expeditee/io/KMSWriter.java (modified) (1 diff)
• src/org/expeditee/items/Dot.java (modified) (6 diffs)
• src/org/expeditee/items/Item.java (modified) (16 diffs)
• src/org/expeditee/items/ItemUtils.java (modified) (10 diffs)
• src/org/expeditee/items/Line.java (modified) (7 diffs)
• src/org/expeditee/items/Picture.java (modified) (1 diff)
• src/org/expeditee/items/Text.java (modified) (11 diffs)
• src/org/expeditee/stats/SessionStats.java (modified) (15 diffs)
• tests/org/expeditee/gui/FrameIOTest.java (modified) (1 diff)
• tests/org/expeditee/io/ConversionTest.java (modified) (6 diffs)

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

@@ -45 +45 @@
 
         public static final String ROOT_PACKAGE = "org.expeditee.";
-        
+
         // Package and class file locations
         private static final String ACTIONS_PACKAGE = ROOT_PACKAGE + "actions.";
 
         private static final String AGENTS_PACKAGE = ROOT_PACKAGE + "agents.";
-        
-        private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE + "actions.NavigationActions";
-        
+
+        private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE
+                        + "actions.NavigationActions";
+
         public static Class[] getClasses(String pckgname)
                         throws ClassNotFoundException {
@@ -232 +233 @@
 
         /**
-         * Performs the given KMS action command. The source Frame and Item are
-         * given because they are required by some actions. Note that the source
-         * frame does not have to be the Item's parent Frame.
+         * Performs the given action command. The source Frame and Item are given
+         * because they are required by some actions. Note that the source frame
+         * does not have to be the Item's parent Frame.
          * 
          * @param source
@@ -246 +247 @@
                 if (!command.equalsIgnoreCase("Restore"))
                         FrameIO.SaveFrame(source, false);
-                
+
                 // separate method name and parameter names
                 String mname = getName(command);
@@ -278 +279 @@
                 // Need to save the frame if we are navigating away from it so we dont
                 // loose changes
-                if (toRun.getDeclaringClass().getName().equals(
-                                 NAVIGATIONS_CLASS)) {
+                if (toRun.getDeclaringClass().getName().equals(NAVIGATIONS_CLASS)) {
                         FrameIO.SaveFrame(DisplayIO.getCurrentFrame());
                 }
@@ -363 +363 @@
                         if (con == null) {
                                 FrameGraphics.DisplayMessage("Invalid parametres for agent.");
-                                //System.out.println("Constructor not found...");
+                                // System.out.println("Constructor not found...");
                                 return;
                         }
@@ -482 +482 @@
                 }
 
-                String param;
+                String param = values;
                 // convert the rest of the objects
                 for (; ind < objects.length; ind++) {
-                        // strip off the next value
-                        param = ParseValue(values);
-                        values = RemainingParams(values);
-
                         // check if its the last param and combine
-                        if (values.length() > 0 && ind == objects.length - 1)
-                                param = param.trim() + ' ' + values.trim();
-
+                        if (values.length() > 0 && ind == objects.length - 1) {
+                                param = values.trim();
+                                // check if its a string
+                                if (param.length() > 0 && param.charAt(0) == '"'){
+                                        int endOfString = param.indexOf('"', 1);
+                                        if (endOfString > 0){
+                                                param = param.substring(0,endOfString);
+                                        }
+                                }
+                        } else {// strip off the next value
+                                param = ParseValue(values);
+                                values = RemainingParams(values);
+                        }
                         // convert the value to an object
                         Object o = Conversion.Convert(paramTypes[ind], param);
@@ -509 +515 @@
          * @return the remaining N - 1 parameters
          */
-        private static String RemainingParams(String params) {
+        public static String RemainingParams(String params) {
                 if (params.length() == 0)
                         return null;
@@ -523 +529 @@
                 // Check if we have a string parameter
                 if (params.charAt(0) == '"') {
-                        return params.substring(params.indexOf('"', 1) + 1);
-                }
-
-                return params.substring(params.indexOf(" "));
+                        int endOfString = params.indexOf('"', 1);
+                        if (endOfString > 0){
+                                if (endOfString > params.length())
+                                        return "";
+                                return params.substring(endOfString + 1).trim();
+                        }
+                }
+
+                return params.substring(params.indexOf(" ")).trim();
         }
 
@@ -537 +548 @@
          * @return The first value in the String
          */
-        private static String ParseValue(String params) {
+        public static String ParseValue(String params) {
                 if (params.length() == 0)
                         return null;
@@ -543 +554 @@
                 // remove leading and trailing spaces
                 String param = params.trim();
+
+                // Check if we have a string parameter
+                if (param.charAt(0) == '"') {
+                        int endOfString = param.indexOf('"', 1);
+                        if (endOfString > 0)
+                                return param.substring(1, endOfString);
+                }
 
                 // if there are no more parameters, we are done
@@ -549 +567 @@
                 }
 
-                // Check if we have a string parameter
-                if (param.charAt(0) == '"') {
-                        return param.substring(1, param.indexOf('"', 1));
-                }
-
                 return param.substring(0, param.indexOf(" "));
         }

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

@@ -5 +5 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.items.Constraint;
-import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
 
@@ -24 +23 @@
 
                 for (Item i : items)
-                        if (i instanceof Dot) {
+                        if (i.isLineEnd()) {
                                 System.out.println(i.getID());
 
-                                for (Constraint c : ((Dot) i).getConstraints())
-                                        if (c.getOppositeEnd((Dot) i) != null)
+                                for (Constraint c : i.getConstraints())
+                                        if (c.getOppositeEnd(i) != null)
                                                 System.out.println("\t"
-                                                                + c.getOppositeEnd((Dot) i).getID());
+                                                                + c.getOppositeEnd(i).getID());
                                         else
                                                 System.out.println("\tNULL");

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

@@ -8 +8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
@@ -18 +19 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameMouseActions;
+import org.expeditee.gui.TimeKeeper;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -28 +30 @@
  */
 public class Misc {
-        private static final int STATS_FONT_SIZE = 18;
-
         private static final int FRAME_FILE_FONT_SIZE = 10;
 
@@ -152 +152 @@
                 getFromChildFrame(current, false);
         }
-        
-        /**
-         * Loads the Frame linked to by the given Item. The first Text Item on the Frame
-         * that is not the title or name is then placed on the cursor. If the given
-         * Item has no link, or no item is found then this is a no-op.
+
+        /**
+         * Loads the Frame linked to by the given Item. The first Text Item on the
+         * Frame that is not the title or name is then placed on the cursor. If the
+         * given Item has no link, or no item is found then this is a no-op.
          * 
          * @param current
@@ -165 +165 @@
                 getFromChildFrame(current, true);
         }
-        
-        private static void getFromChildFrame(Item current, boolean textOnly){
+
+        private static void getFromChildFrame(Item current, boolean textOnly) {
                 Item item = getFirstBodyItemOnChildFrame(current, textOnly);
                 // if no item was found
@@ -226 +226 @@
 
         public static void CreateTextItem(String itemText) {
-                Text text = DisplayIO.getCurrentFrame().createNewText();
-                // We dont want the stats to wrap at all
-                text.setMaxSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
-
-                text.setText(itemText);
-
-                text.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
-                text.setSize(STATS_FONT_SIZE);
-
+                SessionStats.CreatedText();
+                Frame current = DisplayIO.getCurrentFrame();
+                Text text = current.getStatsTextItem(itemText);
                 FrameMouseActions.pickup(text);
-
                 FrameGraphics.Repaint();
         }
@@ -419 +412 @@
 
         /**
+         * Runs two methods alternatively a specified number of times and reports on
+         * the time spent running each method.
+         * 
+         * @param fullMethodNameA
+         * @param fullMethodNameB
+         * @param repsPerTest
+         *            the number of time each method is run per test
+         * @param tests
+         *            the number of tests to conduct
+         * 
+         */
+        public static void CompareMethods(String fullMethodNameA,
+                        String fullMethodNameB, int repsPerTest, int tests) {
+                try {
+                        String classNameA = getClassName(fullMethodNameA);
+                        String classNameB = getClassName(fullMethodNameB);
+                        String methodNameA = getMethodName(fullMethodNameA);
+                        String methodNameB = getMethodName(fullMethodNameB);
+
+                        Class classA = Class.forName(classNameA);
+                        Class classB = Class.forName(classNameB);
+                        Method methodA = classA.getDeclaredMethod(methodNameA,
+                                        new Class[] {});
+                        Method methodB = classB.getDeclaredMethod(methodNameB,
+                                        new Class[] {});
+                        TimeKeeper timeKeeper = new TimeKeeper();
+                        long timeA = 0;
+                        long timeB = 0;
+                        // Run the tests
+                        for (int i = 0; i < tests; i++) {
+                                // Test methodA
+                                timeKeeper.restart();
+                                for (int j = 0; j < repsPerTest; j++) {
+                                        methodA.invoke((Object) null, new Object[]{});
+                                }
+                                timeA += timeKeeper.getElapsedMillis();
+                                timeKeeper.restart();
+                                // Test methodB
+                                for (int j = 0; j < repsPerTest; j++) {
+                                        methodB.invoke((Object) null, new Object[]{});
+                                }
+                                timeB += timeKeeper.getElapsedMillis();
+                        }
+
+                        float aveTimeA = timeA * 1000F / repsPerTest / tests;
+                        float aveTimeB = timeB * 1000F / repsPerTest / tests;
+                        // Display Results
+                        FrameGraphics.DisplayMessage("Average Execution Time");
+                        FrameGraphics.DisplayMessage(methodNameA + ": "
+                                        + TimeKeeper.Formatter.format(aveTimeA) + "us");
+                        FrameGraphics.DisplayMessage(methodNameB + ": "
+                                        + TimeKeeper.Formatter.format(aveTimeB) + "us");
+                } catch (Exception e) {
+                        FrameGraphics.ErrorMessage(e.getClass().getSimpleName() + ": "
+                                        + e.getMessage());
+                }
+        }
+
+        public static String getClassName(String fullMethodName) {
+                assert (fullMethodName != null);
+                assert (fullMethodName.length() > 0);
+                int lastPeriod = fullMethodName.lastIndexOf('.');
+                if (lastPeriod > 0 && lastPeriod < fullMethodName.length() - 1)
+                        return fullMethodName.substring(0, lastPeriod);
+                throw new RuntimeException("Invalid method name: " + fullMethodName);
+        }
+
+        public static String getMethodName(String methodName) {
+                assert (methodName != null);
+                assert (methodName.length() > 0);
+                int lastPeriod = methodName.lastIndexOf('.');
+                if (lastPeriod > 0 && lastPeriod < methodName.length() - 1)
+                        return methodName.substring(1 + lastPeriod);
+                throw new RuntimeException("Invalid method name: " + methodName);
+        }
+
+        /**
          * Loads the Frame linked to by the given Item. The first Item on the Frame
          * that is not the title or name is then placed on the current frame. The
@@ -458 +528 @@
         }
 
-        private static Item getFirstBodyItemOnChildFrame(Item current, boolean textOnly) {
+        private static Item getFirstBodyItemOnChildFrame(Item current,
+                        boolean textOnly) {
                 // the item must link to a frame
                 if (current.getLink() == null) {
@@ -476 +547 @@
                 // find the first non-title and non-name item
                 List<Item> body = new ArrayList<Item>();
-                if(textOnly)
+                if (textOnly)
                         body.addAll(child.getBodyTextItems(false));
                 else

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

@@ -1402 +1402 @@
                         assertVariableType(tokens[1], 1, SPointer.itemPrefix);
                         assertVariableType(tokens[2], 2, SPointer.itemPrefix);
-                        Dot dot1 = null;
-                        Dot dot2 = null;
+                        Item dot1 = null;
+                        Item dot2 = null;
                         try {
-                                dot1 = (Dot) context.getPointers().getVariable(tokens[1])
+                                dot1 = (Item) context.getPointers().getVariable(tokens[1])
                                                 .getValue();
                         } catch (Exception e) {
@@ -1411 +1411 @@
                         }
                         try {
-                                dot2 = (Dot) context.getPointers().getVariable(tokens[2])
+                                dot2 = (Item) context.getPointers().getVariable(tokens[2])
                                                 .getValue();
                         } catch (Exception e) {

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

@@ -42 +42 @@
                 super();
                 try {
-                        _delay = (int)(Double.parseDouble(delay) * 1000);
+                        _delay = (int) (Double.parseDouble(delay) * 1000);
                 } catch (Exception e) {
                 }
@@ -65 +65 @@
                                 / (_timer.getElapsedMillis() / 1000.0));
                 String stats = (_itemCount > 0 ? ("Items: " + _itemCount + ", ") : "")
-                                + "Frames: " + _frameCount + ", Time: "
-                                + _timer.getElapsedStringSeconds()
+                                + (_frameCount > 1 ? ("Frames: " + _frameCount + ", ") : "")
+                                + "Time: " + _timer.getElapsedStringSeconds()
                                 + (framesPerSecond > 1 ? (", FPS: " + framesPerSecond) : "");
                 String msg = this.getClass().getSimpleName() + " stats- ";

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

@@ -75 +75 @@
                         _AllowNull = new LinkedList<Method>();
                         _AllowNull.add(Item.class.getMethod("getColor", param));
-                        _AllowNull.add(Item.class.getMethod("getBackgroundColor", param));
-
-                        _AllowNull.add(Frame.class.getMethod("getBackgroundColor", param));
+                        //_AllowNull.add(Item.class.getMethod("getBackgroundColor", param));
+
+                        //_AllowNull.add(Frame.class.getMethod("getBackgroundColor", param));
                         _AllowNull.add(Frame.class.getMethod("getForegroundColor", param));
 
@@ -175 +175 @@
                         _SetMethods.put("linkmark", Item.class.getMethod("setLinkMark",
                                         pBool));
+                        _SetMethods.put("lm", Item.class.getMethod("setLinkMark",
+                                        pBool));
                         _SetMethods.put("actionmark", Item.class.getMethod("setActionMark",
+                                        pBool));
+                        _SetMethods.put("am", Item.class.getMethod("setActionMark",
                                         pBool));
 
@@ -197 +201 @@
                         _SetMethods.put("lp", Item.class.getMethod("setLinePattern",
                                         pIntArray));
+                        
                         _SetMethods.put("linkframeset", Item.class.getMethod(
                                         "setLinkFrameset", pString));
+                        _SetMethods.put("lf", Item.class.getMethod(
+                                        "setLinkFrameset", pString));
                         _SetMethods.put("linktemplate", Item.class.getMethod(
+                                        "setLinkTemplate", pString));
+                        _SetMethods.put("lt", Item.class.getMethod(
                                         "setLinkTemplate", pString));
 
@@ -222 +231 @@
                         _SetMethods.put("bgc0", Frame.class.getMethod("setBackgroundColor",
                                         pColor));
-
-                        /*
-                         * _Abbreviations = new HashMap<String, String>();
-                         * _Abbreviations.put("a", "Action"); _Abbreviations.put("l",
-                         * "Link"); _Abbreviations.put("c", "Color");
-                         * _Abbreviations.put("bgc", "BackgroundColor");
-                         * _Abbreviations.put("fgc", "ForegroundColor");
-                         * _Abbreviations.put("fc", "FillColor"); _Abbreviations.put("s",
-                         * "Size");
-                         */
+                        _SetMethods.put("protection", Frame.class.getMethod("setProtection",
+                                        pString));
 
                 } catch (SecurityException e) {
@@ -413 +414 @@
 
                 // create the text Item
-                Text attribs = DisplayIO.getCurrentFrame().createNewText();
-                attribs.setText(attributes.toString());
-                attribs.setColor(null);
+                Frame current = DisplayIO.getCurrentFrame();
+                Text attribs = current.getStatsTextItem(attributes.toString());
                 return attribs;
         }

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

@@ -47 +47 @@
          */
         public static void main(String[] args) {
+                FrameGraphics.SupressMessages(true);
                 _theBrowser = new Browser();
+                FrameGraphics.SupressMessages(false);
                 // Why do we want to ignore repaint?
                 //_theBrowser.setIgnoreRepaint(true);

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

@@ -15 +15 @@
 import javax.swing.JOptionPane;
 
-import org.expeditee.actions.NavigationActions;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemParentStateChangedEvent;
@@ -60 +59 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp21May2008A";
+        public static final String TITLE = "Exp22May2008A";
 
         private DisplayIO() {
@@ -170 +169 @@
                 setCursorPosition(x, y, true);
         }
-
+        
         public static void setCursorPosition(int x, int y, boolean forceArrow) {
                 int deltax = x - FrameMouseActions.MouseX;
@@ -180 +179 @@
                 }
 
-                // ensures the cursor doesn't fall behind while waiting for robot
-                FrameMouseActions.MouseX = x;
-                FrameMouseActions.MouseY = y;
-
+                //When the Robot moves the cursor... a short time later a mouseMoved event is generated...
+                //We want to ignore this event by remembering the location the robot was shifted to.
+                FrameMouseActions.setLastRobotMove(x, y);
+                
                 if (Frame.itemAttachedToCursor()) {
                         List<Item> toMove = Frame.FreeItems;
@@ -193 +192 @@
                 // cheat
                 FrameMouseActions.setForceArrow(forceArrow);
-                _Robot.mouseMove((int) _Browser.getContentPane().getLocationOnScreen()
+                int mouseX = (int) _Browser.getContentPane().getLocationOnScreen()
                                 .getX()
-                                + x, (int) _Browser.getContentPane().getLocationOnScreen()
+                                + x;
+                int mouseY = (int) _Browser.getContentPane().getLocationOnScreen()
                                 .getY()
-                                + y);
+                                + y;
+                _Robot.mouseMove(mouseX, mouseY);
+                //System.out.println("MouseMoved: " + x + "," + y);
         }
 
@@ -327 +329 @@
                                 for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
                                         i.onParentStateChanged(new ItemParentStateChangedEvent(
-                                                        _CurrentFrames[getCurrentSide()], 
+                                                        _CurrentFrames[getCurrentSide()],
                                                         ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN));
                                 }
@@ -336 +338 @@
                         for (Item i : _CurrentFrames[getCurrentSide()].getItems()) {
                                 i.onParentStateChanged(new ItemParentStateChangedEvent(
-                                                _CurrentFrames[getCurrentSide()], 
+                                                _CurrentFrames[getCurrentSide()],
                                                 ItemParentStateChangedEvent.EVENT_TYPE_SHOWN));
                         }
@@ -378 +380 @@
                                 List<Frame> seen = new LinkedList<Frame>();
                                 seen.addAll(sharedOverlays); // Signify that seen all shared
-                                                                                                // overlays
+                                // overlays
                                 seen.remove(_CurrentFrames[getCurrentSide()]); // must ensure
-                                                                                                                                // excluded
+                                // excluded
 
                                 // Get all items seen from the current frame - including all
@@ -390 +392 @@
                                 for (Item i : items) {
                                         i.onParentStateChanged(new ItemParentStateChangedEvent(
-                                                        _CurrentFrames[getCurrentSide()], 
+                                                        _CurrentFrames[getCurrentSide()],
                                                         ItemParentStateChangedEvent.EVENT_TYPE_HIDDEN));
                                 }
@@ -420 +422 @@
                                 // else ...
                                 assert (owner != null);
-                                i.onParentStateChanged(new ItemParentStateChangedEvent(
-                                                _CurrentFrames[getCurrentSide()], 
-                                                ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY,
-                                                owner.Level));
+                                i
+                                                .onParentStateChanged(new ItemParentStateChangedEvent(
+                                                                _CurrentFrames[getCurrentSide()],
+                                                                ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY,
+                                                                owner.Level));
                         }
 
@@ -429 +432 @@
                         for (Item i : nonOverlayItems) {
                                 i.onParentStateChanged(new ItemParentStateChangedEvent(
-                                                _CurrentFrames[getCurrentSide()], 
+                                                _CurrentFrames[getCurrentSide()],
                                                 ItemParentStateChangedEvent.EVENT_TYPE_SHOWN));
                         }
@@ -438 +441 @@
 
         public static void UpdateTitle() {
-                StringBuffer title = new StringBuffer(TITLE + " [");
+                StringBuffer title = new StringBuffer(TITLE);
 
                 if (FrameGraphics.isAudienceMode())
                         title.append(" - Audience Mode");
                 else
-                        title.append(SessionStats.getShortStats()).append(']');
+                        title.append(" [").append(SessionStats.getShortStats()).append(']');
 
                 _Browser.setTitle(title.toString());
@@ -537 +540 @@
         }
 
-        public static void Back() {     
+        public static void Back() {
                 int side = getCurrentSide();
 
@@ -557 +560 @@
                         FrameIO.SuspendCache();
                 Frame frame = null;
-                do{
+                do {
                         frame = FrameIO.LoadFrame(_VisitedFrames[side].pop());
-                }while(frame == getCurrentFrame());
+                } while (frame == getCurrentFrame());
+
                 if (isTwinFramesOn())
                         FrameIO.ResumeCache();

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

@@ -24 +24 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.WidgetCorner;
+import org.expeditee.stats.SessionStats;
 
 /**
@@ -49 +50 @@
         private int _version = 0;
 
-        private String _protection = null;
+        private String _protection = "" + Item.PERMISSION_FULL;
 
         private String _owner = null;
@@ -70 +71 @@
 
         // The items contained in this Frame
-
         // records whether a change has been made to this Frame (for saving
         // purposes).
@@ -354 +354 @@
         }
 
+        public Text getStatTemplate() {
+                SessionStats.CreatedText();
+                Text t = getTemplate(UserSettings.StatTemplate,
+                                ItemUtils.TAG_STAT_TEMPLATE);
+
+                if (t == null) {
+                        t = getItemTemplate();
+                }
+
+                return t;
+        }
+
+        public Text getStatsTextItem(String itemText) {
+                Text t = getStatTemplate();
+                // We dont want the stats to wrap at all
+                t.setMaxSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
+                t.setText(itemText);
+                t.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                addItem(t);
+                return t;
+        }
+
         public Text getCodeCommentTemplate() {
                 Text t = getTemplate(UserSettings.CodeCommentTemplate,
@@ -378 +400 @@
 
                 for (Item i : _body)
-                        if (i.isVisible() /* && i != _frameName */&& i.intersects(poly)) {
+                        if (i.isVisible() && i.intersects(poly)) {
                                 if (!results.contains(i))
                                         results.add(i);
@@ -404 +426 @@
                 String frameset = Conversion.getFrameset(framename, false);
 
-                setFrameset(frameset);
-                setFrameNumber(num);
+                setFrameName(frameset, num);
         }
 
@@ -464 +485 @@
         public void setProtection(String protection) {
                 _protection = protection;
+                
+                if (_body.size() > 0)
+                        refreshItemPermissions();
         }
 
@@ -1125 +1149 @@
          */
         public Text createBlankText(String templateType) {
+                SessionStats.CreatedText();
                 Text t;
                 if (templateType.length() == 0)
@@ -1140 +1165 @@
         }
 
-        public Dot createDot() {
-                Dot dot = new Dot(DisplayIO.getRealMouseX(), DisplayIO.getMouseY(),
+        public Item createDot() {
+                Item dot = new Dot(DisplayIO.getRealMouseX(), DisplayIO.getMouseY(),
                                 getNextItemID());
 
@@ -1167 +1192 @@
                         }
                 }
+
+                if (t == null)
+                        return null;
 
                 // If the item is linked apply any attribute pairs on the child frame
@@ -1216 +1244 @@
         }
 
-        public Dot addDot(int x, int y) {
-                Dot d = new Dot(x, y, getNextItemID());
+        public Item addDot(int x, int y) {
+                Item d = new Dot(x, y, getNextItemID());
                 addItem(d);
                 return d;
@@ -1357 +1385 @@
                                 Frame.COLOR_WHEEL));
         }
+
+        public void setFrameName(String frameset, int i) {
+                setFrameset(frameset);
+                setFrameNumber(i);
+        }
+
+        /**
+         * Sets the item permissions to match the protection for the frame.
+         * 
+         */
+        public void refreshItemPermissions() {
+                int permission = Item.PERMISSION_FULL;
+                try{
+                        permission = Integer.parseInt(_protection);
+                }catch(Exception e){
+                }
+                
+                _frameName.Permission = permission;
+                if(permission < Item.PERMISSION_COPY){
+                        _frameName.setBackgroundColor(new Color(255, 220, 220));
+                }else if (permission == Item.PERMISSION_COPY){
+                        _frameName.setBackgroundColor(new Color(255, 230, 135));
+                }else if (permission == Item.PERMISSION_TDFC){
+                        _frameName.setBackgroundColor(new Color(220, 255, 220));
+                }else {
+                        _frameName.setBackgroundColor(null);
+                }
+                
+                
+                for(Item i: _body) {
+                        i.Permission = permission;
+                }
+        }
 }

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

@@ -12 +12 @@
 import java.awt.RenderingHints;
 import java.awt.image.VolatileImage;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -19 +20 @@
 
 import org.expeditee.actions.Misc;
-import org.expeditee.items.Dot;
 import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
@@ -64 +65 @@
 
         // if true, error messages are not shown to the user
-        private static boolean _SupressErrors = false;
+        private static boolean _SupressMessages = false;
 
         public static String MESSAGES_FRAMESET_NAME = "Messages";
@@ -79 +80 @@
          */
         public static void ToggleAudienceMode() {
+                Frame current = DisplayIO.getCurrentFrame();
                 if (_Mode == MODE_AUDIENCE)
                         _Mode = MODE_NORMAL;
-                else
+                else {
                         _Mode = MODE_AUDIENCE;
-
-                FrameUtils.Parse(DisplayIO.getCurrentFrame());
+                        ItemUtils.UpdateConnectedToAnnotations(current.getItems());
+                }
+                FrameUtils.Parse(current);
                 DisplayIO.UpdateTitle();
                 Repaint();
@@ -178 +181 @@
                 if (g != null
                                 && (!isAudienceMode()
-                                                || (isAudienceMode() && !i.isAnnotation()) || i == FrameUtils.LastEdited)) {
+                                                || (isAudienceMode() && !i.isConnectedToAnnotation() && !i
+                                                                .isAnnotation()) || i == FrameUtils.LastEdited)) {
 
                         Graphics2D tg = (Graphics2D) g.create();
@@ -503 +507 @@
                         if (i instanceof Picture)
                                 PaintItem(g, i);
-                        else if (i instanceof Dot)
-                                ((Dot) i).paintFill(g);
+                        else if (i.isLineEnd() && (!isAudienceMode() ||
+                                        !i.isConnectedToAnnotation()))
+                                i.paintFill(g);
                 }
         }
@@ -538 +543 @@
                                 toDisconnect.setSelectedMode(newMode);
                         } else {
-                                List<Item> connected = i.getAllConnected();
+                                Collection<Item> connected = i.getAllConnected();
                                 for (Item conn : connected) {
                                         conn.setSelectedMode(Item.SelectedMode.Connected);
@@ -585 +590 @@
         public static void DisplayMessage(String message, Color textColor) {
                 displayMessage(message, null, null, textColor);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
         public static void DisplayMessage(Text message) {
-                displayMessage(message.getFirstLine(), message.getLink(), message.getAction(), message.getColor());
+                displayMessage(message.getFirstLine(), message.getLink(), message
+                                .getAction(), message.getColor());
                 // Misc.Beep();
         }
@@ -596 +602 @@
                 // _lastMessage = null;
                 displayMessage(message, null, null, Color.BLACK);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
         public static void WarningMessage(String message) {
                 displayMessage(message, null, null, Color.MAGENTA);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
@@ -608 +614 @@
         private static void displayMessage(String message, String link,
                         List<String> actions, Color color) {
-                // add timestamp to message
-                // if (message.equals(_lastMessage))
-                // return;
-                // _lastMessage = message;
-
-                // message += _formatter.format(Calendar.getInstance().getTime());
-
-                // if the creator needs to be initialised (happens on first message)
+                if (_SupressMessages)
+                        return;
+
                 if (_creator == null) {
                         _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, true);
@@ -682 +683 @@
          */
         public static void LinkedErrorMessage(String message) {
-                if (_SupressErrors)
+                if (_SupressMessages)
                         return;
                 Misc.Beep();
@@ -693 +694 @@
 
         public static void ErrorMessage(String message) {
-                if (_SupressErrors)
+                if (_SupressMessages)
                         return;
                 Misc.Beep();
@@ -745 +746 @@
         }
 
-        public static void SupressErrors(boolean val) {
-                _SupressErrors = val;
+        public static void SupressMessages(boolean val) {
+                _SupressMessages = val;
         }
 

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

@@ -113 +113 @@
                 // do not display errors encountered to the user
                 // (they will be shown at load time)
-                FrameGraphics.SupressErrors(true);
+                FrameGraphics.SupressMessages(true);
                 // loading automatically caches the frame is caching is turned on
                 LoadUnknownPath(framename);
-                FrameGraphics.SupressErrors(false);
+                FrameGraphics.SupressMessages(false);
         }
 
@@ -422 +422 @@
                 if (toDelete == null)
                         return false;
+
+                // Dont delete the zero frame
+                if (toDelete.getFrameNumber() == 0) {
+                        FrameGraphics.ErrorMessage("Zero frame's can not be deleted");
+                        return false;
+                }
 
                 SaveFrame(toDelete);
@@ -474 +480 @@
          */
         public static Frame CreateFrame(String frameset, String frameTitle,
-                        String templateFrame) {
-
+                        String templateFrame) throws RuntimeException {
+
+                if (!FrameIO.isValidFramesetName(frameset)) {
+                        throw new RuntimeException(frameset + " is not a valid frameset name");
+                }
+                
                 int next = -1;
 
                 // disable caching of 0 frames
                 SuspendCache();
+                String zeroFrameName = frameset + "0";
+                Frame destFramesetZero = LoadFrame(zeroFrameName);
+                if (destFramesetZero == null) {
+                        throw new RuntimeException(zeroFrameName + " could not be found");
+                }
 
                 Frame template = null;
-                if (templateFrame == null)
+                if (templateFrame == null) {
                         // load in frame.0
-                        template = LoadFrame(frameset + "0");
-                else
+                        template = destFramesetZero;
+                } else {
                         template = LoadFrame(templateFrame);
+                        if (template == null) {
+                                throw new RuntimeException("LinkTemplate " + templateFrame
+                                                + " could not be found");
+                        }
+                }
 
                 ResumeCache();
@@ -492 +512 @@
                 // read the next number from the INF file
                 try {
-                        next = ReadINF(template.path, frameset);
+                        next = ReadINF(destFramesetZero.path, frameset);
                 } catch (IOException ioe) {
                         ioe.printStackTrace();
-                        Logger.Log(ioe);
-                        return null;
+                        throw new RuntimeException("INF file could not be read");
                 }
 
                 // set the number and title of the new frame
-                template.setFrameNumber(++next);
+                template.setFrameName(frameset, ++ next);
                 template.setTitle(frameTitle);
 
@@ -634 +653 @@
 
                 if (!toSave.hasChanged() || toSave.isSaved())
+                        return "";
+                
+                //Dont save if the frame is protected
+                if (toSave.getFrameNameItem().Permission < Item.PERMISSION_TDFC)
                         return "";
 
@@ -702 +725 @@
                                 // backup tag will be ignored
                                 original.setFrameNumber(nextnum);
+                                original.setProtection("" + Item.PERMISSION_COPY);
                                 original.change();
                                 SaveFrame(original, false, false);
@@ -845 +869 @@
                 }
 
-                assert (IsValidFramesetName(result.toString()));
+                assert (isValidFramesetName(result.toString()));
                 return result.toString();
         }
 
-        public static Frame CreateNewFrame(Item linker) {
+        public static Frame CreateNewFrame(Item linker) throws RuntimeException {
                 String title = null;
                 if (linker instanceof Text)
                         title = ((Text) linker).getFirstLine();
 
-                String frameset = DisplayIO.getCurrentFrame().getFramesetName();
-
                 String templateLink = linker.getLinkTemplate();
+                String framesetLink = linker.getLinkFrameset();
+                String frameset = (framesetLink != null ? framesetLink : DisplayIO
+                                .getCurrentFrame().getFramesetName());
 
                 Frame newFrame = FrameIO.CreateFrame(frameset, title, templateLink);
@@ -942 +967 @@
                 String conversion = frameset + " --> ";
 
-                if (!IsValidFramesetName(frameset)) {
+                if (!isValidFramesetName(frameset)) {
                         throw new Exception("Invalid frameset name");
                 }
@@ -1016 +1041 @@
          * @return true if the frameset name is valid
          */
-        public static boolean IsValidFramesetName(String frameset) {
+        public static boolean isValidFramesetName(String frameset) {
                 if (frameset == null) {
                         return false;
@@ -1123 +1148 @@
         }
 
+        public static boolean isValidLink(String frameName) {
+                return frameName == null || isPositiveInteger(frameName) || isValidFrameName(frameName);
+        }
+
 }

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

@@ -9 +9 @@
 import java.awt.event.KeyListener;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -55 +56 @@
         public static final int FORCE_REPAINT = 12;
 
-        public static final int MINIMUM_SIZE = 10;
-
         public synchronized void keyTyped(KeyEvent e) {
                 if (Simple.isProgramRunning()) {
@@ -71 +70 @@
                         return;
 
+                if (FrameMouseActions.isWaitingForRobot()) {
+//                      try{
+//                      Thread.sleep(10000);
+//                      }catch(Exception ex){
+//                              
+//                      }
+//                      keyTyped(e);
+//                      System.out.println("Waiting: " + e.getKeyChar());
+                        return;
+                }
                 e.consume();
                 char ch = e.getKeyChar();
-
+                //System.out.println(ch);
+                
                 if (e.isAltDown()) {
                         if (FrameUtils.getCurrentItem() == null
@@ -125 +135 @@
                                 return;
                         }
-                        replaceDot((Dot) on, ch);
-                        ItemUtils.EnclosedCheck(DisplayIO.getCurrentFrame().getItems());
+                        replaceDot((Item) on, ch);
                         return;
                 }
@@ -151 +160 @@
                 // if the user is in free space, create a new text item
                 if (on == null || !on.isHighlighted()) {
-                        SessionStats.CreatedText();
                         // DisplayIO.UpdateTitle();
                         text = createText(ch);
@@ -188 +196 @@
         }
 
-        public static Text replaceDot(Dot dot, char ch) {
-                SessionStats.CreatedText();
+        public static Text replaceDot(Item dot, char ch) {
                 Text text = createText(ch);
-                text.setPosition(dot.getPosition());
-                text.setThickness(dot.getThickness());
+                Item.DuplicateItem(dot, text);
                 FrameUtils.LastEdited = text;
 
-                //Copy the lines list so it can be modified
+                // Copy the lines list so it can be modified
                 List<Line> lines = new LinkedList<Line>(dot.getLines());
                 for (Line line : lines)
                         line.replaceEnd(dot, text);
-                
-                DisplayIO.getCurrentFrame().removeItem(dot);
-                DisplayIO.getCurrentFrame().addItem(text);
+                Frame current = DisplayIO.getCurrentFrame();
+                current.removeItem(dot);
+                current.addItem(text);
+                ItemUtils.EnclosedCheck(current.getItems());
                 return text;
         }
 
-        // replaces the given text item with a dot
-        private static void replaceText(Text text) {
-                Dot dot = new Dot(text.getX(), text.getY(), text.getID());
+        /**
+         * Replaces the given text item with a dot
+         */
+        public static Item replaceText(Text text) {
+                Item dot = new Dot(text.getX(), text.getY(), text.getID());
                 Item.DuplicateItem(text, dot);
 
@@ -214 +223 @@
                 if (lines.size() > 0)
                         dot.setColor(lines.get(0).getColor());
-                for (Line line : lines){
+                for (Line line : lines) {
                         line.replaceEnd(text, dot);
                 }
                 text.delete();
-                DisplayIO.getCurrentFrame().addItem(dot);
+                Frame current = DisplayIO.getCurrentFrame();
+                current.addItem(dot);
                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
+                ItemUtils.EnclosedCheck(current.getItems());
+                return dot;
         }
 
@@ -345 +357 @@
                 case KeyEvent.VK_UP:
                         if (e.isControlDown() || e.isShiftDown()) {
-                                DisplayIO.getCurrentFrame();
+                                NextTextItem(FrameUtils.getCurrentItem(), false);
                         } else {
                                 move(Text.UP);
@@ -351 +363 @@
                         break;
                 case KeyEvent.VK_DOWN:
-                        move(Text.DOWN);
+                        if (e.isControlDown() || e.isShiftDown()) {
+                                NextTextItem(FrameUtils.getCurrentItem(), true);
+                        } else {
+                                move(Text.DOWN);
+                        }
                         break;
                 case KeyEvent.VK_END:
@@ -365 +381 @@
                         break;
                 }
+        }
+
+        /**
+         * Moves the cursor to the next text item on the frame
+         * 
+         * @param currentItem
+         * @param direction
+         *            move up if direction is negative, down if direction is
+         *            positive
+         */
+        public static void NextTextItem(Item currentItem, boolean down) {
+                // Move the cursor to the next text item
+                Frame current = DisplayIO.getCurrentFrame();
+                Text title = current.getTitle();
+                List<Text> textItems = current.getBodyTextItems(false);
+                if (textItems.size() == 0) {
+                        DisplayIO.setCursorPosition(title.getPosition());
+                        FrameGraphics.Repaint();
+                        return;
+                }
+
+                if (currentItem == null) {
+                        // find the nearest item in the correct direction
+                        int currY = DisplayIO.getMouseY();
+                        for (int i = 0; i < textItems.size(); i++) {
+                                Text t = textItems.get(i);
+                                if (currY < t.getY()) {
+                                        if (down) {
+                                                DisplayIO.setCursorPosition(t.getPosition());
+                                        } else {
+                                                if (i == 0)
+                                                        break;
+                                                DisplayIO.setCursorPosition(textItems.get(i - 1)
+                                                                .getPosition());
+                                        }
+                                        FrameGraphics.Repaint();
+                                        return;
+                                }
+                        }
+                        DisplayIO.setCursorPosition(title.getPosition());
+                        return;
+                }
+
+                if (current.getTitle().equals(currentItem)) {
+                        if (down) {
+                                // Show the first item
+                                DisplayIO.setCursorPosition(textItems.get(0).getPosition());
+                        } else {
+                                // Show the last item
+                                DisplayIO.setCursorPosition(textItems.get(textItems.size() - 1)
+                                                .getPosition());
+                        }
+                        FrameGraphics.Repaint();
+                        return;
+                }
+                // Find the current item... then move to the next item
+                for (int i = 0; i < textItems.size(); i++) {
+                        if (textItems.get(i).equals(currentItem)) {
+                                int nextIndex = i + (down ? 1 : -1);
+                                if (nextIndex >= 0 && nextIndex < textItems.size()) {
+                                        DisplayIO.setCursorPosition(textItems.get(nextIndex)
+                                                        .getPosition());
+                                } else {
+                                        DisplayIO.setCursorPosition(title.getPosition());
+                                }
+                                FrameGraphics.Repaint();
+                                return;
+                        }
+                }
+
         }
 
@@ -399 +485 @@
          */
         private static void controlChar(KeyEvent e, String ch) {
+                if (ch.length() > 1)
+                        return;
+
                 // if this is a paste command
                 if (ch.charAt(0) == KeyEvent.VK_V) {
@@ -422 +511 @@
                                         List<Item> clipboard = new ArrayList<Item>();
                                         clipboard.add(text);
-                                        List<Item> left = FrameMouseActions.merge(clipboard,
+                                        Collection<Item> left = FrameMouseActions.merge(clipboard,
                                                         clicked);
                                         FrameMouseActions.anchor(left);
@@ -577 +666 @@
 
                 // check for enclosed mode
-                if (on == null || on == null) {
-                        List<Item> enclosed = FrameUtils.getCurrentItems();
+                if (on == null) {
+                        Collection<Item> enclosed = FrameUtils.getCurrentItems();
 
                         if (enclosed != null && enclosed.size() > 0) {
                                 // ensure only one dot\line is present in the list
-                                List<Item> dots = FrameUtils.getEnclosingDots();
-                                List<Item> connected = dots.get(0).getAllConnected();
+                                Collection<Item> dots = FrameUtils.getEnclosingDots();
+                                Item firstConnected = dots.iterator().next();
+                                Collection<Item> connected = firstConnected.getAllConnected();
 
                                 // only resize lines if they are not surrounding some non line
@@ -590 +680 @@
                                 for (Item ip : enclosed) {
                                         if (ip != null) {
-                                                if (!(ip instanceof Line) && !(ip instanceof Dot)) {
+                                                if (!(ip instanceof Line) && !(ip.isLineEnd())) {
                                                         resizeLines = false;
                                                         break;
@@ -597 +687 @@
                                 }
 
-                                for (Item ip : enclosed) {
-                                        if (ip != null && !(connected.indexOf(ip) > 0))
-                                                switch (key) {
-                                                case SIZE_UP:
-                                                        if (resizeLines
-                                                                        || (!(ip instanceof Line) && !(ip instanceof Dot)))
-                                                                SetSize(ip, repeat, false);
-                                                        break;
-                                                case SIZE_DOWN:
-                                                        if (resizeLines
-                                                                        || (!(ip instanceof Line) && !(ip instanceof Dot)))
-                                                                SetSize(ip, -repeat, false);
-                                                        break;
-                                                // case COLOR_CHANGE: SetFillColor(ip); break;
-                                                case ANNOTATION_CHANGE:
-                                                        ToggleAnnotation(ip);
-                                                        break;
-                                                case FONT_STYLE_CHANGE:
-                                                        ToggleFontStyle(ip);
-                                                        break;
-                                                case FONT_FAMILY_CHANGE:
-                                                        ToggleFontFamily(ip);
-                                                        break;
-                                                case DATE_ITEM:
-                                                        AddDate(ip);
-                                                        break;
-                                                }
+                                switch (key) {
+                                case SIZE_UP:
+                                        if (resizeLines
+                                                        || (!(firstConnected instanceof Line) && !(firstConnected instanceof Dot)))
+                                                SetSize(firstConnected, repeat, false);
+                                        break;
+                                case SIZE_DOWN:
+                                        if (resizeLines
+                                                        || (!(firstConnected instanceof Line) && !(firstConnected instanceof Dot)))
+                                                SetSize(firstConnected, -repeat, false);
+                                        break;
+                                // case COLOR_CHANGE: SetFillColor(firstConnected); break;
+                                case ANNOTATION_CHANGE:
+                                        ToggleAnnotation(firstConnected);
+                                        break;
+                                case FONT_STYLE_CHANGE:
+                                        ToggleFontStyle(firstConnected);
+                                        break;
+                                case FONT_FAMILY_CHANGE:
+                                        ToggleFontFamily(firstConnected);
+                                        break;
+                                case DATE_ITEM:
+                                        AddDate(firstConnected);
+                                        break;
                                 }
 
@@ -693 +780 @@
          */
         private static void Drop(Item ip) {
-                String newItemText = DEFAULT_NEW_ITEM_TEXT;
-
-                // if a line is being rubber-banded, this is a no-op
-                if (Frame.rubberbandingLine())
-                        return; // No-op
-
-                // drop requires no permissions
-                Item toDropFrom = null;
-                if (ip != null)
-                        toDropFrom = ip;
-
-                // if the cursor is in free space then the drop will happen from the
-                // last non annotation text item on the frame
-                if (toDropFrom == null) {
-                        toDropFrom = DisplayIO.getCurrentFrame()
-                                        .getLastNonAnnotationTextItem();
-                }
-
-                // if no item was found, return
-                if (toDropFrom == null) {
-                        FrameGraphics.ErrorMessage("No item could be found to drop from");
-                        return;
-                }
-
-                if (!(toDropFrom instanceof Text)) {
-                        FrameGraphics.DisplayMessage("Only text items can be dropped from");
-                        return;
-                }
-
-                // Get the list of items that must be dropped
-                List<Item> column = DisplayIO.getCurrentFrame().getColumn(toDropFrom);
-
-                if (column == null) {
-                        FrameGraphics.ErrorMessage("No column found to align items to");
-                        return;
-                }
-
-                Text title = DisplayIO.getCurrentFrame().getTitle();
-
-                // We wont do auto bulleting when dropping from titles
-                if (toDropFrom != title) {
-                        newItemText = getAutoBullet(((Text) toDropFrom).getFirstLine());
-                }
-
-                Text dummyItem = null;
-
-                if (Frame.textItemAttachedToCursor()) {
-                        dummyItem = (Text) Frame.getItemAttachedToCursor();
-                        String autoBullet = getAutoBullet(dummyItem.getTextNoList());
-
-                        if (autoBullet.length() > 0)
-                                newItemText = "";
-                        dummyItem.setText(newItemText + dummyItem.getTextNoList());
-                }
-                dummyItem = createText();
-                if (Frame.textItemAttachedToCursor()) {
-                        Text t = (Text) Frame.getItemAttachedToCursor();
-                        dummyItem.setSize(t.getSize());
-                        for (int i = 0; i < t.getText().size(); i++) {
-                                newItemText += '\n';
-                        }
-                }
-
-                dummyItem.setText(newItemText);
-
-                // If the only item on the frame is the title and the frame name just
-                // drop a specified distance below the title
-                if (column.size() == 0) {
-                        Text itemTemplate = DisplayIO.getCurrentFrame().getItemTemplate();
-                        int xPos = title.getX();
-                        int yPos = title.getY() + title.getBoundsHeight()
-                                        + itemTemplate.getBoundsHeight();
-                        dummyItem.setPosition(xPos, yPos);
-                        DisplayIO.setCursorPosition(xPos, yPos);
-                } else {
-                        int yPos = column.get(0).getY() + 1;
-                        // Either position the new item below the title or just above
-                        // the first item below the title
-                        if (toDropFrom == title)
-                                yPos = Math
-                                                .min(column.get(0).getY() - 1, title.getY()
-                                                                + title.getBoundsHeight()
-                                                                + dummyItem.getBoundsHeight());
-                        dummyItem.setPosition(column.get(0).getX(), yPos);
-                        column.add(dummyItem);
-                        FrameUtils.Align(column, false, 0);
-                        // Check if it will be outside the frame area
-                        if (dummyItem.getY() < 0
-                                        || dummyItem.getY() > FrameGraphics.getMaxFrameSize()
-                                                        .getHeight()) {
-                                // Check for the @more tag!
-                                Item i = ItemUtils.FindTag(DisplayIO.getCurrentFrame()
-                                                .getItems(), "@More");
-                                if (i != null) {
-                                        Frame firstFrame = DisplayIO.getCurrentFrame();
-                                        boolean mouseMoved = FrameMouseActions.tdfc(i);
-                                        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
-                                        if (!mouseMoved) {
-                                                Item moreTitle = moreFrame.getTitle();
-                                                moreTitle.Permission = Item.PERMISSION_FULL;
-                                                Drop(moreTitle);
+                try {
+                        String newItemText = DEFAULT_NEW_ITEM_TEXT;
+
+                        // if a line is being rubber-banded, this is a no-op
+                        if (Frame.rubberbandingLine())
+                                return; // No-op
+
+                        // drop requires no permissions
+                        Item toDropFrom = null;
+                        if (ip != null)
+                                toDropFrom = ip;
+
+                        // if the cursor is in free space then the drop will happen from the
+                        // last non annotation text item on the frame
+                        if (toDropFrom == null) {
+                                toDropFrom = DisplayIO.getCurrentFrame()
+                                                .getLastNonAnnotationTextItem();
+                        }
+
+                        // if no item was found, return
+                        if (toDropFrom == null) {
+                                FrameGraphics
+                                                .ErrorMessage("No item could be found to drop from");
+                                return;
+                        }
+
+                        if (!(toDropFrom instanceof Text)) {
+                                FrameGraphics
+                                                .DisplayMessage("Only text items can be dropped from");
+                                return;
+                        }
+
+                        // Get the list of items that must be dropped
+                        List<Item> column = DisplayIO.getCurrentFrame().getColumn(
+                                        toDropFrom);
+
+                        if (column == null) {
+                                FrameGraphics.ErrorMessage("No column found to align items to");
+                                return;
+                        }
+
+                        Text title = DisplayIO.getCurrentFrame().getTitle();
+
+                        // We wont do auto bulleting when dropping from titles
+                        if (toDropFrom != title) {
+                                newItemText = getAutoBullet(((Text) toDropFrom).getFirstLine());
+                        }
+
+                        Text dummyItem = null;
+
+                        if (Frame.textItemAttachedToCursor()) {
+                                dummyItem = (Text) Frame.getItemAttachedToCursor();
+                                String autoBullet = getAutoBullet(dummyItem.getTextNoList());
+
+                                if (autoBullet.length() > 0)
+                                        newItemText = "";
+                                dummyItem.setText(newItemText + dummyItem.getTextNoList());
+                        }
+                        dummyItem = createText();
+                        if (Frame.textItemAttachedToCursor()) {
+                                Text t = (Text) Frame.getItemAttachedToCursor();
+                                dummyItem.setSize(t.getSize());
+                                for (int i = 0; i < t.getText().size(); i++) {
+                                        newItemText += '\n';
+                                }
+                        }
+
+                        dummyItem.setText(newItemText);
+
+                        // If the only item on the frame is the title and the frame name
+                        // just
+                        // drop a specified distance below the title
+                        if (column.size() == 0) {
+                                Text itemTemplate = DisplayIO.getCurrentFrame()
+                                                .getItemTemplate();
+                                int xPos = title.getX();
+                                int yPos = title.getY() + title.getBoundsHeight()
+                                                + itemTemplate.getBoundsHeight();
+                                dummyItem.setPosition(xPos, yPos);
+                                DisplayIO.setCursorPosition(xPos, yPos);
+                        } else {
+                                int yPos = column.get(0).getY() + 1;
+                                // Either position the new item below the title or just above
+                                // the first item below the title
+                                if (toDropFrom == title)
+                                        yPos = Math.min(column.get(0).getY() - 1, title.getY()
+                                                        + title.getBoundsHeight()
+                                                        + dummyItem.getBoundsHeight());
+                                dummyItem.setPosition(column.get(0).getX(), yPos);
+                                column.add(dummyItem);
+                                FrameUtils.Align(column, false, 0);
+                                // Check if it will be outside the frame area
+                                if (dummyItem.getY() < 0
+                                                || dummyItem.getY() > FrameGraphics.getMaxFrameSize()
+                                                                .getHeight()) {
+                                        // Check for the @more tag!
+                                        Item i = ItemUtils.FindTag(DisplayIO.getCurrentFrame()
+                                                        .getItems(), "@More");
+                                        if (i != null) {
+                                                Frame firstFrame = DisplayIO.getCurrentFrame();
+                                                boolean mouseMoved = FrameMouseActions.tdfc(i);
+                                                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
+                                                if (!mouseMoved) {
+                                                        Item moreTitle = moreFrame.getTitle();
+                                                        moreTitle.Permission = Item.PERMISSION_FULL;
+                                                        Drop(moreTitle);
+                                                }
+                                                // Add the bullet text to the item
+                                                dummyItem.setPosition(DisplayIO.getMouseX(), DisplayIO
+                                                                .getMouseY());
+                                        } else {
+                                                FrameGraphics
+                                                                .WarningMessage("Can not create items outside the frame area");
+                                                // ensures correct repainting when items don't move
+                                                DisplayIO.setCursorPosition(DisplayIO.getMouseX(),
+                                                                DisplayIO.getMouseY());
+                                                return;
                                         }
-                                        // Add the bullet text to the item
-                                        dummyItem.setPosition(DisplayIO.getMouseX(), DisplayIO
-                                                        .getMouseY());
+                                }
+                                if (!Frame.textItemAttachedToCursor() && !dummyItem.isEmpty()) {
+                                        DisplayIO.getCurrentFrame().addItem(dummyItem);
+                                }
+
+                                // Move the item to the cursor position
+                                if (Frame.itemAttachedToCursor()) {
+                                        DisplayIO.setCursorPosition(dummyItem.getX(), dummyItem
+                                                        .getY());
+                                        Item firstItem = Frame.getItemAttachedToCursor();
+                                        int deltaX = firstItem.getX() - dummyItem.getX();
+                                        int deltaY = firstItem.getY() - dummyItem.getY();
+
+                                        for (Item i : Frame.FreeItems) {
+                                                i.setPosition(i.getX() - deltaX, i.getY() - deltaY);
+                                        }
                                 } else {
-                                        FrameGraphics
-                                                        .WarningMessage("Can not create items outside the frame area");
-                                        // ensures correct repainting when items don't move
-                                        DisplayIO.setCursorPosition(DisplayIO.getMouseX(),
-                                                        DisplayIO.getMouseY());
-                                        return;
+                                        DisplayIO.setCursorPosition(dummyItem
+                                                        .getEndParagraphPosition().x, dummyItem.getY());
                                 }
                         }
-                        if (!Frame.textItemAttachedToCursor() && !dummyItem.isEmpty()) {
-                                DisplayIO.getCurrentFrame().addItem(dummyItem);
-                        }
-
-                        // Move the item to the cursor position
-                        if (Frame.itemAttachedToCursor()) {
-                                DisplayIO.setCursorPosition(dummyItem.getX(), dummyItem.getY());
-                                Item firstItem = Frame.getItemAttachedToCursor();
-                                int deltaX = firstItem.getX() - dummyItem.getX();
-                                int deltaY = firstItem.getY() - dummyItem.getY();
-
-                                for (Item i : Frame.FreeItems) {
-                                        i.setPosition(i.getX() - deltaX, i.getY() - deltaY);
-                                }
-                        } else {
-                                DisplayIO
-                                                .setCursorPosition(
-                                                                dummyItem.getEndParagraphPosition().x,
-                                                                dummyItem.getY());
-                        }
-                }
-
-                DisplayIO.resetCursorOffset();
-                FrameGraphics.Repaint();
+
+                        DisplayIO.resetCursorOffset();
+                        FrameGraphics.Repaint();
+                } catch (RuntimeException e) {
+                        FrameGraphics.ErrorMessage(e.getMessage());
+                }
         }
 
@@ -992 +1088 @@
          *            with resizing
          */
-        private static void SetSize(Item ip, int diff, boolean moveCursor) {
+        private static void SetSize(Item item, int diff, boolean moveCursor) {
                 List<Item> toSize = new ArrayList<Item>();
                 // the mouse is only moved when the Item is on the frame, not free
@@ -999 +1095 @@
 
                 // if the user is not pointing to any item
-                if (ip == null) {
+                if (item == null) {
                         if (Frame.itemAttachedToCursor())
                                 toSize.addAll(Frame.FreeItems);
@@ -1009 +1105 @@
                 } else {
                         // check permissions
-                        if (ip.Permission < Item.PERMISSION_FULL) {
+                        if (item.Permission < Item.PERMISSION_FULL) {
                                 FrameGraphics
                                                 .DisplayMessage("Insufficient permission to change the size of that item");
                                 return;
                         }
-                        toSet = ip;
-                        Item currentItem = FrameUtils.getCurrentItem();
-
-                        if (currentItem != null && (currentItem instanceof Text)
-                                        && FrameUtils.getCurrentItems() == null) {
-                                toSize.add(currentItem);
+                        toSet = item;
+
+                        if (!(toSet instanceof Text) && toSet.isLineEnd()) {
+                                toSize.addAll(toSet.getLines());
+                        } else if (toSet instanceof Line) {
+                                Line line = (Line) toSet;
+                                float current = Math.abs(line.getThickness());
+                                current = Math.max(current + diff, 1);
+                                line.setThickness(current);
+                                FrameGraphics.Repaint();
+                                return;
                         } else {
-                                toSize.addAll(toSet.getLines());
-                        }
-                }
-
-                if (toSet instanceof Line) {
-                        Line line = (Line) toSet;
-                        float current = Math.abs(line.getThickness());
-                        current = Math.max(current + diff, 1);
-                        line.setThickness(current);
-                        FrameGraphics.Repaint();
-                        return;
-                }
-
-                /*
-                 * for(Item i : toSize){ if(i instanceof Dot || i instanceof Line){
-                 * toSize.removeAll(i.getConnected()); toSize.add(i); } }
-                 */
+                                toSize.add(toSet);
+                        }
+                }
 
                 int old_width = 0;
@@ -1056 +1143 @@
                                 line.setThickness(current);
                         } else if (i instanceof Dot) {
-                                Dot dot = (Dot) i;
+                                Item dot = (Item) i;
                                 float current = Math.abs(dot.getThickness());
                                 current = Math.max(current + diff, 1);
@@ -1063 +1150 @@
                                 int current = Math.abs(i.getSize());
                                 current = Math.max(current + diff, 1);
-                                if (current > MINIMUM_SIZE)
-                                        i.setSize(current);
+                                i.setSize(current);
                         }
                 }
@@ -1353 +1439 @@
                         return;
                 }
-                
+
                 if (!(item instanceof Text)) {
                         FrameGraphics
@@ -1359 +1445 @@
                         return;
                 }
-                
-                //dont create frameset if the item is linked
+
+                // dont create frameset if the item is linked
                 if (item.getLink() != null) {
                         FrameGraphics
@@ -1366 +1452 @@
                         return;
                 }
-                
+
                 // check permissions
                 if (item.Permission < Item.PERMISSION_FULL) {

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

@@ -13 +13 @@
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -88 +89 @@
         public static int MouseY;
 
-        // Offset coordinates from the mouse position when grabbing items
+        // Distance of mouse cursor from the origin of the item that was picked up
+        // The are used in the move method to calculate the distance moved by the
+        // cursor
         private static int _offX;
 
-        // MIKE: Thinks the offsets are used in getting items to draw in the message
-        // window?
         private static int _offY;
 
@@ -567 +568 @@
                         if (clicked.Permission < Item.PERMISSION_FOLLOW_LINKS) {
                                 FrameGraphics
-                                                .DisplayMessage("Insufficient Permissions for action on item");
+                                                .DisplayMessage("Insufficient permissions to perform action on item");
                                 return;
                         }
@@ -608 +609 @@
                                         return;
                                 }
-
-                                tdfc(clickedOn);
+                                try {
+                                        tdfc(clickedOn);
+                                } catch (RuntimeException e) {
+                                        FrameGraphics.ErrorMessage(e.getMessage());
+                                }
                                 return;
                         }
@@ -667 +671 @@
                                                 && clicked.getParent() != null
                                                 && clicked.getParent().getFrameNameItem() != clicked) {
-                                        FrameGraphics.DisplayMessage("Insufficient Permission");
+                                        FrameGraphics.DisplayMessage("Insufficient permission");
                                         return;
                                 }
 
-                                Item merger  = Frame.FreeItems.get(0);
-                                assert(merger != null);
+                                Item merger = Frame.FreeItems.get(0);
+                                assert (merger != null);
                                 // Move the cursor if it is not Text-Text merging
                                 // Or Item to Line merging
@@ -679 +683 @@
                                         DisplayIO.setCursorPosition(clicked.getPosition());
                                 }
-                                List<Item> left = merge(Frame.FreeItems, clicked);
+                                Collection<Item> left = merge(Frame.FreeItems, clicked);
                                 anchor(left);
                                 Frame.FreeItems.clear();
@@ -700 +704 @@
                         if (clicked.Permission < Item.PERMISSION_FULL) {
                                 FrameGraphics
-                                                .DisplayMessage("Insufficient Permission to pick up item");
+                                                .DisplayMessage("Insufficient permission to pick up item");
                                 return;
                         }
@@ -781 +785 @@
                         Line newLine = createLine();
                         SessionStats.CreatedItems(newLine.getAllConnected());
-                        
+
                         // if the user can spot-weld, show the virtual spot
                         if (on instanceof Line) {
@@ -855 +859 @@
                                                 && clicked.getParent().getFrameNameItem() != clicked) {
                                         FrameGraphics
-                                                        .DisplayMessage("Insufficient Permission to merge items");
+                                                        .DisplayMessage("Insufficient permission to merge items");
                                         return;
                                 }
@@ -866 +870 @@
                                                 // get a copy of all enclosed items before merging
                                                 // lineEnds
-                                                List<Item> items = FrameUtils.getItemsEnclosedBy(
+                                                Collection<Item> items = FrameUtils.getItemsEnclosedBy(
                                                                 DisplayIO.getCurrentFrame(), d
                                                                                 .getEnclosedShape());
@@ -892 +896 @@
                                                 copies = copy(toCopy);
                                                 // Now do the merging
-                                                List<Item> remain = merge(Frame.FreeItems, clicked);
+                                                Collection<Item> remain = merge(Frame.FreeItems,
+                                                                clicked);
                                                 // anchor the points
                                                 anchor(remain);
@@ -900 +905 @@
                                         } else if (Frame.FreeItems.size() == 2) {
                                                 copies = ItemUtils.UnreelLine(Frame.FreeItems);
-                                                List<Item> leftOver = merge(Frame.FreeItems, clicked);
+                                                Collection<Item> leftOver = merge(Frame.FreeItems,
+                                                                clicked);
                                                 anchor(leftOver);
                                                 if (copies == null)
@@ -913 +919 @@
                                         } else if (Frame.FreeItems.size() == 1) {
                                                 copies = copy(Frame.FreeItems);
-                                                List<Item> remain = merge(copies, clicked);
+                                                Collection<Item> remain = merge(copies, clicked);
 
                                                 // ignore items that could not be merged.
@@ -982 +988 @@
                                         if (Frame.FreeItems.size() == 2) {
                                                 if (clicked != null) {
-                                                        List<Item> leftOver = merge(Frame.FreeItems,
+                                                        Collection<Item> leftOver = merge(Frame.FreeItems,
                                                                         clicked);
                                                         anchor(leftOver);
@@ -1033 +1039 @@
                                 // Copies will NOT be null if the user right clicked on a point
                                 if (copies == null) {
-                                        List<Item> originals = clicked.getConnected();
+                                        Collection<Item> originals = clicked.getConnected();
                                         copies = ItemUtils.CopyItems(originals, _extrude);
                                         if (!_extrude)
@@ -1044 +1050 @@
                                         // Set the selection mode for the items that were clicked in
                                         List<Item> enclosed = getFullyEnclosedItems(clickedIn);
-                                        copies = copy(enclosed);
-                                        // TODO figure out how to get copies to be SELECTED when
-                                        // they are anchored
-                                        // for (Item i : copies) {
-                                        // if (i.isEnclosed()) {
-                                        // i.setSelectedMode(Item.SelectedMode.Enclosed);
-                                        // i.setSelectedMode(Item.SelectedMode.None);
-                                        // }
-                                        // }
-                                        clearParent(copies);
-                                        pickup(copies);
+                                        if (enclosed.size() == 0) {
+                                                FrameGraphics
+                                                .DisplayMessage("Insufficient permission to copy items");
+                                        } else {
+                                                copies = copy(enclosed);
+                                                // TODO figure out how to get copies to be SELECTED when
+                                                // they are anchored
+                                                // for (Item i : copies) {
+                                                // if (i.isEnclosed()) {
+                                                // i.setSelectedMode(Item.SelectedMode.Enclosed);
+                                                // i.setSelectedMode(Item.SelectedMode.None);
+                                                // }
+                                                // }
+                                                clearParent(copies);
+                                                pickup(copies);
+                                        }
                                         // otherwise, create a rectangle
                                 } else {
                                         copies = new ArrayList<Item>();
-                                        Dot[] d = new Dot[RECTANGLE_CORNERS];
+                                        Item[] d = new Item[RECTANGLE_CORNERS];
                                         // create dots
                                         for (int i = 0; i < d.length; i++) {
@@ -1121 +1132 @@
                         Item i = enclosedItems.get(0);
                         if (i.Permission >= Item.PERMISSION_COPY) {
-                                List<Item> items = i.getAllConnected();
+                                Collection<Item> items = i.getAllConnected();
                                 // Only copy if the entire shape is enclosed
                                 if (enclosedItems.containsAll(items)) {
@@ -1127 +1138 @@
                                 }
                                 enclosedItems.removeAll(items);
+                        } else {
+                                enclosedItems.remove(0);
                         }
                 }
@@ -1226 +1239 @@
 
         MouseEvent _lastMouseEvent = null;
-
+        private static Integer LastRobotX = null;
+        private static Integer LastRobotY = null;
+        
+        public static void setLastRobotMove(int x, int y) {
+                //Make sure the system is in the right state while waiting for the Robots event to arrive.
+                MouseX = x;
+                MouseY = y;
+                
+                LastRobotX = x;
+                LastRobotY = y;
+        }
+        
+        public static boolean isWaitingForRobot() {
+                return LastRobotX != null;
+        }
+        
+        
         /**
          * Updates the stored mouse position and highlights any items as necessary.
          */
         public void mouseMoved(MouseEvent e) {
+                if(LastRobotX != null){
+                        //Wait until the last Robot mouse move event arrives before processing other events
+                        if(LastRobotX == e.getX() && LastRobotY == e.getY()){
+                                LastRobotX = null;
+                                LastRobotY = null;
+                        }else
+                                return;
+                }
+                
                 MouseX = e.getX();
                 MouseY = e.getY();
@@ -1334 +1372 @@
                                 // highlighting
                         } else if (on == null) {
-                                List<Item> enclosure = FrameUtils.getEnclosingDots();
+                                Collection<Item> enclosure = FrameUtils.getEnclosingDots();
                                 if (enclosure != null && enclosure.size() > 1) {
-                                        if (enclosure.get(0).getLines().size() > 1 &&
+                                        Item firstLineEnd = enclosure.iterator().next();
+                                        if (firstLineEnd.getLines().size() > 1 &&
                                         // check that the enclosure is not part of a point being
                                                         // dragged in space
                                                         !ContainsOneOf(enclosure, Frame.FreeItems)) {
-                                                on = enclosure.get(0).getLines().get(0);
+                                                on = firstLineEnd.getLines().get(0);
                                                 FrameGraphics.ChangeSelectionMode(on,
                                                                 Item.SelectedMode.Enclosed);
@@ -1379 +1418 @@
         }
 
-        private boolean ContainsOneOf(List<Item> enclosure, List<Item> freeItems) {
+        private boolean ContainsOneOf(Collection<Item> enclosure,
+                        Collection<Item> freeItems) {
                 if (freeItems == null)
                         return false;
@@ -1440 +1480 @@
 
         private static void move(List<Item> toMove) {
+                //System.out.println(_offX + "," + _offY);
+
+                // Gets the origin of the first item to move
                 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;
@@ -1484 +1523 @@
          * @return
          */
-        public static boolean tdfc(Item linker) {
+        public static boolean tdfc(Item linker) throws RuntimeException {
                 if (linker instanceof Line)
                         return false;
@@ -1491 +1530 @@
                 if (linker.getID() < 0)
                         return false;
+
+                boolean mouseMoved;
 
                 linker.getParent().setChanged(true);
@@ -1512 +1553 @@
                 FrameUtils.setTdfcItem(linker);
 
-                boolean mouseMoved = next.moveMouseToDefaultLocation();
+                mouseMoved = next.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
@@ -1519 +1560 @@
                 // triggers changed to be set to true when it should stay as false
                 next.setChanged(false);
-
                 return mouseMoved;
         }
@@ -1552 +1592 @@
                         // Give the attribute text item the color of the item for which
                         // attributes are being extracted.
-                        attribs.setColor(item.getColor());
+                        // attribs.setColor(item.getColor());
                         pickup(attribs);
                 }
@@ -1582 +1622 @@
                                         return;
                                 }
-
                                 Text anchored = (Text) toDelete;
                                 Text free = (Text) Frame.FreeItems.get(0);
-
+                                SessionStats.DeletedItem(free);
                                 // List<String> temp = anchored.getText();
                                 anchored.setTextList(free.getText());
@@ -1613 +1652 @@
 
                         if (items != null) {
-                                ArrayList<Item> toRemove = new ArrayList<Item>(items.size());
-                                for (Item ip : items)
+                                List<Item> toRemove = new ArrayList<Item>(items.size());
+                                for (Item ip : items) {
                                         if (ip.Permission >= Item.PERMISSION_FULL) {
+                                                // Only include lines if one of their enpoints are also
+                                                // being removed
+                                                if (ip instanceof Line) {
+                                                        Line l = (Line) ip;
+                                                        if (!items.contains(l.getEndItem())
+                                                                        && !items.contains(l.getStartItem()))
+                                                                continue;
+                                                }
                                                 toRemove.add(ip);
                                         }
+                                }
 
                                 deleteItems(toRemove);
@@ -1643 +1691 @@
                         current.setChanged(true);
 
-                        List<Item> toUndo = new LinkedList<Item>();
-
+                        List<Item> toUndo = null;
                         if (toDelete.isLineEnd()) {
-                                toUndo.addAll(deleteDot(toDelete));
-                        } else
-                                toUndo.addAll(copy(toDelete.getConnected()));
-
+                                toUndo = deleteLineEnd(toDelete);
+                        } else {
+                                toUndo = copy(toDelete.getConnected());
+                        }
+                        SessionStats.DeletedItems(toUndo);
                         current.addAllToUndo(toUndo);
                         current.removeAllItems(toDelete.getConnected());
@@ -1677 +1725 @@
                 for (Item i : itemList) {
                         if (i.getLines().size() > 0) {
-                                List<Item> copy = deleteDot(i);
+                                List<Item> copy = deleteLineEnd(i);
                                 // add the copied items to the undo stack
                                 for (Item cop : copy)
@@ -1698 +1746 @@
         }
 
-        private static List<Item> deleteDot(Item dot) {
-
-                if (dot instanceof WidgetCorner) { // Brook
-
-                        WidgetCorner wc = (WidgetCorner) dot;
+        private static List<Item> deleteLineEnd(Item lineEnd) {
+
+                if (lineEnd instanceof WidgetCorner) { // Brook
+
+                        WidgetCorner wc = (WidgetCorner) lineEnd;
                         List<Item> wccopy;
 
@@ -1712 +1760 @@
                         }
 
-                        if (dot.getParent() != null) {
-                                dot.getParent().removeAllItems(wc.getWidgetSource().getItems());
+                        if (lineEnd.getParent() != null) {
+                                lineEnd.getParent().removeAllItems(
+                                                wc.getWidgetSource().getItems());
                         }
                         return wccopy;
@@ -1719 +1768 @@
 
                         // create a backup copy of the dot
-                        List<Item> copy = copy(dot.getConnected());
+                        List<Item> copy = copy(lineEnd.getConnected());
                         // remove lines that are connected to anchored dots
                         // note: the line is kept so that it can be properly restored
@@ -1733 +1782 @@
 
                         // remove all lines being deleted
-                        for (Item ic : dot.getConnected()) {
+                        for (Item ic : lineEnd.getConnected()) {
                                 if (ic instanceof Line
-                                                && ((Line) ic).getOppositeEnd(dot) != null) {
+                                                && ((Line) ic).getOppositeEnd(lineEnd) != null) {
                                         Line line = (Line) ic;
 
-                                        Item d = line.getOppositeEnd(dot);
+                                        Item d = line.getOppositeEnd(lineEnd);
                                         d.removeLine(line);
 
@@ -1750 +1799 @@
                                         }
 
-                                        if (dot.getParent() != null)
-                                                dot.getParent().removeItem(ic);
+                                        if (lineEnd.getParent() != null)
+                                                lineEnd.getParent().removeItem(ic);
                                 }
                         }
@@ -1772 +1821 @@
         }
 
-        public static List<Item> merge(List<Item> merger, Item mergee) {
+        public static Collection<Item> merge(List<Item> merger, Item mergee) {
                 if (mergee.getParent().getFrameNameItem() == mergee) {
                         return mergee.getParent().merge(merger);
@@ -1782 +1831 @@
                         // if this is a corner of a shape
                         if (corner != null) {
-                                List<Item> allConnected = corner.getAllConnected();
+                                Collection<Item> allConnected = corner.getAllConnected();
                                 // Check if we are collapsing a rectangle
                                 if (allConnected.size() == 8 && allConnected.contains(mergee)) {
@@ -1898 +1947 @@
          */
         public static void pickup(Item toGrab) {
+                if (toGrab.Permission < Item.PERMISSION_FULL) {
+                        FrameGraphics
+                                        .DisplayMessage("Insufficient permission pickup the item");
+                        return;
+                }
                 // Brook: If the widget corner is being picked up. Instead refer to
-                // picking
-                // up the edge for fixed-sized widgets so it is not so confusing
+                // picking up the edge for fixed-sized widgets so it is not so confusing
                 if (toGrab instanceof WidgetCorner) {
                         WidgetCorner wc = (WidgetCorner) toGrab;
                         if (wc.getWidgetSource().isFixedSize()) {
-                                toGrab = toGrab.getConnected().get(1);
-                        }
-                }
-
+                                for (Item i : toGrab.getConnected()) {
+                                        if (i instanceof WidgetEdge) {
+                                                toGrab = i;
+                                                break;
+                                        }
+                                }
+                        }
+                }
                 pickup(toGrab.getConnected());
         }
 
-        public static void pickup(List<Item> toGrab) {
+        public static void pickup(Collection<Item> toGrab) {
 
                 String currentFrame = DisplayIO.getCurrentFrame().getFrameName();
-                for (Item i : toGrab) {
+                Iterator<Item> iter = toGrab.iterator();
+                while (iter.hasNext()) {
+                        Item i = iter.next();
+                        if (i.Permission < Item.PERMISSION_FULL) {
+                                iter.remove();
+                                continue;
+                        }
+
                         // Check if it has a relative link if so make it absolute
                         i.setAbsoluteLink();
-
                         // parent may be null
                         if (i.getParent() != null) {
@@ -1925 +1988 @@
                         }
                         Frame.FreeItems.add(i);
-
                         i.setFloating(true);
                 }
@@ -1935 +1997 @@
                 if (toGrab.size() > 1) {
                         for (Item i : toGrab) {
+                                // MIKE: Why cant we use a line for the offset calculations?!?
                                 if (!(i instanceof Line)) {
                                         _offX = DisplayIO.getMouseX() - i.getX() + i.getOffset().x;
@@ -1940 +2003 @@
 
                                         // make the offset item the first item in the list (so
-                                        // moving code knows which item to use)
+                                        // move method knows which item to use)
                                         Frame.FreeItems.set(Frame.FreeItems.indexOf(i),
                                                         Frame.FreeItems.get(0));
@@ -1949 +2012 @@
 
                         move(Frame.FreeItems);
+                        ItemUtils.EnclosedCheck(toGrab);
                         // otherwise, just use the first item
                 } else if (toGrab.size() == 1) {
-                        _offX = DisplayIO.getMouseX() - toGrab.get(0).getX()
-                                        + toGrab.get(0).getOffset().x;
-                        _offY = MouseY - toGrab.get(0).getY() + toGrab.get(0).getOffset().y;
-                }
-
-                ItemUtils.EnclosedCheck(toGrab);
+                        Item soleItem = toGrab.iterator().next();
+                        _offX = DisplayIO.getMouseX() - soleItem.getX()
+                                        + soleItem.getOffset().x;
+                        _offY = MouseY - soleItem.getY() + soleItem.getOffset().y;
+                } else {
+                        FrameGraphics
+                        .DisplayMessage("Insufficient permission pickup the items");
+                }
         }
 
         private static Line createLine() {
                 // create the two endpoints
-                Dot end = DisplayIO.getCurrentFrame().createDot();
-                Dot start = DisplayIO.getCurrentFrame().createDot();
+                Item end = DisplayIO.getCurrentFrame().createDot();
+                Item start = DisplayIO.getCurrentFrame().createDot();
                 // create the Line
                 Line line = new Line(start, end, DisplayIO.getCurrentFrame()
@@ -2006 +2072 @@
         }
 
-        public static void anchor(List<Item> toAnchor) {
+        public static void anchor(Collection<Item> toAnchor) {
                 // Need to make sure we check enclosure for overlays etc
                 List<Frame> checkEnclosure = new ArrayList<Frame>();
@@ -2070 +2136 @@
                                 clicks = (int) Math.ceil(size / 20.0 * clicks);
                         }
-
                         FrameKeyboardActions.functionKey(rotationType, clicks);
+
                 } else if (clicks == MOUSE_WHEEL_THRESHOLD) {
-                        Item ip = FrameUtils.getCurrentItem();
+                        Item item = FrameUtils.getCurrentItem();
 
                         // if the user is not pointing to any item
-                        if (ip == null) {
-                                FrameGraphics
-                                                .DisplayMessage("There are no Items selected on the Frame");
+                        if (item == null) {
+                                FrameKeyboardActions.NextTextItem(null,
+                                                arg0.getWheelRotation() > 0);
                                 return;
-                        } else {
+                        }
+
+                        if (item instanceof Line) {
                                 // check permissions
-                                if (ip.Permission < Item.PERMISSION_FULL) {
+                                if (item.Permission < Item.PERMISSION_FULL) {
                                         FrameGraphics
-                                                        .DisplayMessage("Insufficient permission to change the size of that item");
+                                                        .DisplayMessage("Insufficient permission to edit the Line");
                                         return;
                                 }
-                        }
-
-                        if (ip instanceof Line) {
-                                Line line = (Line) ip;
+                                Line line = (Line) item;
                                 line.toggleDashed(arg0.getWheelRotation());
                                 line.getParent().change();
                                 FrameGraphics.Repaint();
                                 return;
+                        } else if (item instanceof Text) {
+                                FrameKeyboardActions.NextTextItem(item,
+                                                arg0.getWheelRotation() > 0);
                         }
                 }

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

@@ -5 +5 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -330 +331 @@
                         while (toCheck.size() > 0) {
                                 Item i = toCheck.get(0);
-                                List<Item> connected = i.getAllConnected();
+                                Collection<Item> connected = i.getAllConnected();
 
                                 // // Only move completely enclosed items
@@ -587 +588 @@
                                 UserSettings.AnnotationTemplate = ((Text) item)
                                                 .getTemplateForm();
+                        } else if (ItemUtils.isTag(item, ItemUtils.TAG_STAT_TEMPLATE)) {
+                                UserSettings.StatTemplate = ((Text) item).getTemplateForm();
                         } else if (ItemUtils.isTag(item,
                                         ItemUtils.TAG_CODE_COMMENT_TEMPLATE)) {
                                 UserSettings.CodeCommentTemplate = ((Text) item)
                                                 .getTemplateForm();
-                        } else if (ItemUtils.isTag(item,
-                                        ItemUtils.TAG_LINE_TEMPLATE)) {
-                                UserSettings.LineTemplate = ((Text) item)
-                                                .getTemplateForm();
+                        } else if (ItemUtils.isTag(item, ItemUtils.TAG_LINE_TEMPLATE)) {
+                                UserSettings.LineTemplate = ((Text) item).getTemplateForm();
                         } else if (ItemUtils.isTag(item, "@FramesetDir:")) {
                                 String dir = getDir(item, null);
@@ -713 +714 @@
                 ArrayList<String> dirsToAdd = new ArrayList<String>();
                 String dirListFrameName = item.getAbsoluteLink();
-
                 if (dirListFrameName != null) {
                         Frame dirListFrame = FrameIO.LoadFrame(dirListFrameName);
-                        for (Text t : dirListFrame.getBodyTextItems(false)) {
-                                String dirName = t.getTextNoList().trim();
-                                File tester = new File(dirName);
-                                if (tester.exists() && tester.isDirectory()) {
-                                        if (dirName.endsWith(File.separator))
-                                                dirsToAdd.add(dirName);
-                                        else
-                                                dirsToAdd.add(dirName + File.separator);
+                        if (dirListFrame != null) {
+                                for (Text t : dirListFrame.getBodyTextItems(false)) {
+                                        String dirName = t.getTextNoList().trim();
+                                        File tester = new File(dirName);
+                                        if (tester.exists() && tester.isDirectory()) {
+                                                if (dirName.endsWith(File.separator))
+                                                        dirsToAdd.add(dirName);
+                                                else
+                                                        dirsToAdd.add(dirName + File.separator);
+                                        }
                                 }
                         }
@@ -916 +918 @@
                                         // remove dots of size 1
                                         if (i instanceof Dot) {
-                                                Dot dot = (Dot) i;
+                                                Item dot = (Item) i;
                                                 if (dot.getSize() <= 1
                                                                 && (dot.getLines() == null || dot.getLines()
@@ -1029 +1031 @@
                                                 // names have copy permissions only
                                                 if (i == toCheck.getFrameNameItem()) {
-                                                        i.Permission = Item.PERMISSION_TDFC;
+                                                        //i.Permission = Item.PERMISSION_TDFC;
                                                         possibles.add(i);
                                                 } else {
-                                                        i.Permission = Item.PERMISSION_FULL;
+                                                        //i.Permission = Item.PERMISSION_FULL;
                                                         possibles.add(i);
                                                 }
@@ -1056 +1058 @@
                 }
 
+                // if there are no possible items, return null
+                if (possibles.size() == 0)
+                        return null;
+
                 // if there is only one possibility, return it
                 if (possibles.size() == 1)
                         return possibles.get(0);
-
-                // if there are no possible items, return null
-                if (possibles.size() == 0)
-                        return null;
 
                 // return closest x,y pair to mouse
@@ -1076 +1078 @@
                                         + Math.pow(Math.abs(i.getY() - y), 2));
 
-                        if (d < distance) {
+                        if (d <= distance) {
                                 distance = d;
 
                                 // dots take precedence over lines
-                                /**
-                                 * TODO: Remove line\dot specification
-                                 */
                                 if ((!(closest instanceof Dot && i instanceof Line))
                                                 && (!(closest instanceof Text && i instanceof Line)))
@@ -1101 +1100 @@
         public static List<Item> getCurrentItems() {
 
-                List<Item> enclosure = getEnclosingDots();
+                Collection<Item> enclosure = getEnclosingDots();
                 if (enclosure == null || enclosure.size() == 0)
                         return null;
 
+                Item firstItem = enclosure.iterator().next();
+                
                 List<Item> enclosed = getItemsEnclosedBy(DisplayIO.getCurrentFrame(),
-                                enclosure.get(0).getEnclosedShape());
+                                firstItem.getEnclosedShape());
                 for (Item i : enclosed) {
                         if (!enclosure.contains(i))
@@ -1115 +1116 @@
         }
 
-        public static List<Item> getEnclosingDots() {
+        public static Collection<Item> getEnclosingDots() {
                 // update enclosed shapes
                 Frame current = DisplayIO.getCurrentFrame();
                 List<Item> items = current.getItems();
-                
-                //Remove all items that are connected to freeItems
+
+                // Remove all items that are connected to freeItems
                 List<Item> freeItems = new ArrayList<Item>(Frame.FreeItems);
-                while(freeItems.size() > 0) {
+                while (freeItems.size() > 0) {
                         Item item = freeItems.get(0);
-                        List<Item> connected = item.getAllConnected(); 
+                        Collection<Item> connected = item.getAllConnected();
                         items.removeAll(connected);
                         freeItems.removeAll(connected);
                 }
 
-                ArrayList<Item> used = new ArrayList<Item>(0);
-                ArrayList<Item> seen = new ArrayList<Item>(0);
-
-                for (Item i : items)
-                        if (i.isLineEnd()) {
-                                if (i.isEnclosed() && !seen.contains(i)) {
-                                        Polygon p = i.getEnclosedShape();
-                                        if (p
-                                                        .contains(DisplayIO.getMouseX(), DisplayIO
-                                                                        .getMouseY())) {
-
-                                                used.add(i);
-                                                seen.addAll(i.getEnclosingDots());
-                                        }
-                                }
-                        }
+                List<Item> used = new ArrayList<Item>(0);
+
+                while (items.size() > 0) {
+                        Item i = items.get(0);
+                        items.remove(i);
+                        if (i.isLineEnd() && i.isEnclosed()) {
+                                Polygon p = i.getEnclosedShape();
+                                if (p.contains(DisplayIO.getMouseX(), DisplayIO.getMouseY())) {
+                                        used.add(i);
+                                        items.removeAll(i.getEnclosingDots());
+                                }
+                        }
+                }
 
                 if (used.size() == 0)
@@ -1214 +1212 @@
                         // if the item is on the frame
                         if (item.getParent() == frame || item.getParent() == null) {
-                                item.Permission = Item.PERMISSION_FULL;
+                                //item.Permission = Item.PERMISSION_FULL;
                                 results.add(item);
                                 // otherwise, it must be on an overlay frame
@@ -1275 +1273 @@
                 t = profile.addText(xPos, yPos, "@CommentTemplate", null);
                 t.setColor(Item.COLOR_WHEEL[3]);
+
+                yPos += spacing;
+                t = profile.addText(xPos, yPos, "@StatTemplate", null);
+                t.setColor(Color.BLACK);
+                t.setBackgroundColor(new Color(0.9F, 0.9F, 0.9F));
+                t.setFamily(Text.MONOSPACED_FONT);
+                t.setSize(14);
 
                 xPos = 600;
@@ -1329 +1334 @@
                                 SessionStats.CreatedFrame();
                         }
-        
+
                         setTdfcItem(null);
                 }

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

@@ -57 +57 @@
         public static Text TitleTemplate = null;
 
+        public static Text StatTemplate = null;
+
         // add default values
         public static void Init() {

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

@@ -22 +22 @@
 public class Conversion {
 
-        private static final double FONT_SCALE = 0.85;
-
-        // used for rounding when converting between Sandbox and KMS font sizes.
-        private static final double FONT_ROUNDING = 0.07;
+private static final int PERCENT_MAX = 100;
+private static final int RGB_MAX = 255;
+private static final double RGB_CONVERSION_FACTOR = 2.55;
 
         /**
@@ -61 +60 @@
                 }
 
-                float amount = 10f;
+                final float MAX_AMOUNT = 10F;
+                float amount = MAX_AMOUNT;
                 if (num.length() > 0)
                         amount = Float.parseFloat(num);
 
-                if (amount > 10)
-                        amount = 10;
+                if (amount > MAX_AMOUNT)
+                        amount = MAX_AMOUNT;
 
                 float color[] = { 0, 0, 0 };
 
                 if (colorCode.toLowerCase().startsWith("red"))
-                        color[0] = amount / 10;
+                        color[0] = amount / MAX_AMOUNT;
                 else if (colorCode.toLowerCase().startsWith("green"))
-                        color[1] = amount / 10;
+                        color[1] = amount / MAX_AMOUNT;
                 else if (colorCode.toLowerCase().startsWith("blue"))
-                        color[2] = amount / 10;
+                        color[2] = amount / MAX_AMOUNT;
                 else
+                        //TODO: Should we not throw an error here!
                         return current;
 
@@ -93 +94 @@
 
                         int red = (current == null ? 0 : toColorPercent(current.getRed()));
-                        int green = (current == null ? 0 : toColorPercent(current.getGreen()));
+                        int green = (current == null ? 0 : toColorPercent(current
+                                        .getGreen()));
                         int blue = (current == null ? 0 : toColorPercent(current.getBlue()));
                         color[0] = (Integer) Convert(int.class, r, red);
@@ -109 +111 @@
 
         private static Integer toColorPercent(int rgb) {
-                int percent = (int) Math.round(rgb / 2.55);
-                if (percent > 100)
-                        percent = 100;
+                int percent = (int) Math.round(rgb / RGB_CONVERSION_FACTOR);
+                if (percent > PERCENT_MAX)
+                        percent = PERCENT_MAX;
                 else if (percent < 0)
                         percent = 0;
-                
+
                 return percent;
         }
-        
+
         private static Integer toRGB(int percent) {
-                int rgb = (int) Math.round(percent * 2.55);
-                if (rgb > 255)
-                        rgb = 255;
+                int rgb = (int) Math.round(percent * RGB_CONVERSION_FACTOR);
+                if (rgb > RGB_MAX)
+                        rgb = RGB_MAX;
                 else if (rgb < 0)
                         rgb = 0;
-                
+
                 return rgb;
         }
 
+        
+        
         /**
          * Converts the given Color object to the corresponding KMS color code
@@ -140 +144 @@
                         return null;
 
-                int r = (int) ((color.getRed() / 255.0) * 100 + 0.5);
-                int g = (int) ((color.getGreen() / 255.0) * 100 + 0.5);
-                int b = (int) ((color.getBlue() / 255.0) * 100 + 0.5);
+                int r = (int) Math.round((color.getRed() / RGB_CONVERSION_FACTOR));
+                int g = (int) Math.round((color.getGreen() / RGB_CONVERSION_FACTOR));
+                int b = (int) Math.round((color.getBlue() / RGB_CONVERSION_FACTOR));
 
                 return r + " " + g + " " + b;
@@ -179 +183 @@
                         break;
                 }
-
-                double dsize = font.getSize() / FONT_SCALE;
-                if ((Math.ceil(dsize)) - dsize < FONT_ROUNDING)
-                        dsize = Math.ceil(dsize);
-                else
-                        dsize = Math.floor(dsize);
-
-                code += (int) dsize;
-
+                
+                code += font.getSize();
                 return code;
         }
@@ -232 +229 @@
                 try {
                         int size = Integer.parseInt(fontCode.substring(2));
-                        double dsize = size * FONT_SCALE;
-                        if (dsize - ((int) dsize) > FONT_ROUNDING)
-                                dsize = Math.ceil(dsize);
-
-                        code += (int) dsize;
-
+                        //double dsize = size * FONT_SCALE;
+                        //if (dsize - ((int) dsize) > FONT_ROUNDING)
+                        //      dsize = Math.ceil(dsize);
+
+                        //code += (int) dsize;
+                        code += size;
+                        
                         font = Font.decode(code);
                 } catch (NumberFormatException nfe) {
@@ -368 +366 @@
         public static Object Convert(Class type, String value, Object orig) {
                 // System.out.println("Orig: " + orig);
-                assert (value != null);
+                if (value == null)
+                        return null;
                 value = value.trim();
 
@@ -387 +386 @@
                         try {
                                 // Find the field and value of colorName
-                                Field field = Class.forName("java.awt.Color").getField(
-                                                value.toLowerCase());
+                                Field[] fields = Class.forName("java.awt.Color").getFields();
+                                Field field = null;
+                                for (int i = 0; i < fields.length; i++) {
+                                        if (fields[i].getName().equalsIgnoreCase(value)) {
+                                                field = fields[i];
+                                                break;
+                                        }
+                                }
                                 return (Color) field.get(null);
                         } catch (Exception e) {
@@ -482 +487 @@
                 Class[] types = method.getParameterTypes();
                 if (name.equals("setPosition")) {
-
                         Point[] p = new Point[1];
                         p[0] = new Point();
@@ -493 +497 @@
                         } else {
                                 assert (current instanceof Point);
+                                assert (p.length == 1);
                                 Point originalPoint = (Point) current;
                                 p[0].x = (Integer) Convert(int.class, xPos, originalPoint.x);
@@ -547 +552 @@
                         return null;
 
-                if (method == null) {
-                        System.out.println("Output: " + output);
-                }
+                assert(method != null);
 
                 String name = method.getName();
@@ -581 +584 @@
                 // covert points
                 if (output instanceof Point)
-                        return ((Point) output).x + " "
-                                        + ((Point) output).y;
+                        return ((Point) output).x + " " + ((Point) output).y;
 
                 if (output instanceof Boolean)

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

@@ -145 +145 @@
                 }
 
+                newFrame.refreshItemPermissions();
                 _reader.close();
                 newFrame.setChanged(false);

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

@@ -37 +37 @@
 
                 if (toWrite instanceof Dot)
-                        writeDot((Dot) toWrite);
+                        writeDot((Item) toWrite);
         }
 
@@ -51 +51 @@
 
                 if (toWrite instanceof Dot)
-                        writeAnnotationDot((Dot) toWrite);
+                        writeAnnotationDot((Item) toWrite);
         }
 
@@ -63 +63 @@
         }
 
-        protected void writeAnnotationDot(Dot toWrite) throws IOException {
+        protected void writeAnnotationDot(Item toWrite) throws IOException {
         }
 
@@ -75 +75 @@
         }
 
-        protected void writeDot(Dot toWrite) throws IOException {
+        protected void writeDot(Item toWrite) throws IOException {
         }
 

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

@@ -106 +106 @@
                         _ItemTags.put("k", Text.class.getMethod("setJustification", pInt));
 
-                        _ItemTags.put("h", Dot.class.getMethod("setThickness", pFloat));
+                        _ItemTags.put("h", Item.class.getMethod("setThickness", pFloat));
                         _ItemTags.put("l", Item.class.getMethod("setLineIDs", pString));
                         _ItemTags
-                                        .put("c", Dot.class.getMethod("setConstraintIDs", pString));
+                                        .put("c", Item.class.getMethod("setConstraintIDs", pString));
 
                         // Lines and constraints are created differently
@@ -178 +178 @@
                         System.out.println("Error reading bodyLine: " + next + " "
                                         + e.getMessage());
+                        e.printStackTrace();
                 }
 
@@ -188 +189 @@
 
                 _reader.close();
-
-                if (newFrame != null)
+                if (newFrame != null){
+                        newFrame.refreshItemPermissions();
                         newFrame.setChanged(false);
-
+                }
                 return newFrame;
         }
@@ -261 +262 @@
                 java.awt.Point startend = separateValues(_data.get("s"));
 
-                Dot a = (Dot) _linePoints.get(startend.x);
-                Dot b = (Dot) _linePoints.get(startend.y);
+                Item a = _linePoints.get(startend.x);
+                Item b = _linePoints.get(startend.y);
 
                 new Constraint(a, b, idtype.x, idtype.y);
@@ -488 +489 @@
 
                                 try {
-                                        if (vals != null)
+                                        if (vals != null){
                                                 toRun.invoke(toMake, vals);
+                                        }
                                 } catch (IllegalArgumentException e) {
                                         // TODO Auto-generated catch block
@@ -498 +500 @@
                                 } catch (InvocationTargetException e) {
                                         // TODO Auto-generated catch block
+                                        e.printStackTrace();
+                                } catch (ClassCastException e) {
+                                        System.out.println(toRun.getName());
                                         e.printStackTrace();
                                 }

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

@@ -203 +203 @@
 
                         if (i instanceof Dot) {
-                                Dot p = (Dot) i;
+                                Item p = (Item) i;
 
                                 // if there are any constraints to write

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

@@ -9 +9 @@
 import java.util.List;
 
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameKeyboardActions;
 
 /**
@@ -90 +92 @@
                 for (Line line : getLines())
                         line.setColor(c);
-        }
-
-        public void paintFill(Graphics2D g) {
-                if (getFillColor() != null && getEnclosingDots() != null) {
-                        g.setColor(getFillColor());
-                        g.fillPolygon(getEnclosedShape());
-                }
         }
 
@@ -186 +181 @@
 
         @Override
-        public Dot copy() {
+        public Item copy() {
                 Dot copy = new Dot(getX(), getY(), getID());
 
@@ -207 +202 @@
         @Override
         public void setAnnotation(boolean val) {
-        }
-
-        @Override
-        public boolean isAnnotation() {
-                return false;
+                DisplayIO.setCursorPosition(this.getPosition());
+                //Make all the dots this dot is connected to be annotations
+                for(Item i: getAllConnected())
+                        if (i.isLineEnd())
+                                i._connectedToAnnotation = val;
+                
+                FrameKeyboardActions.replaceDot(this, '@');
         }
 
@@ -218 +215 @@
                 // if the item being merged with is another Dot
                 if (merger instanceof Dot) {
-                        Dot dot = (Dot) merger;
+                        Item dot = (Item) merger;
                         merger.setPosition(this.getPosition());
                         // prevent concurrency issues if removing lines
@@ -231 +228 @@
                                 } else {
                                         // check for duplicated lines as a result of merging
-                                        Dot check = (Dot) line.getOppositeEnd(dot);
+                                        Item check = (Item) line.getOppositeEnd(dot);
                                         boolean dup = false;
 

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

@@ -10 +10 @@
 import java.awt.geom.Area;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.ConcurrentModificationException;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -37 +39 @@
         // contains all dots (including this one) that form an enclosure
         // if this dot is part of an enclosing shape
-        private List<Item> _enclosure = null;
+        private Collection<Item> _enclosure = null;
+
+        protected boolean _connectedToAnnotation = false;
 
         public static int PERMISSION_NONE = 0;
@@ -77 +81 @@
         public static final int XGRAVITY = 3;
 
-        public static final int MARGIN_RIGHT = 5;
-
-        public static final int MARGIN_LEFT = 20;
+        public static final int MARGIN_RIGHT = 2;
+
+        public static final int MARGIN_LEFT = 15;
 
         protected static final double DEFAULT_ARROWHEAD_RATIO = 0.5;
@@ -109 +113 @@
 
         public static final int JUSTIFICATION_NONE = -1;
-
-        // private boolean _isValidLink = true;
 
         public static final int JUSTIFICATION_FULL = 0;
@@ -134 +136 @@
                 dest.setActionLeaveFrame(source.getActionLeaveFrame());
                 dest.setActionMark(source.getActionMark());
-                dest.setAnnotation(source.isAnnotation());
 
                 dest.setBackgroundColor(source.getBackgroundColor());
@@ -162 +163 @@
 
                 dest.setParent(source.getParent());
-                dest.setID(source.getParentOrCurrentFrame().getNextItemID());
+                Frame parent = source.getParentOrCurrentFrame();
+                // TODO MIKE says maybe we could tighten up and only give items ID's if
+                // their
+                // current ID is negative?
+                if (parent != null) {
+                        dest.setID(source.getParentOrCurrentFrame().getNextItemID());
+                }
         }
 
@@ -290 +297 @@
         }
 
-        public void addAllConnected(List<Item> connected) {
+        public void addAllConnected(Collection<Item> connected) {
                 if (!connected.contains(this))
                         connected.add(this);
@@ -430 +437 @@
         }
 
-        public List<Item> getAllConnected() {
-                List<Item> list = new LinkedList<Item>();
+        /**
+         * Gets all the items connected to this item. Uses a recursive approach to
+         * search connected points.
+         * 
+         * @return
+         */
+        public Collection<Item> getAllConnected() {
+                Collection<Item> list = new LinkedHashSet<Item>();
                 addAllConnected(list);
                 return list;
@@ -548 +561 @@
         }
 
-        public List<Item> getConnected() {
+        public Collection<Item> getConnected() {
                 List<Item> conn = new LinkedList<Item>();
                 conn.add(this);
@@ -820 +833 @@
          * @return True if this Item is an annotation, False otherwise.
          */
-        public abstract boolean isAnnotation();
+        public boolean isAnnotation() {
+                return false;
+        }
 
         public boolean isFloating() {
@@ -913 +928 @@
          */
         public abstract void paint(Graphics2D g);
+        
+        public void paintFill(Graphics2D g) {
+                if (getFillColor() != null && getEnclosingDots() != null) {
+                        g.setColor(getFillColor());
+                        g.fillPolygon(getEnclosedShape());
+                }
+        }
 
         /**
@@ -1208 +1230 @@
          */
         public void setLink(String frameName) {
-                _link = frameName;
+                if (FrameIO.isValidLink(frameName))
+                        _link = frameName;
+                else
+                        FrameGraphics.ErrorMessage("[" + frameName
+                                        + "] is not a valid frame name");
+                // TODO make this throw exceptions etc...
         }
 
         public void setLinkFrameset(String frameset) {
-                _link_frameset = frameset;
+                if (frameset == null || FrameIO.isValidFramesetName(frameset))
+                        _link_frameset = frameset;
+                else
+                        FrameGraphics.ErrorMessage("[" + frameset
+                                        + "] is not a valid frameset name");
+                // TODO make this throw exceptions etc...
         }
 
@@ -1220 +1252 @@
 
         public void setLinkTemplate(String template) {
-                _link_template = template;
+                if (FrameIO.isValidLink(template))
+                        _link_template = template;
+                else
+                        FrameGraphics.ErrorMessage("[" + template
+                                        + "] is not a valid frame name");
+                // TODO make this throw exceptions etc...
         }
 
@@ -1484 +1521 @@
          *            or null.
          */
-        public void setEnclosedList(List<Item> enclosed) {
+        public void setEnclosedList(Collection<Item> enclosed) {
                 _enclosure = enclosed;
         }
@@ -1514 +1551 @@
          *         null if this Dot is not part of an enclosure.
          */
-        public List<Item> getEnclosingDots() {
+        public Collection<Item> getEnclosingDots() {
                 return _enclosure;
         }
@@ -1568 +1605 @@
                 return true;
         }
+
+        public void setConnectedToAnnotation(boolean val) {
+                _connectedToAnnotation = val;
+        }
+
+        public boolean isConnectedToAnnotation() {
+                return _connectedToAnnotation;
+        }
 }

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

@@ -13 +13 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -21 +22 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
-import org.expeditee.stats.SessionStats;
 
 //Static methods that provide functions for the objects\
@@ -70 +70 @@
         public static final int TAG_LINE_TEMPLATE = 17;
 
+        public static final int TAG_STAT_TEMPLATE = 18;
+
         public static final int TAG_MIN = 0;
 
-        public static final int TAG_MAX = 17;
+        public static final int TAG_MAX = 18;
 
         /**
@@ -164 +166 @@
                 return isTag(toCheck, GetTag(tag));
         }
-        
+
         public static boolean isTag(Item toCheck, int tag, boolean hasValue) {
                 return isTag(toCheck, GetTag(tag), hasValue);
@@ -187 +189 @@
                 // tags are ase-insensitive
                 return String.CASE_INSENSITIVE_ORDER.compare(txt.getFirstLine().trim(),
-                                tag) == 0 || (hasValue && txt.startsWith(tag + " ", true));
+                                tag) == 0
+                                || (hasValue && txt.startsWith(tag + " ", true));
         }
 
@@ -272 +275 @@
          */
         public static String GetTag(int tag) {
+                // TODO refactor so that this uses a map for INT to tags
                 switch (tag) {
                 case TAG_SORT:
@@ -289 +293 @@
                 case TAG_ANNOTATION_TEMPLATE:
                         return "@annotationtemplate";
+                case TAG_STAT_TEMPLATE:
+                        return "@stattemplate";
                 case TAG_CODE_COMMENT_TEMPLATE:
                         return "@commenttemplate";
@@ -618 +624 @@
                 copy.removeAllConstraints();
 
-                int num = 0;
-
-                // Mike: WHAT IS THIS CODE DOING?!!?
-                for (Line line : origEnd.getLines())
-                        num = Math.min(num, line.getID());
-
-                num--;
-
                 // create a new line
-                Line line = new Line(origEnd, copy, num);
+                Line line = new Line(origEnd, copy, DisplayIO.getCurrentFrame()
+                                .getNextItemID());
                 // copy.setFloating(true);
                 origEnd.setArrowheadLength(0);
@@ -636 +635 @@
                 toReturn.add(line);
                 return toReturn;
+        }
+
+        public static void New() {
+                EnclosedCheck(DisplayIO.getCurrentFrame().getItems());
+        }
+
+        public static void Old() {
+                OldEnclosedCheck(DisplayIO.getCurrentFrame().getItems());
+        }
+
+        /**
+         * Updates the connectedToAnnotation flags for all items
+         */
+        public static void UpdateConnectedToAnnotations(Collection<Item> items) {
+                // get all lineEnds on the Frame
+                Collection<Item> lineEnds = new LinkedHashSet<Item>();
+                for (Item i : items) {
+                        i.setConnectedToAnnotation(false);
+                        if (i.isLineEnd()) {
+                                lineEnds.add(i);
+                        }
+                }
+
+                // if there are no line endpoints on the Frame, then there can't be an
+                // enclosure
+                if (lineEnds.size() == 0)
+                        return;
+
+                // Now find go through line ends and see if any are annotation items
+                while (lineEnds.size() > 0) {
+                        Item item = lineEnds.iterator().next();
+                        // If its an annotation item then set the flag for all its connected
+                        // items
+                        if (item.isAnnotation()) {
+                                Collection<Item> connected = item.getAllConnected();
+                                for (Item i : connected)
+                                        i.setConnectedToAnnotation(true);
+                                lineEnds.removeAll(connected);
+                        }
+                        lineEnds.remove(item);
+                }
         }
 
@@ -646 +686 @@
          * is done dynamically (to account for Dots being moved).
          */
-        public static void EnclosedCheck(List<Item> items) {
+        public static void EnclosedCheck(Collection<Item> items) {
+                // get all lineEnds on the Frame
+                List<Item> lineEnds = new LinkedList<Item>();
+                for (Item i : items) {
+                        if (i.isLineEnd()) {
+                                i.setEnclosedList(null);
+                                // Add line ends joined to 2 other lines
+                                if (i.getLines().size() == 2)
+                                        lineEnds.add(i);
+                        }
+                }
+
+                // if there are no line endpoints on the Frame, then there can't be an
+                // enclosure
+                if (lineEnds.size() == 0)
+                        return;
+
+                // New approach
+                while (lineEnds.size() > 0) {
+                        Item item = lineEnds.get(0);
+                        // Get the lineEnds connected to this item
+                        Collection<Item> connected = item.getAllConnected();
+                        Collection<Item> connectedLineEnds = new LinkedHashSet<Item>();
+                        for (Item itemToCheck : connected) {
+                                if (itemToCheck.isLineEnd())
+                                        connectedLineEnds.add(itemToCheck);
+                        }
+                        // Check that all the line ends are in our lineEnds list
+                        int oldSize = lineEnds.size();
+                        // Remove all the items from our line ends list
+                        lineEnds.removeAll(connectedLineEnds);
+                        int newSize = lineEnds.size();
+                        int connectedSize = connectedLineEnds.size();
+                        // Check if all the connectedItems were in the lineEnds collection
+                        if (oldSize == newSize + connectedSize) {
+                                // Set them to be the enclosed list for each of the items
+                                for (Item enclosedLineEnd : connectedLineEnds) {
+                                        enclosedLineEnd.setEnclosedList(connectedLineEnds);
+                                }
+                        }
+
+                }
+        }
+
+        /**
+         * Checks through all Lines and Dots on the current Frame to detect if any
+         * form an enclosure, which can then be used to manipulate items within the
+         * polygon. If an enclosure is found, then the dots will have their
+         * enclosure value set to true, and a List is created that contains all the
+         * Dots in the order they were processed. Actual calculation of the Polygon
+         * is done dynamically (to account for Dots being moved).
+         */
+        public static void OldEnclosedCheck(Collection<Item> items) {
                 _seen.clear();
 

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

@@ -12 +12 @@
 import java.awt.geom.AffineTransform;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
@@ -586 +587 @@
         @Override
         public void setAnnotation(boolean val) {
+                if (_end.isAnnotation() != val)
+                        _end.setAnnotation(val);
+                else if (_start instanceof Text && _start.isAnnotation() != val)
+                        _start.setAnnotation(val);
         }
 
         @Override
         public boolean isAnnotation() {
-                return false;
+                return _start.isAnnotation() || _end.isAnnotation();
+        }
+
+        @Override
+        public boolean isConnectedToAnnotation() {
+                return _start.isConnectedToAnnotation()
+                                || _end.isConnectedToAnnotation();
         }
 
@@ -740 +751 @@
         }
 
-        private Dot _virtualSpot = null;
+        private Item _virtualSpot = null;
 
         public void showVirtualSpot(Item orig, int mouseX, int mouseY) {
@@ -750 +761 @@
                         return;
 
-                Dot spot = new Dot(-1, orig.getX(), orig.getY());
+                Item spot = new Dot(-1, orig.getX(), orig.getY());
                 Item.DuplicateItem(orig, spot);
                 spot.setThickness(Math.max(this.getThickness(), 5));
@@ -789 +800 @@
 
         public void showVirtualSpot(int mouseX, int mouseY) {
-                Dot spot = new Dot(mouseX, mouseY, -1);
+                Item spot = new Dot(mouseX, mouseY, -1);
                 spot.setThickness(Math.max(this.getThickness(), 5));
                 if (this.getColor() != Color.RED)
@@ -898 +909 @@
 
         @Override
-        public List<Item> getConnected() {
+        public Collection<Item> getConnected() {
                 return getAllConnected();
         }
 
-        public List<Item> getAllConnected() {
-                ArrayList<Item> list = new ArrayList<Item>();
-                addAllConnected(list);
-                return list;
-        }
-
-        public void addAllConnected(List<Item> connected) {
+        @Override
+        public void addAllConnected(Collection<Item> connected) {
                 if (!connected.contains(this))
                         connected.add(this);
@@ -971 +977 @@
                          */
 
-                        Dot s = new Dot(_start.getX(), _start.getY(), -1);
-                        Dot e = new Dot(_end.getX(), _end.getY(), -1);
+                        Item s = new Dot(_start.getX(), _start.getY(), -1);
+                        Item e = new Dot(_end.getX(), _end.getY(), -1);
 
                         one = s.getPolygon().getBounds();
                         two = e.getPolygon().getBounds();
                 } else {
-                        Dot s = new Dot(_start.getX(), _start.getY(), -1);
-                        Dot e = new Dot(_end.getX(), _end.getY(), -1);
+                        Item s = new Dot(_start.getX(), _start.getY(), -1);
+                        Item e = new Dot(_end.getX(), _end.getY(), -1);
 
                         one = e.getPolygon().getBounds();

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

@@ -530 +530 @@
         @Override
         public void setAnnotation(boolean val) {
-                // TODO Auto-generated method stub
-
-        }
-
-        @Override
-        public boolean isAnnotation() {
-                // TODO Auto-generated method stub
-                return false;
         }
 

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

@@ -22 +22 @@
 import java.util.List;
 
+import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameGraphics;
+import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameMouseActions;
 
@@ -745 +747 @@
         }
 
+        public static final String MONOSPACED_FONT = "monospaced";
+
         public static final String[] FONT_WHEEL = { "sansserif", "monospaced",
                         "serif", "dialog", "dialoginput" };
@@ -751 +755 @@
 
         private static final int NEARBY_GRAVITY = 2;
+
+        private static final int MINIMUM_FONT_SIZE = 8;
 
         public void toggleFontFamily() {
@@ -939 +945 @@
                 }
 
-                // check if the cursor is on the left border of the bounding box
-                if (Math.abs(mouseX - LEFT_MARGIN - outline.x) <= gravity) {
-                        return true;
-                }
-
                 for (TextLayout text : _textLayouts) {
                         // check left and right of each box
@@ -953 +954 @@
                         if (mouseY - textY > textOutline.y
                                         && mouseY - textY < textOutline.y + textOutline.height
-                                        && mouseX - textX < textOutline.width + gravity)
+                                        && mouseX - textX < textOutline.width + gravity
+                                                        + Item.MARGIN_RIGHT)
                                 return true;
                         textY += getLineDrop(text);
@@ -999 +1001 @@
                 }
 
-                minX -= Item.MARGIN_RIGHT;
-
-                if (getWidth() > 0)
-                        maxX = getWidth();
+                minX -= getLeftMargin();
+                maxX += Item.MARGIN_RIGHT;
 
                 _poly.addPoint(minX - getGravity(), minY - getGravity());
@@ -1008 +1008 @@
                 _poly.addPoint(maxX + getGravity(), maxY + getGravity());
                 _poly.addPoint(minX - getGravity(), maxY + getGravity());
-
-                // _poly.addPoint(minX, minY);
-                // _poly.addPoint(maxX, minY);
-                // _poly.addPoint(maxX, maxY);
-                // _poly.addPoint(minX, maxY);
+        }
+
+        /**
+         * Gets the distance between the start of the text and the left border of
+         * the item. This distance changes depending on whether or not the item is
+         * linked or has an associated action.
+         * 
+         * @return the gap size in pixels
+         */
+        private int getLeftMargin() {
+                return ((getLinkMark() && getLink() != null)
+                                || (getActionMark() && getAction() != null) ? Item.MARGIN_LEFT
+                                - Item.MARGIN_RIGHT : Item.MARGIN_RIGHT);
         }
 
@@ -1389 +1397 @@
         @Override
         public void setSize(int size) {
-                setFont(getPaintFont().deriveFont((float) size));
+                if (size >= MINIMUM_FONT_SIZE)
+                        setFont(getPaintFont().deriveFont((float) size));
         }
 
@@ -1399 +1408 @@
                                 return;
 
-                        /*
-                         * // 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) == ' ')
-                         * _text.delete(0, 1); }
-                         */
                         _text.insert(0, "@");
 
@@ -1418 +1421 @@
                                 return;
 
+                        if (_text.length() == 1) {
+                                // Remove and replace with a dot
+                                FrameKeyboardActions.replaceText(this);
+
+                                DisplayIO.setCursorPosition(this.getPosition());
+                                return;
+                        }
+
                         _text.deleteCharAt(0);
 
@@ -1432 +1443 @@
         @Override
         public boolean isAnnotation() {
-                if (_text != null && _text.length() > 0 && _text.indexOf("@") == 0)
+                if (_text != null && _text.length() > 0 && _text.charAt(0) == '@')
                         return true;
 

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

@@ -6 +6 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -21 +22 @@
 public class SessionStats {
 
+        private static final int DEFAULT_RATE_WIDTH = 4;
+
+        private static final int DEFAULT_VALUE_WIDTH = 3;
+
         public enum ItemType {
                 Text, Dot, Picture, Line;
@@ -71 +76 @@
 
         private static final int[] EVENT_INTERVALS = new int[] { 1, 2, 3, 4, 5, 10,
-                        20, 30, 40, 50, 60, 120, 180, 240, 300, 600, Integer.MAX_VALUE };
+                        20, 60, 300, 600, Integer.MAX_VALUE };
 
         private static int[] _EventTimes = new int[EVENT_INTERVALS.length];
@@ -85 +90 @@
                                 "-->" + _DarkTime.getTime() * 100 / elapsedTime + "%\n");
 
+                stats.append(getResponseStats()).append("\n");
                 stats.append(getFrameStats());
-                stats.append(getResponseStats()).append("\n");
 
                 stats.append(getCharacterStats());
@@ -129 +134 @@
         private static String getFrameStats(boolean newline) {
                 StringBuffer stats = new StringBuffer();
-                appendStat(stats, "FramesAccessed", _AccessedFrames, newline);
-                appendStat(stats, "FramesEdited", _SavedFrames, newline);
+                appendStat(stats, "FramesAccessed", _AccessedFrames, newline, false, DEFAULT_VALUE_WIDTH,
+                                DEFAULT_RATE_WIDTH);
+                appendStat(stats, "FramesEdited", _SavedFrames, newline, false, DEFAULT_VALUE_WIDTH, DEFAULT_RATE_WIDTH);
                 return stats.toString();
         }
@@ -168 +174 @@
                 appendStat(stats, "Words", punct + EOS);
                 appendStat(stats, "Sentences", EOS);
-                appendStat(stats, "Text",
+                appendStat(stats, "TextItems",
                                 _ItemStats[ItemType.Text.ordinal()][StatType.Created.ordinal()]);
                 appendStat(stats, "Frames", _CreatedFrames);
@@ -192 +198 @@
          */
         private static void appendStat(StringBuffer stats, String name, int value,
-                        boolean newline) {
+                        boolean newline, boolean ignoreZero, int minValueWidth,
+                        int minRateWidth) {
                 // prevent divide by zero errors
-                if (value <= 0)
+                if (ignoreZero && value <= 0)
                         return;
 
-                int perHour = (int) (value * 60 / getMinutesUsed());
-
-                stats.append(value).append(" ").append(name).append(" @ ").append(
-                                perHour).append("/hour");
+                String perHour = getRate(value);
+                while (perHour.length() < minRateWidth)
+                        perHour = " " + perHour;
+                String valueString = "" + value;
+                while (valueString.length() < minValueWidth)
+                        valueString = " " + valueString;
+                stats.append(valueString).append(" @ ").append(perHour.toString())
+                                .append("/hour ").append(name);
                 if (newline)
                         stats.append("\n");
@@ -207 +218 @@
 
         }
+        
+        private static String getRate(int value){
+                return "" + Math.round(value * 60 / getMinutesUsed());
+        }
 
         private static void appendStat(StringBuffer stats, String name, int value) {
-                appendStat(stats, name, value, true);
+                appendStat(stats, name, value, true, false, DEFAULT_VALUE_WIDTH, DEFAULT_RATE_WIDTH);
         }
 
@@ -321 +336 @@
         }
 
-        private static void ItemStats(List<Item> items, StatType stat) {
+        private static void ItemStats(Collection<Item> items, StatType stat) {
                 if (items == null)
                         return;
@@ -336 +351 @@
         }
 
-        public static void CreatedItems(List<Item> items) {
+        public static void CreatedItems(Collection<Item> items) {
                 ItemStats(items, StatType.Created);
         }
 
-        public static void MovedItems(List<Item> items) {
+        public static void MovedItems(Collection<Item> items) {
                 ItemStats(items, StatType.Moved);
         }
 
-        public static void CopiedItems(List<Item> items) {
+        public static void CopiedItems(Collection<Item> items) {
                 ItemStats(items, StatType.Copied);
         }
 
-        public static void DeletedItems(List<Item> items) {
+        public static void DeletedItems(Collection<Item> items) {
                 ItemStats(items, StatType.Deleted);
         }
@@ -358 +373 @@
         public static String getItemStats() {
                 StringBuffer stats = getSessionDateTime();
-
+                int max = 0;
+                for (int i = 0; i < STAT_TYPES; i++) {
+                        for (int j = 0; j < ITEM_TYPES; j++) {
+                                if (_ItemStats[j][i] > max)
+                                        max = _ItemStats[j][i];
+                        }
+                }
+                int maxWidthValue = ("" + max).length();
+                int maxWidthRate = (getRate(max)).length();
+                
                 for (int i = 0; i < STAT_TYPES; i++) {
                         int total = 0;
@@ -374 +398 @@
                         // statType > 1
                         if (nonZeroItems > 1)
-                                appendStat(stats, "Total" + statName, total);
-                }
-
+                                appendStat(stats, "Total" + statName, total, true, false, maxWidthValue , maxWidthRate);
+                }
+                stats.deleteCharAt(stats.length() - 1);
                 return stats.toString();
         }
@@ -382 +406 @@
         public static String getEventStats() {
                 StringBuffer stats = getSessionDateTime();
+                int max = getMax(_EventTimes);
+                int maxWidthEvents = ("" + max).length();
+                int maxWidthRate = (getRate(max)).length();
                 for (int i = 0; i < _EventTimes.length - 1; i++) {
                         String upperBound = getFormattedTime(EVENT_INTERVALS[i]);
-                        appendStat(stats, "<" + upperBound, _EventTimes[i]);
+                        appendStat(stats, "<" + upperBound, _EventTimes[i], true, false,
+                                        maxWidthEvents,maxWidthRate);
                 }
                 int lastIndex = EVENT_INTERVALS.length - 1;
-                appendStat(stats, getFormattedTime(EVENT_INTERVALS[lastIndex - 1])
-                                + "+", _EventTimes[lastIndex]);
+                appendStat(stats, "+"
+                                + getFormattedTime(EVENT_INTERVALS[lastIndex - 1]),
+                                _EventTimes[lastIndex], false, false, maxWidthEvents,maxWidthRate);
                 return stats.toString();
+        }
+
+        /**
+         * Gets the highest number in the list of numbers.
+         * 
+         * @param nums list of numbers
+         * @return highest number in the list
+         */
+        private static int getMax(int[] nums) {
+                int max = 0;
+                for (int i = 0; i < nums.length; i++)
+                        if (nums[i] > max)
+                                max = nums[i];
+                return max;
         }
 
@@ -401 +444 @@
                         time = (secs / 60 / 60) + "h";
                 }
+                if (time.length() == 2)
+                        time = " " + time;
                 return time;
         }
@@ -424 +469 @@
                 _EventTimes[_EventTimes.length - 1]++;
         }
+
+        public static void DeletedItem(Item toDelete) {
+                List<Item> items = new ArrayList<Item>();
+                items.add(toDelete);
+                DeletedItems(items);
+        }
 }

trunk/tests/org/expeditee/gui/FrameIOTest.java

@@ -19 +19 @@
 
         public void testIsValidFramesetName() {
-                assertTrue(FrameIO.IsValidFramesetName("a"));
-                assertTrue(FrameIO.IsValidFramesetName("a1c"));
-                assertFalse(FrameIO.IsValidFramesetName("1a"));
-                assertFalse(FrameIO.IsValidFramesetName("$a"));
-                assertFalse(FrameIO.IsValidFramesetName("a$"));
-                assertFalse(FrameIO.IsValidFramesetName("a.a"));
-                assertFalse(FrameIO.IsValidFramesetName(null));
-                assertFalse(FrameIO.IsValidFramesetName("1"));
+                assertTrue(FrameIO.isValidFramesetName("a"));
+                assertTrue(FrameIO.isValidFramesetName("a1c"));
+                assertFalse(FrameIO.isValidFramesetName("1a"));
+                assertFalse(FrameIO.isValidFramesetName("$a"));
+                assertFalse(FrameIO.isValidFramesetName("a$"));
+                assertFalse(FrameIO.isValidFramesetName("a.a"));
+                assertFalse(FrameIO.isValidFramesetName(null));
+                assertFalse(FrameIO.isValidFramesetName("1"));
                 assertFalse(FrameIO.isValidFrameName(""));
                 assertFalse(FrameIO
-                                .IsValidFramesetName("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz012345678901A"));
+                                .isValidFramesetName("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz012345678901A"));
 
         }

trunk/tests/org/expeditee/io/ConversionTest.java

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Font;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
 
 import junit.framework.TestCase;
 
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 public class ConversionTest extends TestCase {
 
         public final void testGetColor() {
-                assertTrue(Conversion.getColor("100 0 0", Color.white).equals(Color.red));
-                assertTrue(Conversion.getColor("0 100 0", Color.white).equals(Color.green));
-                assertTrue(Conversion.getColor("0 0 100", Color.white).equals(Color.blue));
-                assertTrue(Conversion.getColor("100 100 100", Color.white).equals(Color.white));
-                assertEquals(Color.green,Conversion.getColor("-100 0 100", Color.white));
-                assertEquals(Conversion.getColor("+0 100 0", Color.black),Color.green);
+                assertTrue(Conversion.getColor("100 0 0", Color.white)
+                                .equals(Color.red));
+                assertTrue(Conversion.getColor("0 100 0", Color.white).equals(
+                                Color.green));
+                assertTrue(Conversion.getColor("0 0 100", Color.white).equals(
+                                Color.blue));
+                assertTrue(Conversion.getColor("100 100 100", Color.white).equals(
+                                Color.white));
+                assertEquals(Color.green, Conversion.getColor("-100 +0 -100",
+                                Color.white));
+                assertEquals(Conversion.getColor("+0 +100 +0", Color.black),
+                                Color.green);
                 assertEquals(Color.white, Conversion.getColor("a0a0a0", Color.white));
-                assertEquals(Conversion.getColor("red9", Color.white),new Color(0.9F, 0.0F, 0.0F));
-                assertEquals(Conversion.getColor("BlUe15", Color.white),new Color(0.0F, 0.0F, 1.0F));
-                assertEquals(Conversion.getColor("GREEN0", Color.white),new Color(0.0F, 0.0F, 0.0F));
+                assertEquals(Conversion.getColor("red9", Color.white), new Color(0.9F,
+                                0.0F, 0.0F));
+                assertEquals(Conversion.getColor("BlUe15", Color.white), new Color(
+                                0.0F, 0.0F, 1.0F));
+                assertEquals(Conversion.getColor("GREEN0", Color.white), new Color(
+                                0.0F, 0.0F, 0.0F));
+                assertEquals(Color.red, Conversion.getColor("adf", Color.red));
+                assertEquals(Color.red, Conversion.getColor("none", Color.red));
+                assertEquals(Color.red, Conversion.getColor("null", Color.red));
+                assertEquals(Color.red, Conversion.getColor(null, Color.red));
         }
 
@@ -29 +46 @@
         }
 
-        /*public final void testAdjustIntInt() {
-                fail("Not yet implemented");
-        }
-
-        public final void testAdjustPoint() {
-                fail("Not yet implemented");
-        }
-
-        public final void testDeAdjust() {
-                fail("Not yet implemented");
-        }
-
         public final void testGetKMSFontCode() {
-                fail("Not yet implemented");
+                Font testFont = new Font(Text.FONT_WHEEL[1], Font.BOLD, 18);
+                Font testFont2 = new Font(Text.FONT_WHEEL[4], Font.ITALIC, 20);
+                Font testFont3 = new Font("xxx123", Font.ITALIC | Font.BOLD,
+                                10);
+                Font testFont4 = new Font(Text.FONT_WHEEL[0], Font.PLAIN, 2);
+
+                String result = Text.FONT_CHARS[1] + "b18";
+                assertEquals(result, Conversion.getKMSFontCode(testFont));
+                
+                result = Text.FONT_CHARS[4] + "i20";
+                assertEquals(result, Conversion.getKMSFontCode(testFont2));
+                
+                result = "dp10";
+                assertEquals(result, Conversion.getKMSFontCode(testFont3));
+                
+                result = Text.FONT_CHARS[0] + "r2";
+                assertEquals(result, Conversion.getKMSFontCode(testFont4));
         }
 
         public final void testGetFont() {
-                fail("Not yet implemented");
-        }*/
+                Font testFont = new Font(Text.FONT_WHEEL[1], Font.BOLD, 18);
+                Font testFont2 = new Font(Text.FONT_WHEEL[4], Font.ITALIC, 20);
+                Font testFont3 = new Font(Text.FONT_WHEEL[3], Font.ITALIC | Font.BOLD,
+                                10);
+                Font testFont4 = new Font(Text.FONT_WHEEL[0], Font.PLAIN, 2);
+
+                String code = Text.FONT_CHARS[1] + "b18";
+                assertEquals(testFont, Conversion.getFont(code));
+                
+                code = Text.FONT_CHARS[4] + "i20";
+                assertEquals(testFont2, Conversion.getFont(code));
+                
+                code = Text.FONT_CHARS[3] + "p10";
+                assertEquals(testFont3, Conversion.getFont(code));
+                
+                code = Text.FONT_CHARS[0] + "r2";
+                assertEquals(testFont4, Conversion.getFont(code));
+        }
 
         public final void testGetFrameNumber() {
@@ -65 +102 @@
 
         public final void testGetJustification() {
-                assertEquals(Item.JUSTIFICATION_CENTER, Conversion.getJustification("center"));
-                assertEquals(Item.JUSTIFICATION_CENTER, Conversion.getJustification("c"));
+                assertEquals(Item.JUSTIFICATION_CENTER, Conversion
+                                .getJustification("center"));
+                assertEquals(Item.JUSTIFICATION_CENTER, Conversion
+                                .getJustification("c"));
                 assertEquals(Item.JUSTIFICATION_RIGHT, Conversion.getJustification("R"));
-                assertEquals(Item.JUSTIFICATION_RIGHT, Conversion.getJustification("RIGHT"));
+                assertEquals(Item.JUSTIFICATION_RIGHT, Conversion
+                                .getJustification("RIGHT"));
                 assertEquals(Item.JUSTIFICATION_LEFT, Conversion.getJustification("L"));
-                assertEquals(Item.JUSTIFICATION_LEFT, Conversion.getJustification("lEfT"));
+                assertEquals(Item.JUSTIFICATION_LEFT, Conversion
+                                .getJustification("lEfT"));
                 assertEquals(Item.JUSTIFICATION_FULL, Conversion.getJustification("f"));
-                assertEquals(Item.JUSTIFICATION_FULL, Conversion.getJustification("FuLl"));
-                assertEquals(Item.JUSTIFICATION_NONE, Conversion.getJustification("NONE"));
+                assertEquals(Item.JUSTIFICATION_FULL, Conversion
+                                .getJustification("FuLl"));
+                assertEquals(Item.JUSTIFICATION_NONE, Conversion
+                                .getJustification("NONE"));
         }
 
         public final void testGetKMSJustificationCode() {
-                assertEquals("C", Conversion.getKMSJustificationCode(Item.JUSTIFICATION_CENTER));
-                assertEquals("L", Conversion.getKMSJustificationCode(Item.JUSTIFICATION_LEFT));
-                assertEquals("R", Conversion.getKMSJustificationCode(Item.JUSTIFICATION_RIGHT));
-                assertEquals("F", Conversion.getKMSJustificationCode(Item.JUSTIFICATION_FULL));
-                assertEquals(null, Conversion.getKMSJustificationCode(Item.JUSTIFICATION_NONE));
-                assertEquals(null, Conversion.getKMSJustificationCode(Integer.MAX_VALUE));
-                assertEquals(null, Conversion.getKMSJustificationCode(Integer.MIN_VALUE));
+                assertEquals("C", Conversion
+                                .getKMSJustificationCode(Item.JUSTIFICATION_CENTER));
+                assertEquals("L", Conversion
+                                .getKMSJustificationCode(Item.JUSTIFICATION_LEFT));
+                assertEquals("R", Conversion
+                                .getKMSJustificationCode(Item.JUSTIFICATION_RIGHT));
+                assertEquals("F", Conversion
+                                .getKMSJustificationCode(Item.JUSTIFICATION_FULL));
+                assertEquals(null, Conversion
+                                .getKMSJustificationCode(Item.JUSTIFICATION_NONE));
+                assertEquals(null, Conversion
+                                .getKMSJustificationCode(Integer.MAX_VALUE));
+                assertEquals(null, Conversion
+                                .getKMSJustificationCode(Integer.MIN_VALUE));
         }
 
@@ -89 +139 @@
                 assertEquals("Test", Conversion.Convert(String.class, "Test"));
                 assertEquals(null, Conversion.Convert(String.class, ""));
-                assertEquals(Conversion.getFont("tr16"), Conversion.Convert(Font.class, "tr16"));
+                assertEquals(Conversion.getFont("tr16"), Conversion.Convert(Font.class,
+                                "tr16"));
+                // Test Color Conversion
+                assertEquals(Color.darkGray, Conversion.Convert(Color.class,
+                                "dark_gray"));
+                assertEquals(Color.darkGray, Conversion
+                                .Convert(Color.class, "DARKGRAY"));
                 assertEquals(Color.red, Conversion.Convert(Color.class, "red"));
                 assertEquals(Color.red, Conversion.Convert(Color.class, "Red"));
@@ -96 +152 @@
                 assertEquals(Color.green, Conversion.Convert(Color.class, "0  100"));
                 assertEquals(Color.blue, Conversion.Convert(Color.class, "0 0 100"));
+                // Test Boolean Conversion
+                assertEquals(true, Conversion.Convert(boolean.class, "tRuE"));
+                assertEquals(true, Conversion.Convert(boolean.class, "T"));
+                assertEquals(true, Conversion.Convert(boolean.class, "yes"));
+                assertEquals(true, Conversion.Convert(boolean.class, "Y"));
+                assertEquals(true, Conversion.Convert(boolean.class, ""));
+                assertEquals(false, Conversion.Convert(boolean.class, "FALSE"));
+                assertEquals(false, Conversion.Convert(boolean.class, "no"));
+                assertEquals(false, Conversion.Convert(boolean.class, "n"));
+                assertEquals(false, Conversion.Convert(boolean.class, "f"));
         }
 
         public final void testConvertClassStringObject() {
-                assertEquals(Color.red, Conversion.Convert(Color.class, "+100 0 -100", Color.blue));
-                assertEquals(Color.black, Conversion.Convert(Color.class, "-0 0 100", Color.blue));
-                //TODO add more stuff to here
+                assertEquals(Color.red, Conversion.Convert(Color.class, "+100 +0 -100",
+                                Color.blue));
+                assertEquals(Color.black, Conversion.Convert(Color.class, "-0 +0 -100",
+                                Color.blue));
+                // Float test
+                assertEquals(2.0F, Conversion.Convert(float.class, "2.0", null));
+                assertEquals(-8.0F, Conversion.Convert(float.class, "+2.0", -10.0F));
+                assertEquals(8.0F, Conversion.Convert(float.class, "-2.0", 10.0F));
+                // Double test
+                assertEquals(2.0, Conversion.Convert(double.class, "2.0", null));
+                assertEquals(-8.0, Conversion.Convert(double.class, "+2.0", -10.0));
+                assertEquals(8.0, Conversion.Convert(double.class, "-2.0", 10.0));
+                // Integer test
+                assertEquals(2, Conversion.Convert(int.class, "2", null));
+                assertEquals(-8, Conversion.Convert(int.class, "+2", -10));
+                assertEquals(8, Conversion.Convert(int.class, "-2", 10));
         }
 
@@ -111 +190 @@
 
         public final void testConvertToKMS() {
+                try {
+                        java.lang.reflect.Method getPosition = Item.class.getMethod(
+                                        "getPosition", new Class[] {});
+                        java.lang.reflect.Method getJustification = Text.class.getMethod(
+                                        "getJustification", new Class[] {});
+
+                        assertEquals("C", Conversion.ConvertToKMS(getJustification,
+                                        Item.JUSTIFICATION_CENTER));
+
+                        assertEquals("Test", Conversion.ConvertToKMS(getPosition,
+                                        (Object) "Test"));
+                        assertEquals("0", Conversion.ConvertToKMS(getPosition, (Object) 0));
+                        assertEquals("0.0", Conversion.ConvertToKMS(getPosition,
+                                        (Object) 0.0F));
+                        assertEquals(null, Conversion.ConvertToKMS(getPosition,
+                                        (new Integer(-1))));
+                        assertEquals(null, Conversion.ConvertToKMS(getPosition, (new Float(
+                                        -0.1F))));
+                        assertEquals(null, Conversion.ConvertToKMS(getPosition,
+                                        (new Boolean(true))));
+                        assertEquals("F", Conversion.ConvertToKMS(getPosition,
+                                        (new Boolean(false))));
+                        assertEquals(null, Conversion.ConvertToKMS(getPosition,
+                                        (new int[] {})));
+                        assertEquals("1 22 333", Conversion.ConvertToKMS(getPosition,
+                                        (new int[] { 1, 22, 333 })));
+
+                        assertEquals("22 44", Conversion.ConvertToKMS(getPosition,
+                                        (new Point(22, 44))));
+
+                        assertEquals("100 0 0", Conversion.ConvertToKMS(getPosition,
+                                        Color.red));
+
+                        assertEquals(null, Conversion.ConvertToKMS(getPosition, null));
+                        List<String> testList = new ArrayList<String>();
+                        testList.add("test");
+
+                        assertEquals(testList, Conversion.ConvertToKMS(getPosition,
+                                        testList));
+
+                        Font testFont = new Font(Text.FONT_WHEEL[1], Font.BOLD, 18);
+                        String result = Text.FONT_CHARS[1] + "b18";
+                        assertEquals(result, Conversion.ConvertToKMS(getPosition, testFont));
+                } catch (Exception e) {
+                        e.printStackTrace();
+                        fail();
+                }
         }