Changeset 105

Timestamp:

06/20/08 12:55:35 (16 years ago)

Author:

ra33

Message:

Made a whole lot of changes...

Including using polyLine etc for drawing rectangles nicer

Location:

trunk

Files:

• src/org/expeditee/actions/Misc.java (modified) (6 diffs)
• src/org/expeditee/actions/NavigationActions.java (modified) (1 diff)
• src/org/expeditee/actions/Simple.java (modified) (1 diff)
• src/org/expeditee/gui/DisplayIO.java (modified) (12 diffs)
• src/org/expeditee/gui/Frame.java (modified) (5 diffs)
• src/org/expeditee/gui/FrameGraphics.java (modified) (13 diffs)
• src/org/expeditee/gui/FrameIO.java (modified) (7 diffs)
• src/org/expeditee/gui/FrameKeyboardActions.java (modified) (21 diffs)
• src/org/expeditee/gui/FrameMouseActions.java (modified) (32 diffs)
• src/org/expeditee/gui/FrameUtils.java (modified) (5 diffs)
• src/org/expeditee/gui/Vector.java (modified) (2 diffs)
• src/org/expeditee/io/ExpReader.java (modified) (2 diffs)
• src/org/expeditee/io/ExpWriter.java (modified) (2 diffs)
• src/org/expeditee/items/Item.java (modified) (12 diffs)
• src/org/expeditee/items/Line.java (modified) (13 diffs)
• src/org/expeditee/items/Picture.java (modified) (1 diff)
• src/org/expeditee/items/Text.java (modified) (5 diffs)
• src/org/expeditee/stats/CometStats.java (modified) (4 diffs)
• src/org/expeditee/stats/SessionStats.java (modified) (12 diffs)
• src/org/expeditee/stats/TreeStats.java (modified) (3 diffs)
• tests/org/expeditee/items/LineTest.java (added)

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

@@ -30 +30 @@
 
 /**
- * A list of miscellaneous KMS Actions and Actions specific to Expeditee
+ * A list of miscellaneous Actions and Actions specific to Expeditee
  * 
  */
@@ -181 +181 @@
                 // copy the item and switch
                 item = item.copy();
-                item.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                item.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 item.setParent(null);
 
@@ -238 +238 @@
                 FrameGraphics.DisplayMessage("Computing comet stats...");
 
-                CometStats cometStats = new CometStats(frame, true);
+                CometStats cometStats = new CometStats(frame);
                 CreateTextItem(cometStats.toString());
                 FrameGraphics.OverwriteMessage("Comet stats time: "
@@ -248 +248 @@
                 FrameGraphics.DisplayMessage("Computing tree stats...");
 
-                TreeStats treeStats = new TreeStats(frame, true);
+                TreeStats treeStats = new TreeStats(frame);
                 CreateTextItem(treeStats.toString());
                 FrameGraphics.OverwriteMessage("Tree stats time: "
@@ -299 +299 @@
                 text.setText(fileContents);
 
-                text.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                text.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 text.setSize(FRAME_FILE_FONT_SIZE);
 
@@ -324 +324 @@
                 text.setText(fontsList.toString());
 
-                text.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                text.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 text.setSize(FRAME_FILE_FONT_SIZE);
 

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

@@ -11 +11 @@
 
 /**
- * Provides the Navigation related KMS action procedures
+ * Provides the Navigation related action procedures
  * 
  * @author jdm18

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

@@ -2109 +2109 @@
 
                         int initialX = DisplayIO.getMouseX();
-                        int initialY = DisplayIO.getMouseY();
+                        int initialY = FrameMouseActions.getY();
 
                         final int timeInterval = 40;

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

@@ -58 +58 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp16Jun2008A";
+        public static final String TITLE = "Exp20Jun2008A";
 
         private DisplayIO() {
@@ -81 +81 @@
         }
 
-        public static void setTextCursor(int size) {
-                setTextCursor(size, false);
-        }
-
-        public static void setTextCursor(int size, boolean newSize) {
-                if (!newSize && cursorType == Item.TEXT_CURSOR)
+        public static void setTextCursor(Text text, int cursorMovement) {
+                setTextCursor(text, cursorMovement, false);
+        }
+
+        public static void setTextCursor(Text text, int cursorMovement,
+                        boolean newSize) {
+
+                int size = text.getSize();
+                Point newMouse = text.moveCursor(cursorMovement, DisplayIO.getMouseX(),
+                                FrameMouseActions.getY());
+
+                if (!newSize && cursorType == Item.TEXT_CURSOR) {
+                        if (cursorMovement != 0)
+                                DisplayIO.setCursorPosition(newMouse, false);
                         return;
+                }
 
                 cursorType = Item.TEXT_CURSOR;
@@ -126 +135 @@
                                 image, new Point(0, hotspotPos), "textcursor");
                 _Browser.setCursor(textCursor);
+                DisplayIO.setCursorPosition(newMouse, false);
         }
 
@@ -169 +179 @@
          *            The y coordinate
          */
-        public static void setCursorPosition(int x, int y) {
+        public static void setCursorPosition(float x, float y) {
                 setCursorPosition(x, y, true);
         }
 
-        public static void setCursorPosition(int x, int y, boolean forceArrow) {
+        public static void setCursorPosition(float x, float y, boolean forceArrow) {
                 // Adjust the position to move the mouse to to account for being in
                 // TwinFramesMode
@@ -183 +193 @@
                 }
 
-                int deltax = x - FrameMouseActions.MouseX;
-                int deltay = y - FrameMouseActions.MouseY;
+                float deltax = x - FrameMouseActions.MouseX;
+                float deltay = y - FrameMouseActions.MouseY;
 
                 // When the Robot moves the cursor... a short time later a mouseMoved
@@ -203 +213 @@
                 int mouseX = (int) _Browser.getContentPane().getLocationOnScreen()
                                 .getX()
-                                + x;
+                                + (int) (x + 0.5);
                 int mouseY = (int) _Browser.getContentPane().getLocationOnScreen()
                                 .getY()
-                                + y;
+                                + (int) (y + 0.5);
                 _Robot.mouseMove(mouseX, mouseY);
                 // System.out.println("MouseMoved: " + x + "," + y);
@@ -261 +271 @@
                 int side = getCurrentSide();
 
-//              // do not allow duplicate frames
-//              if (_VisitedFrames[side].size() > 0)
-//                      if (_VisitedFrames[side].peek().equals(toAdd.getName())) {
-//                              return;
-//                      }
+                // // do not allow duplicate frames
+                // if (_VisitedFrames[side].size() > 0)
+                // if (_VisitedFrames[side].peek().equals(toAdd.getName())) {
+                // return;
+                // }
 
                 Item ip = FrameUtils.getCurrentItem();
@@ -272 +282 @@
                 else
                         _VisitedFrames[side].push(toAdd.getName());
-                
-                //System.out.println("Added: " + _VisitedFrames[side].size());
+
+                // System.out.println("Added: " + _VisitedFrames[side].size());
         }
 
@@ -283 +293 @@
                         _VisitedFrames[side].pop();
                 }
-                //System.out.println("Removed: " + _VisitedFrames[side].size());
+                // System.out.println("Removed: " + _VisitedFrames[side].size());
         }
 
@@ -543 +553 @@
          * @return The X coordinate of the mouse.
          */
+        public static float getFloatMouseX() {
+                if (_TwinFrames
+                                && FrameMouseActions.MouseY < FrameGraphics.getMaxSize().height)
+                        return FrameMouseActions.MouseX % (_Browser.getWidth() / 2);
+
+                return FrameMouseActions.MouseX;
+        }
+
+        /**
+         * Returns the current mouse X coordinate. This coordinate is relative to
+         * the left edge of the frame the mouse is in. It takes into account the
+         * user being in twin frames mode.
+         * 
+         * @return The X coordinate of the mouse.
+         */
         public static int getMouseX() {
-                if (_TwinFrames && getMouseY() < FrameGraphics.getMaxSize().height)
-                        return FrameMouseActions.MouseX % (_Browser.getWidth() / 2);
-
-                return FrameMouseActions.MouseX;
-        }
-
-        /**
-         * Returns the current mouse Y coordinate. This is relative to the top of
-         * the frame.
-         * 
-         * @return The Y coordinate of the mouse.
-         */
-        public static int getMouseY() {
-                return FrameMouseActions.MouseY;
-        }
-
-        public static int getRealMouseX() {
-                return FrameMouseActions.MouseX;
-        }
-
-        public static int getRealMouseY() {
-                return FrameMouseActions.MouseY;
+                return Math.round(getFloatMouseX());
         }
 
@@ -589 +593 @@
                         FrameIO.SuspendCache();
                 Frame frame = FrameIO.LoadFrame(_VisitedFrames[side].pop());
-                //If the top frame on the backup stack is the current frame go back again...
-                if(frame.equals(getCurrentFrame())){
+                // If the top frame on the backup stack is the current frame go back
+                // again...
+                if (frame.equals(getCurrentFrame())) {
                         Back();
                         return;
@@ -708 +713 @@
          */
         public static void MoveCursorToEndOfItem(Item i) {
-                setCursorPosition(i.getPosition());
-                Point newMouse = ((Text) i).moveCursor(Text.END, getMouseX(),
-                                getMouseY());
-                setTextCursor(((Item) i).getSize());
-                setCursorPosition(newMouse, false);
+                setTextCursor((Text) i, Text.END);
         }
 }

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

@@ -31 +31 @@
 
 /**
- * Represents a KMS Frame that is displayed on the screen. Also is a registered
+ * Represents a Expeditee Frame that is displayed on the screen. Also is a registered
  * MouseListener on the Browser, and processes any MouseEvents directly.
  * 
@@ -400 +400 @@
                 t.setMaxSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
                 t.setText(itemText);
-                t.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                t.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 
                 //The next line is needed to allow the link to be set properly when the item is picked up
@@ -765 +765 @@
          * @return The version of this Frame.
          */
-        public int getVersion(boolean increment) {
-                // System.out.println("Version: " + _version);
-                if (increment)
-                        _version++;
+        public int getVersion() {
                 return _version;
-        }
-
-        public int getVersion() {
-                return getVersion(true);
         }
 
@@ -1311 +1304 @@
                 t.setID(getNextItemID());
                 t.setMaxSize(FrameGraphics.getMaxFrameSize());
-                t.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                t.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 t.setText("");
                 t.setParent(this);
@@ -1318 +1311 @@
 
         public Item createDot() {
-                Item dot = new Dot(DisplayIO.getMouseX(), DisplayIO.getMouseY(),
+                Item dot = new Dot(DisplayIO.getMouseX(), FrameMouseActions.getY(),
                                 getNextItemID());
 

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

@@ -12 +12 @@
 import java.awt.Point;
 import java.awt.RenderingHints;
+import java.awt.Stroke;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -74 +77 @@
 
         // The link to the message frameset
-        public static Item MessageLink= new Text(-2, "@" + MESSAGES_FRAMESET_NAME,Color.black, Color.white);
+        public static Item MessageLink = new Text(-2, "@" + MESSAGES_FRAMESET_NAME,
+                        Color.black, Color.white);
 
         // creator for creating the message frames
         private static FrameCreator _creator;
-        
+
         /**
          * If Audience Mode is on this method will toggle it to be off, or
@@ -140 +144 @@
                 int newMaxHeight = max.height
                                 - (isAudienceMode() ? 0 : MESSAGE_BUFFER_HEIGHT);
-                if (newMaxHeight > 0)
+                if (newMaxHeight > 0) {
                         _MaxSize.setSize(max.width, newMaxHeight);
+                }
 
                 if (DisplayIO.getCurrentFrame() != null) {
@@ -237 +242 @@
          */
         public static void AddAllVectorItems(List<Item> items, Frame vector,
-                        Collection<Frame> seenVectors, Point origin, Float scale) {
+                        Collection<Frame> seenVectors, Point origin, Float scale,
+                        Color defaultForeground, Color defaultBackground) {
 
                 // Check all the vector items and add the items on the vectors
-
                 if (seenVectors.contains(vector))
                         return;
@@ -251 +256 @@
                         AddAllVectorItems(items, o.Frame, new HashSet<Frame>(seenVectors),
                                         new Point(originX + Math.round(o.Origin.x * scale), originY
-                                                        + Math.round(o.Origin.y * scale)), o.Scale * scale);
+                                                        + Math.round(o.Origin.y * scale)), o.Scale * scale,
+                                        o.Foreground, o.Background);
                 // if its the original frame then were done
                 if (origin == null) {
@@ -273 +279 @@
                         i.setActionMark(false);
                         if (!(i instanceof Line)) {
-                                i.setPosition((int) (i.getX() * scale + dx + 0.5), (int) (i
-                                                .getY()
+                                i.setXY((int) (i.getX() * scale + dx + 0.5), (int) (i.getY()
                                                 * scale + dy + 0.5));
                                 i.setThickness((int) (i.getThickness() * scale + 0.5));
@@ -280 +285 @@
                                                 .setArrowheadLength((int) (i.getArrowheadLength()
                                                                 * scale + 0.5));
+                                if (i.getColor() == null) {
+                                        i.setColor(defaultForeground);
+                                }
+                                if (i.getBackgroundColor() == null) {
+                                        i.setBackgroundColor(defaultBackground);
+                                }
+                                if (i.getFillColor() == null) {
+                                        i.setFillColor(defaultBackground);
+                                }
                         }
                         if (i instanceof Text)
@@ -364 +378 @@
 
                         AddAllVectorItems(paintItems, toPaint, new LinkedList<Frame>(),
-                                        null, 1F);
+                                        null, 1F, null, null);
 
                         if (isActualFrame) {
@@ -404 +418 @@
                                                                         ^ line.getStartItem().isFloating()) {
                                                                 lines.add(TransposeLine(line,
-                                                                                line.getEndItem(), toPaint, DisplayIO
-                                                                                                .getRealMouseX(), -DisplayIO
+                                                                                line.getEndItem(), toPaint,
+                                                                                FrameMouseActions.getY(), -DisplayIO
                                                                                                 .getMiddle()));
                                                                 lines.add(TransposeLine(line, line
-                                                                                .getStartItem(), toPaint, DisplayIO
-                                                                                .getRealMouseX(), -DisplayIO
-                                                                                .getMiddle()));
+                                                                                .getStartItem(), toPaint,
+                                                                                FrameMouseActions.getY(), -DisplayIO
+                                                                                                .getMiddle()));
                                                         }
                                                 } else {
@@ -604 +618 @@
 
         private static void PaintLines(Graphics2D g, List<Item> toPaint) {
+                Stroke oldStroke = g.getStroke();
+                // Use this set to keep track of the items that have been painted
+                Collection<Item> done = new HashSet<Item>();
                 for (Item i : toPaint)
-                        if (i instanceof Line)
-                                PaintItem(g, i);
+                        if (i instanceof Line) {
+                                Line l = (Line)i;
+                                if (done.contains(l)) {
+                                        l.paintArrows(g);
+                                } else {
+                                        // When painting a line all connected lines are painted too
+                                        done.addAll(l.getAllConnected());
+                                        if (l.getStartItem().getEnclosedArea() == 0)
+                                                PaintItem(g, i);
+                                }
+                        }
+                g.setStroke(oldStroke);
         }
 
         private static void PaintPictures(Graphics2D g, List<Item> toPaint) {
+                // Use this set to keep track of the items that dont need to be
+                // repainted
+                Collection<Item> done = new HashSet<Item>();
+                List<Item> toFill = new LinkedList<Item>();
                 for (Item i : toPaint) {
+                        // Ignore items that have already been done!
+                        if (done.contains(i))
+                                continue;
                         if (i instanceof Picture) {
                                 PaintItem(g, i);
                         } else if (i.isLineEnd()
                                         && (!isAudienceMode() || !i.isConnectedToAnnotation())) {
-                                i.paintFill(g);
-                        }
+                                toFill.add(i);
+                                done.addAll(i.getAllConnected());
+                        }
+                }
+                //Sort the items to fill
+                Collections.sort(toFill, new Comparator<Item>() {
+                        public int compare(Item a, Item b) {
+                                Integer aArea = a.getEnclosedArea();
+                                Integer bArea = b.getEnclosedArea();
+                                return aArea.compareTo(bArea) * -1;
+                        }
+                });
+                for(Item i: toFill){
+                        i.paintFill(g);
+                        PaintItem(g, i.getLines().get(0));
                 }
         }
@@ -635 +682 @@
                         // Check if within 20% of the end of the line
                         Line l = (Line) i;
-                        Item toDisconnect = l.getEndPointToDisconnect(
-                                        FrameMouseActions.MouseX, FrameMouseActions.MouseY);
+                        Item toDisconnect = l.getEndPointToDisconnect(Math
+                                        .round(FrameMouseActions.MouseX), Math
+                                        .round(FrameMouseActions.MouseY));
 
                         // Brook: Widget Edges do not have such a context
@@ -658 +706 @@
                         }
                 } else {
+                        //FrameGraphics.ChangeSelectionMode(i,
+                        //              Item.SelectedMode.Normal);
+                        //For polygons need to make sure all other endpoints are unHighlighted
+                        for (Item conn : i.getAllConnected()) {
+                                conn.setSelectedMode(Item.SelectedMode.None);
+                        }
                         i.setSelectedMode(Item.SelectedMode.Normal);
                 }
@@ -785 +839 @@
                 Text last = Messages[Messages.length - 1];
                 last.setColor(color);
-                //Make set the text for the new message
+                // Make set the text for the new message
                 last.setText(getMessagePrefix(true) + message);
                 last.setLink(link);

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

@@ -9 +9 @@
 import java.io.FileWriter;
 import java.io.IOException;
+import java.sql.Time;
 import java.util.HashMap;
 
@@ -629 +630 @@
          * 
          * @param toSave
-         *            The Frame to save to disk in KMS format.
+         *            The Frame to save to disk
          */
         public static String SaveFrame(Frame toSave) {
@@ -645 +646 @@
          * 
          * @param toSave
-         *            The Frame to save to disk in KMS format.
+         *            The Frame to save to disk
          * @param inc
          *            True if the saved frames counter should be incremented, false
@@ -655 +656 @@
                         boolean checkBackup) {
 
-                if (toSave == null)
+                // TODO When loading a frame maybe append onto the event history too- with a
+                // break to indicate the end of a session
+
+                if (toSave == null ||!toSave.hasChanged() || toSave.isSaved()){
+                        SessionStats.NewFrameSession();
                         return "";
-
-                if (!toSave.hasChanged() || toSave.isSaved())
-                        return "";
-
+                }
                 // Get the full path only to determine which format to use for saving
                 // the frame
@@ -672 +674 @@
                                 && toSave.getNameItem().Permission < Item.PERMISSION_TDFC) {
                         _Cache.remove(toSave.getName().toLowerCase());
+                        SessionStats.NewFrameSession();
                         return "";
                 }
@@ -694 +697 @@
                         }
                         // Check if we are trying to save an out of date version
-                        if (savedVersion > toSave.getVersion(false)
+                        if (savedVersion > toSave.getVersion()
                                         && !toSave.getFramesetName().equalsIgnoreCase(
                                                         FrameGraphics.MESSAGES_FRAMESET_NAME)) {
@@ -741 +744 @@
                                 ResumeCache();
                         }
-                        toSave.setActiveTime(SessionStats.getFrameActiveTime());
-                        toSave.setDarkTime(SessionStats.getFrameDarkTime());
+                        // Update general stuff about frame
                         toSave.setLastModifyDate(Logger.EasyDateFormat("ddMMMyyyy:HHmm"));
                         toSave.setLastModifyUser(UserSettings.Username);
+                        toSave.setVersion(toSave.getVersion() + 1);
+                        Time darkTime = new Time(SessionStats.getFrameDarkTime().getTime()
+                                        + toSave.getDarkTime().getTime());
+                        Time activeTime = new Time(SessionStats.getFrameActiveTime()
+                                        .getTime()
+                                        + toSave.getActiveTime().getTime());
+                        toSave.setDarkTime(darkTime);
+                        toSave.setActiveTime(activeTime);
+
                         writer.writeFrame(toSave);
                         toSave.setSaved();
-                        if (inc)
+                        if (inc) {
                                 SessionStats.SavedFrame(toSave.getName());
+                        }
 
                         // avoid out-of-sync frames (when in TwinFrames mode)

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

@@ -136 +136 @@
                         FrameUtils.LastEdited = text;
                         DisplayIO.getCurrentFrame().addItem(text);
-                        DisplayIO.setTextCursor(text.getSize());
-                        return;
-                }
-
-                DisplayIO.setTextCursor(text.getSize());
+                        DisplayIO.setTextCursor(text, Text.NONE);
+                        return;
+                }
+
+                DisplayIO.setTextCursor(text, Text.NONE);
                 Point newMouse = null;
                 if (ch == '\t') {
                         if (isShiftDown) {
-                                newMouse = text.removeTab(ch, DisplayIO.getMouseX(), DisplayIO
-                                                .getMouseY());
+                                newMouse = text.removeTab(ch, DisplayIO.getMouseX(),
+                                                FrameMouseActions.getY());
                         } else {
-                                newMouse = text.insertTab(ch, DisplayIO.getMouseX(), DisplayIO
-                                                .getMouseY());
+                                newMouse = text.insertTab(ch, DisplayIO.getMouseX(),
+                                                FrameMouseActions.getY());
                         }
                 } else {
-                        newMouse = text.insertChar(ch, DisplayIO.getMouseX(), DisplayIO
-                                        .getMouseY());
+                        newMouse = text.insertChar(ch, DisplayIO.getMouseX(),
+                                        FrameMouseActions.getY());
                 }
                 DisplayIO.setCursorPosition(newMouse.x, newMouse.y, false);
 
+                //This repaint is needed for WINDOWS only?!?!? Mike is not sure why!
+                if(ch == KeyEvent.VK_DELETE)
+                        FrameGraphics.Repaint();
+                
                 // a change has occured to the Frame
                 text.getParent().setChanged(true);
@@ -229 +233 @@
                 Text t = DisplayIO.getCurrentFrame().createBlankText("" + start);
 
-                Point newMouse = t.insertChar(start, DisplayIO.getMouseX(), DisplayIO
-                                .getMouseY());
+                Point newMouse = t.insertChar(start, DisplayIO.getMouseX(),
+                                FrameMouseActions.getY());
                 DisplayIO.setCursorPosition(newMouse.x, newMouse.y, false);
 
@@ -248 +252 @@
 
         private void move(int direction) {
-                Item ip = FrameUtils.getCurrentItem();
-
-                if (ip == null) {
+                Item on = FrameUtils.getCurrentItem();
+
+                if (on == null) {
                         navigateFrame(direction);
                         return;
                 }
 
-                Item on = ip;
                 if (on instanceof Text) {
                         // When the user hits the left and right button with mouse
@@ -264 +267 @@
                         } else {
                                 FrameUtils.LastEdited = on;
-                                Point newMouse = ((Text) on).moveCursor(direction, DisplayIO
-                                                .getMouseX(), DisplayIO.getMouseY());
-                                DisplayIO.setTextCursor(((Item) on).getSize());
-                                DisplayIO.setCursorPosition(newMouse, false);
+                                DisplayIO.setTextCursor((Text) on, direction);
                         }
                 }
@@ -323 +323 @@
                         return;
                 } else if (e.isControlDown() && e.getKeyCode() != KeyEvent.VK_CONTROL)
-                        controlChar(e, KeyEvent.getKeyText(e.getKeyCode()));
+                        controlChar(e, e.getKeyCode());
 
                 switch (e.getKeyCode()) {
@@ -392 +392 @@
                 if (currentItem == null) {
                         // find the nearest item in the correct direction
-                        int currY = DisplayIO.getMouseY();
+                        int currY = FrameMouseActions.getY();
                         for (int i = 0; i < textItems.size(); i++) {
                                 Item t = textItems.get(i);
@@ -473 +473 @@
         }
 
+        private static void copyItemToClipboard(Item on){
+                if (on == null || !(on instanceof Text))
+                        return;
+
+                String text = "";
+
+                List<String> lines = ((Text) on).getTextList();
+                for (String s : lines)
+                        text += s + "\n";
+                // remove the last '\n'
+                text = text.substring(0, text.length() - 1);
+
+                // add the text of the item to the clipboard
+                StringSelection selection = new StringSelection(text);
+                Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                                selection, null);
+        }
+        
         /**
          * Processes all control character keystrokes. Currently Ctrl+C and Ctrl+V
@@ -480 +498 @@
          *            The character being pressed along with the control key
          */
-        private static void controlChar(KeyEvent e, String ch) {
-                if (ch.length() > 1)
-                        return;
+        private static void controlChar(KeyEvent e, int key) {
                 Logger.Log(Logger.USER, Logger.CONTROL_CHAR, "User pressing: Ctrl+"
-                                + ch);
+                                + KeyEvent.getKeyText(key));
                 //
                 // if (FrameUtils.getCurrentItem() == null
@@ -495 +511 @@
                 Frame currentFrame = DisplayIO.getCurrentFrame();
                 // Link or delink an item
-                if (ch.charAt(0) == KeyEvent.VK_L) {
+                if (key == KeyEvent.VK_L) {
                         // If its not linked then link it to its self
                         if (current instanceof Text && current.getLink() == null) {
@@ -508 +524 @@
                                 current.setLink(null);
                         }
-                } else if (ch.charAt(0) == KeyEvent.VK_G) {
+                } else if (key == KeyEvent.VK_G) {
                         // If its not linked then link it to its self
                         if (current instanceof Text) {
@@ -522 +538 @@
                                 return;
                         }
-                } else if (ch.charAt(0) == KeyEvent.VK_A) {
+                } else if (key == KeyEvent.VK_A) {
                         // If its not linked then link it to its self
                         if (current instanceof Text && current.getAction() == null) {
@@ -543 +559 @@
                                 current.setActions(null);
                         }
-                } else if (ch.charAt(0) == KeyEvent.VK_V) {
+                } else if (key == KeyEvent.VK_V) {
                         try {
                                 // read in the data from the clipboard
@@ -573 +589 @@
 
                                         String temp = "";
-                                        int y = DisplayIO.getMouseY();
+                                        int y = FrameMouseActions.getY();
 
                                         // separate the clipboard content into items based on
@@ -595 +611 @@
                         }
                         // if this is a copy command
-                } else if (ch.charAt(0) == KeyEvent.VK_C) {
-                        Item ip = FrameUtils.getCurrentItem();
-
-                        if (ip != null && ip.Permission < Item.PERMISSION_COPY) {
+                } else if (key == KeyEvent.VK_C) {
+                        Item on = FrameUtils.getCurrentItem();
+                        if (on != null && on.Permission < Item.PERMISSION_COPY) {
                                 FrameGraphics
-                                                .DisplayMessage("Insufficient permission to copy that item");
-                                return;
-                        }
-
-                        Item on = null;
-                        if (ip != null)
-                                on = ip;
-
-                        if (on == null || !(on instanceof Text))
-                                return;
-
-                        String text = "";
-
-                        List<String> lines = ((Text) on).getTextList();
-                        for (String s : lines)
-                                text += s + "\n";
-                        // remove the last '\n'
-                        text = text.substring(0, text.length() - 1);
-
-                        // add the text of the item to the clipboard
-                        StringSelection selection = new StringSelection(text);
-                        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
-                                        selection, null);
-                        FrameGraphics.DisplayMessage("Item copied to clipboard");
-                        return;
-                } else if (ch.charAt(0) == KeyEvent.VK_D) {
+                                                .DisplayMessage("Insufficient permission to copy that item" );
+                                return;
+                        }
+                        copyItemToClipboard(on);
+                        //FrameGraphics.DisplayMessage("Item copied to clipboard");
+                        return;
+                } else if (key == KeyEvent.VK_X) {
+                        Item on = FrameUtils.getCurrentItem();
+                        if (on != null && on.Permission < Item.PERMISSION_FULL) {
+                                FrameGraphics
+                                                .DisplayMessage("Insufficient permission to cut that item" );
+                                return;
+                        }
+                        copyItemToClipboard(on);
+                        FrameMouseActions.delete(current);
+                        return;
+                }else if (key == KeyEvent.VK_D) {
                         // perform a delete operation
                         processChar((char) KeyEvent.VK_DELETE, e.isShiftDown());
+                } else if (key == KeyEvent.VK_DELETE) {
+                        // perform a delete operation
                         FrameMouseActions.delete(current);
-                } else if (ch.charAt(0) == KeyEvent.VK_F) {
+                } else if (key == KeyEvent.VK_F) {
                         // perform a delete operation
                         Actions.PerformAction(currentFrame, null, "Format");
                         return;
-                } else if (ch.charAt(0) == KeyEvent.VK_J) {
+                } else if (key == KeyEvent.VK_J) {
 
                         Text text = getCurrentTextItem();
@@ -644 +652 @@
 
                         text.setJustification(Justification.left);
-                } else if (ch.charAt(0) == KeyEvent.VK_S) {
+                } else if (key == KeyEvent.VK_S) {
                         // split the current text item
                         Text text = getCurrentTextItem();
@@ -788 +796 @@
                 case SizeUp:
                         SetSize(on, repeat, true);
-                        DisplayIO.setTextCursor(on.getSize(), true);
+                        if (on instanceof Text) {
+                                DisplayIO.setTextCursor((Text) on, Text.NONE, true);
+                        }
                         break;
                 case SizeDown:
                         SetSize(on, -repeat, true);
-                        DisplayIO.setTextCursor(on.getSize(), true);
+                        if (on instanceof Text) {
+                                DisplayIO.setTextCursor((Text) on, Text.NONE, true);
+                        }
                         break;
                 case ChangeColor:
@@ -952 +964 @@
                                                 }
                                                 // Add the bullet text to the item
-                                                dummyItem.setPosition(DisplayIO.getMouseX(), DisplayIO
-                                                                .getMouseY());
+                                                dummyItem.setPosition(DisplayIO.getMouseX(),
+                                                                FrameMouseActions.getY());
                                         } else {
                                                 FrameGraphics
@@ -959 +971 @@
                                                 // ensures correct repainting when items don't move
                                                 DisplayIO.setCursorPosition(DisplayIO.getMouseX(),
-                                                                DisplayIO.getMouseY());
+                                                                FrameMouseActions.getY());
                                                 return;
                                         }
@@ -1222 +1234 @@
                                 dot.setThickness(current);
                         } else {
-                                int current = Math.abs(i.getSize());
-                                current = Math.max(current + diff, 1);
-                                i.setSize(current);
+                                int oldSize = Math.abs(i.getSize());
+                                int newSize = Math.max(oldSize + diff, 1);
+                                i.setSize(newSize);
+                                if (i instanceof Text) {
+                                        // Move the cursor as close as we can to where it should be
+                                        int itemX = i.getX();
+                                        int itemY = i.getY();
+                                        float resizeRatio = (float) newSize / oldSize;
+                                        float fromOriginX = DisplayIO.getFloatMouseX() - itemX;
+                                        float fromOriginY = FrameMouseActions.MouseY - itemY;
+                                        float newX = itemX + fromOriginX * resizeRatio;
+                                        float newY = itemY + fromOriginY * resizeRatio;
+                                        if (i instanceof Text)
+                                                newY--;
+                                        DisplayIO.setCursorPosition(newX, newY, false);
+                                        toSet.getParent().setChanged(true);
+                                        return;
+                                }
                         }
                 }
@@ -1230 +1257 @@
                 // center the mouse cursor on the item
                 if (moveCursor && toSet != null) {
-                        if (!toSet.contains(DisplayIO.getMouseX(), DisplayIO.getMouseY())) {
+                        if (!toSet
+                                        .contains(DisplayIO.getMouseX(), FrameMouseActions.getY())) {
                                 int x = DisplayIO.getMouseX();
-                                int y = DisplayIO.getMouseY();
+                                int y = FrameMouseActions.getY();
 
                                 if (!toSet.contains(x, toSet.getY()))
@@ -1247 +1275 @@
                                                                         .getBoundsHeight()));
 
-                                DisplayIO.setCursorPosition(x, y);
+                                DisplayIO.setCursorPosition(x, y, false);
                         }
 

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

@@ -87 +87 @@
          * The last known mouse X coordinate
          */
-        public static int MouseX;
+        public static float MouseX;
 
         /**
@@ -93 +93 @@
          * application.
          */
-        public static int MouseY;
+        public static float MouseY;
 
         // Distance of mouse cursor from the origin of the item that was picked up
@@ -335 +335 @@
                         _lastRanged = (Text) on;
                         // set start-drag point
-                        _lastRanged.setSelectionStart(DisplayIO.getMouseX(), DisplayIO
-                                        .getMouseY());
+                        _lastRanged.setSelectionStart(DisplayIO.getMouseX(), FrameMouseActions.getY());
                 }
 
@@ -343 +342 @@
                         _lastCropped = (Picture) on;
                         // set start crop point
-                        _lastCropped.setStartCrop(DisplayIO.getMouseX(), DisplayIO
-                                        .getMouseY());
+                        _lastCropped.setStartCrop(DisplayIO.getMouseX(), FrameMouseActions.getY());
                         _lastCropped.setShowCrop(true);
                 }
@@ -537 +535 @@
                         ranged.setLink(null);
                         ranged.setParent(null);
-                        ranged.setPosition(DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                        ranged.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                         pickup(ranged);
 
@@ -607 +605 @@
                         // Check if the user is nearby another item...
                         int mouseX = DisplayIO.getMouseX();
-                        int mouseY = DisplayIO.getMouseY();
+                        int mouseY = FrameMouseActions.getY();
                         // System.out.println(mouseX + "," + mouseY);
                         for (Item i : DisplayIO.getCurrentFrame().getItems()) {
@@ -636 +634 @@
 
                         // actions take priority
-                        if (_lastMouseClick != null && !_lastMouseClick.isShiftDown()
+                        if (_lastMouseClick != null && !_lastMouseClick.isControlDown()
                                         && clickedOn.getAction() != null) {
                                 clickedOn.performActions();
@@ -846 +844 @@
                         // otherwise the user is creating a line
                 } else {
-                        Item on = FrameUtils.onItem(DisplayIO.getCurrentFrame(), MouseX,
-                                        MouseY);
+                        Item on = FrameUtils.onItem(DisplayIO.getCurrentFrame(), Math.round(MouseX),
+                                        Math.round(MouseY));
                         // If we have permission to copy this item then pick it up
                         if (on != null && on.isLineEnd()
@@ -861 +859 @@
                                 Frame current = DisplayIO.getCurrentFrame();
                                 // create the two endpoints
-                                Item newPoint = DisplayIO.getCurrentFrame().createDot();
-
                                 Line oldLine = (Line) on;
+                                Item newPoint = oldLine.getStartItem().copy();
+                                newPoint.setPosition(MouseX, MouseY);
+                                
                                 Item end = oldLine.getEndItem();
                                 // create the Line
@@ -1044 +1043 @@
                                                         // Find the closest item to the mouse cursor
                                                         double currentX = DisplayIO.getMouseX();
-                                                        double currentY = DisplayIO.getMouseY();
+                                                        double currentY = FrameMouseActions.getY();
                                                         Item closest = null;
                                                         double shortestDistance = Double.MAX_VALUE;
@@ -1176 +1175 @@
                                                         && on.Permission >= Item.PERMISSION_FULL) {
 
-                                                Line newLine = createLine();
+                                                Line onLine = (Line)on;
+                                                Line newLine = onLine.copy();
+                                                Item end = newLine.getEndItem();
+                                                Item start = newLine.getStartItem();
+                                                end.setPosition(MouseX, MouseY);
+                                                start.setPosition(MouseX, MouseY);
+                                                onLine.autoArrowheadLength();
+                                                // anchor the start
+                                                anchor(start);
+                                                // attach the line to the cursor
+                                                pickup(end);
+                                                
                                                 List<Item> toMerge = new LinkedList<Item>();
                                                 toMerge.add(newLine.getStartItem());
                                                 toMerge.add(newLine);
-                                                Item end = newLine.getEndItem();
-                                                //Make sure the highlighting is shown when the end is anchored
+
+                                                // Make sure the highlighting is shown when the end is
+                                                // anchored
                                                 end.setSelectedMode(Item.SelectedMode.Normal);
                                                 end.setSelectedMode(Item.SelectedMode.None);
                                                 merge(toMerge, on);
-                                                //anchor(left);
-                                                //Frame.FreeItems.clear();
+                                                // anchor(left);
+                                                // Frame.FreeItems.clear();
                                                 FrameGraphics.Repaint();
                                                 updateCursor();
@@ -1300 +1311 @@
                         MouseY = e.getY();
 
-                        int distance = _lastRanged.getY() - DisplayIO.getMouseY();
+                        int distance = _lastRanged.getY() - FrameMouseActions.getY();
                         if (distance <= 0)
-                                distance = DisplayIO.getMouseY() - _lastRanged.getY()
+                                distance = FrameMouseActions.getY() - _lastRanged.getY()
                                                 - _lastRanged.getBoundsHeight();
 
@@ -1310 +1321 @@
                         } else {
                                 // update the ranged section
-                                _lastRanged.setSelectionEnd(DisplayIO.getMouseX(), DisplayIO
-                                                .getMouseY());
+                                _lastRanged.setSelectionEnd(DisplayIO.getMouseX(), FrameMouseActions.getY());
                                 _isNoOp = false;
                         }
 
-                        DisplayIO.setTextCursor(_lastRanged.getSize());
+                        DisplayIO.setTextCursor(_lastRanged, Text.NONE);
                         FrameGraphics.Repaint();
                         return;
@@ -1339 +1349 @@
                         }
                         // update the ranged section
-                        _lastCropped.setEndCrop(DisplayIO.getMouseX(), DisplayIO
-                                        .getMouseY());
+                        _lastCropped.setEndCrop(DisplayIO.getMouseX(), FrameMouseActions.getY());
 
                         FrameGraphics.Repaint();
@@ -1398 +1407 @@
         private static boolean _shiftDown;
 
-        public static void setLastRobotMove(int x, int y) {
+        public static void setLastRobotMove(float x, float y) {
                 // Make sure the system is in the right state while waiting for the
                 // Robots event to arrive.
@@ -1405 +1414 @@
                 // System.out.println("MouseMoved: " + MouseX + "," + MouseY + " " +
                 // System.currentTimeMillis());
-                LastRobotX = x;
-                LastRobotY = y;
+                LastRobotX = (int) (x + 0.5);
+                LastRobotY = (int) (y + 0.5);
                 _RobotTimer.start();
         }
@@ -1629 +1638 @@
                                         // Checks that we are actually pointing on a character
                                         // not just space in the text box's bounding box
-                                        if (((Item) on).contains(DisplayIO.getMouseX(), DisplayIO
-                                                        .getMouseY())) {
+                                        if (((Item) on).contains(DisplayIO.getMouseX(), FrameMouseActions.getY())) {
                                                 _context = CONTEXT_AT_TEXT;
                                         } else {
@@ -1657 +1665 @@
                                         if (lineEnd != null) {
                                                 line.showVirtualSpot(lineEnd, DisplayIO.getMouseX(),
-                                                                DisplayIO.getMouseY());
+                                                                FrameMouseActions.getY());
                                         } else
                                                 // The user is pointing at another point or text item
@@ -1780 +1788 @@
                         return;
                 }
+                //This is to make sure the TEXT_CURSOR doesnt get inadvertantly turned off!
+                Item on = FrameUtils.getCurrentItem();
+                if(on != null && on instanceof Text){
+                        return;
+                }
                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
         }
@@ -1791 +1804 @@
                         _offX = DisplayIO.getMouseX() - Frame.FreeItems.get(0).getX()
                                         + Frame.FreeItems.get(0).getOffset().x;
-                        _offY = MouseY - Frame.FreeItems.get(0).getY()
+                        _offY = getY() - Frame.FreeItems.get(0).getY()
                                         + Frame.FreeItems.get(0).getOffset().y;
                 }
@@ -1804 +1817 @@
 
                 int deltax = firstDot.getX() - xPos;
-                int deltay = firstDot.getY() - (MouseY - _offY);
+                int deltay = firstDot.getY() - (getY() - _offY);
 
                 for (Item move : toMove) {
@@ -1954 +1967 @@
                                 _offX = DisplayIO.getMouseX() - anchored.getX()
                                                 + anchored.getOffset().x;
-                                _offY = MouseY - anchored.getY() + anchored.getOffset().y;
+                                _offY = getY() - anchored.getY() + anchored.getOffset().y;
                         } else {
                                 deleteItems(Frame.FreeItems);
@@ -2167 +2180 @@
 
         public static Collection<Item> merge(List<Item> merger, Item mergee) {
-                assert(mergee != null);
+                assert (mergee != null);
                 if (mergee.isFrameName()) {
                         return mergee.getParent().merge(merger);
@@ -2242 +2255 @@
                                                 if (mergee instanceof Text)
                                                         ((Text) mergee).insertText(txt.getText(), DisplayIO
-                                                                        .getMouseX(), DisplayIO.getMouseY());
+                                                                        .getMouseX(), FrameMouseActions.getY());
 
                                                 else if (mergee instanceof Dot) {
@@ -2263 +2276 @@
                                                 // Dot override doesnt use the x and y coords
                                                 // Text does... but could be removed
-                                                res = mergee.merge(i, DisplayIO.getMouseX(), MouseY);
+                                                res = mergee.merge(i, DisplayIO.getMouseX(), getY());
                                                 if (res != null) {
                                                         remain.add(res);
@@ -2273 +2286 @@
                                         }
                                         // Moving the cursor ensures shapes are anchored correctly
-                                        res = mergee.merge(i, DisplayIO.getMouseX(), MouseY);
+                                        res = mergee.merge(i, DisplayIO.getMouseX(), getY());
                                         if (res != null)
                                                 remain.addAll(res.getConnected());
@@ -2353 +2366 @@
                                 if (!(i instanceof Line)) {
                                         _offX = DisplayIO.getMouseX() - i.getX() + i.getOffset().x;
-                                        _offY = MouseY - i.getY() + i.getOffset().y;
+                                        _offY = getY() - i.getY() + i.getOffset().y;
 
                                         // make the offset item the first item in the list (so
@@ -2371 +2384 @@
                         _offX = DisplayIO.getMouseX() - soleItem.getX()
                                         + soleItem.getOffset().x;
-                        _offY = MouseY - soleItem.getY() + soleItem.getOffset().y;
+                        _offY = getY() - soleItem.getY() + soleItem.getOffset().y;
                         // Now call move so that if we are on a message in the message box
                         // It doesnt appear up the top of the scree!!
@@ -2379 +2392 @@
                                         .DisplayMessage("Insufficient permission pickup the items");
                 }
+                FrameGraphics.Repaint();
         }
 
@@ -2415 +2429 @@
 
                 if (checkEnclosure) {
-                        FrameGraphics.Repaint();
                         ItemUtils.EnclosedCheck(toAnchor.getParentOrCurrentFrame()
                                         .getItems());
+                        FrameGraphics.Repaint();
                 }
         }
@@ -2433 +2447 @@
                 }
                 toAnchor.clear();
-                FrameGraphics.Repaint();
                 // Check enclosure for all the frames of the items that were anchored
                 for (Frame f : checkEnclosure) {
                         ItemUtils.EnclosedCheck(f.getItems());
                 }
+                FrameGraphics.Repaint();
         }
 
@@ -2581 +2595 @@
                 updateCursor();
         }
+
+        public static int getX() {
+                return (int)(MouseX + 0.5);
+        }
+        
+        public static int getY() {
+                return (int)(MouseY + 0.5);
+        }
 }

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

@@ -909 +909 @@
                                                         }
                                                         vectors.add(new Vector(vector, i.getPosition(),
-                                                                        scale));
+                                                                        scale, i.getColor(), i.getBackgroundColor()));
                                                 }
                                         }
@@ -1098 +1098 @@
          * @return The Item at the given coordinates, or NULL if none is found.
          */
-        public static Item onItem(Frame toCheck, int x, int y) {
+        public static Item onItem(Frame toCheck, float floatX, float floatY) {
+                int x = Math.round(floatX);
+                int y = Math.round(floatY);
                 if (toCheck == null)
                         return null;
@@ -1214 +1216 @@
         public static Item getCurrentItem() {
                 return onItem(DisplayIO.getCurrentFrame(), DisplayIO.getMouseX(),
-                                DisplayIO.getMouseY());
+                                FrameMouseActions.getY());
         }
 
@@ -1273 +1275 @@
                         if (i.isLineEnd() && i.isEnclosed()) {
                                 Polygon p = i.getEnclosedShape();
-                                if (p.contains(DisplayIO.getMouseX(), DisplayIO.getMouseY())) {
+                                if (p.contains(DisplayIO.getMouseX(), FrameMouseActions.getY())) {
                                         used.add(i);
                                         items.removeAll(i.getEnclosingDots());
@@ -1297 +1299 @@
 
                                         int mouseX = DisplayIO.getMouseX();
-                                        int mouseY = DisplayIO.getMouseY();
+                                        int mouseY = FrameMouseActions.getY();
 
                                         for (int i = 0; i < p1.npoints; i++) {

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.Color;
 import java.awt.Point;
 
@@ -10 +11 @@
         public float Scale;
 
-        public Vector(Frame overlay, Point origin, Float scale) {
+        public Color Foreground;
+        public Color Background;
+
+        public Vector(Frame overlay, Point origin, Float scale, Color color, Color background) {
                 Frame = overlay;
                 Origin = origin;
                 Scale = scale;
+                Foreground = color;
+                Background = background;
         }
 

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

@@ -40 +40 @@
 
         /**
-         * Determines whether a string begins with a KMS tag.
+         * Determines whether a string begins with tag.
          * 
          * @param s
          *            a line of text
-         * @return true if s begins with a KMS tag
+         * @return true if s begins with a tag
          */
         private static boolean isValidLine(String s) {
@@ -52 +52 @@
 
         /**
-         * Reads a KMS file with the given name from disk.
+         * Reads a file with the given name from disk.
          * 
          * @param frameName

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

@@ -103 +103 @@
                 writeTerminator();
                 writeConstraintData();
-
+                writeTerminator();
+                writeLine(SessionStats.getFrameEventList(frame));
+                
                 return;
         }
@@ -249 +251 @@
         @Override
         protected String finaliseFrame() throws IOException {
-                writeTerminator();
-
-                writeLine(SessionStats.getFrameEventList());
-
                 _writer.flush();
                 _writer.close();

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

@@ -67 +67 @@
         public static final Color DEPRESSED_HIGHLIGHT = Color.GREEN;
 
-        public static final Color DISCONNECT_HIGHLIGHT = Color.BLUE;
+        public static final Color ALTERNATE_HIGHLIGHT = Color.BLUE;
 
         public static final Color LINK_COLOR = Color.BLACK;
@@ -291 +291 @@
          * 
          * @param action
-         *            The KMS action language to add to this Item
+         *            The action to add to this Item
          */
         public void addAction(String action) {
@@ -393 +393 @@
 
         /**
-         * Returns a list of any action code (KMS action language) that is currently
-         * associated with this Item
+         * Returns a list of any action code that is currently associated with this
+         * Item
          * 
          * @return A List of action code associated with this Item, or null if none
@@ -785 +785 @@
          */
         public int getX() {
-                return (int)(_x + 0.5);
+                return (int) (_x + 0.5);
         }
 
@@ -794 +794 @@
          */
         public int getY() {
-                return (int)(_y + 0.5);
+                return (int) (_y + 0.5);
         }
 
@@ -883 +883 @@
                                 + getBoundsHeight() + NEAR_DISTANCE);
         }
-
-        /**
-         * Checks if this item is a frame title.
-         * 
-         * @return true if the item is a frame title
-         */
-        /*
-         * public boolean isTitle() { // check if the title has been assigned if
-         * (getID() >= 0 && this instanceof Text) if (getX() < 200 && getY() <
-         * getSize() + system.io.KMSConversion.Y_ADJUST) return true; return false; }
-         */
 
         public boolean isOldTag() {
@@ -925 +914 @@
                 if (getFillColor() != null && getEnclosingDots() != null) {
                         g.setColor(getFillColor());
+                        // The painting is not efficient enough for gradients...
                         // Shape s = getEnclosedShape();
                         // Rectangle b = s.getBounds();
@@ -1330 +1320 @@
                                         }
                                 } else if (c.isDiagonal()) {
-                                        if (Math.abs(other._x - x) != Math
-                                                        .abs(other._y - y)) {
-                                                
+                                        if (Math.abs(other._x - x) != Math.abs(other._y - y)) {
+
                                                 float m1 = c.getGradient();
                                                 float c1 = y - m1 * x;
@@ -1341 +1330 @@
                                                 // If there is only one line...
                                                 if (lines.size() == 1) {
-                                                        if (m1 != 0){
-                                                                if(Math.abs(deltaX) > Math.abs(deltaY)){
+                                                        if (m1 != 0) {
+                                                                if (Math.abs(deltaX) > Math.abs(deltaY)) {
                                                                         other.setX((other._y - c1) / m1);
-                                                                }else {
+                                                                } else {
                                                                         other.setY(m1 * other._x + c1);
                                                                 }
@@ -1362 +1351 @@
                                                                 other.setY(m1 * other._x + c1);
                                                         } else if (Math.abs(xDiff) == Math.abs(yDiff)
-                                                                        && !this.isFloating() && deltaX == 0 && deltaY == 0){
+                                                                        && !this.isFloating() && deltaX == 0
+                                                                        && deltaY == 0) {
                                                                 if (deltaX == 0) {
-                                                                        _x = (_y - other._y) * m1
-                                                                                        + other._x;
+                                                                        _x = (_y - other._y) * m1 + other._x;
                                                                 } else {
-                                                                        _y = (_x - other._x) * m1
-                                                                                        + other._y;
+                                                                        _y = (_x - other._x) * m1 + other._y;
                                                                 }
                                                         } else {
@@ -1543 +1531 @@
 
         public void setSelectedMode(SelectedMode mode, Color color) {
+                if (color != null && color.equals(getPaintColor())) {
+                        color = ALTERNATE_HIGHLIGHT;
+                }
                 setSelectionColor(color);
                 _lastMode = _mode;
@@ -1823 +1814 @@
                 return link;
         }
+
+        /**
+         * Sets the x and y values of this item ignoring constraints.
+         * 
+         * @param x
+         *            new x position
+         * @param y
+         *            new y position
+         */
+        public void setXY(int x, int y) {
+                _x = x;
+                _y = y;
+        }
+
+        /**
+         * Recursive function for getting the path around a shape. This is used to
+         * get the path that is painted on the screen.
+         * 
+         * @param visited
+         * @param points
+         * @param addToEnd
+         * @param toExplore
+         */
+        public void appendPath(Collection<Line> visited, LinkedList<Point> points,
+                        boolean addToEnd, Collection<Line> toExplore) {
+
+                if (addToEnd) {
+                        // put the start item points into our list
+                        points.addLast(getPosition());
+                } else {
+                        points.addFirst(getPosition());
+                }
+
+                // Find the line that has not been added yet
+                LinkedList<Line> lines = new LinkedList<Line>();
+                lines.addAll(getLines());
+
+                while (!lines.isEmpty()) {
+                        Line l = lines.remove();
+                        // if we havnt visited the line yet visit it
+                        if (!visited.contains(l)) {
+                                visited.add(l);
+                                Item otherEnd = l.getOppositeEnd(this);
+                                // Add all the enexplored lines to our list
+                                while (!lines.isEmpty()) {
+                                        l = lines.remove();
+                                        // Get the paths for the rest of the lines to be explored
+                                        // later
+                                        if (!toExplore.contains(l) && !visited.contains(l)) {
+                                                toExplore.add(l);
+                                        }
+                                }
+                                otherEnd.appendPath(visited, points, addToEnd, toExplore);
+                        }
+                }
+        }
+
+        /**
+         * Gets the size of the enclosure that this item is part of.
+         * @return the area of the box surrounding the enclosed shape that this item is part of
+         */
+        public Integer getEnclosedArea() {
+                if (_enclosure == null)
+                        return 0;
+                Rectangle box = getEnclosedShape().getBounds();
+                Integer area = box.width * box.height;
+                
+                if (getFillColor() == null)
+                        return -area;
+                
+                return area;
+        }
 }

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

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -33 +36 @@
         private static final int MINIMUM_ARROW_HEAD_LENGTH = 8;
 
+        private static final int MAXIMUM_ARROW_HEAD_LENGTH = 60;
+
         public static final Float DEFAULT_THICKNESS = 2f;
 
@@ -53 +58 @@
         private boolean _isCircle = false;
 
+        // TODO find out why bevel is not working
+        private final int JOIN = BasicStroke.JOIN_ROUND;
+
+        private final int CAP = BasicStroke.CAP_BUTT;
+
         // brush strokes used for painting this line and highlighting
-        private Stroke _lineStroke = new BasicStroke(DEFAULT_THICKNESS,
-                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+        private Stroke _lineStroke = new BasicStroke(DEFAULT_THICKNESS, CAP, JOIN,
+                        4.0F);
 
         // private Stroke _highlightStroke = new BasicStroke (1f + /*GRAVITY +
@@ -292 +302 @@
                                 dash[i] = (float) pattern[i];
                         _lineStroke = new BasicStroke(Math.max(thick, MINIMUM_THICKNESS),
-                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, dash,
-                                        0.0f);
+                                        CAP, JOIN, 10f, dash, 0.0f);
                 } else
                         _lineStroke = new BasicStroke(Math.max(thick, MINIMUM_THICKNESS),
-                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+                                        CAP, JOIN);
 
                 if (_start.getLinePattern() != pattern)
@@ -321 +330 @@
                         _isCircle = true;
                 } else {
+                        // Get a path of points
+                        int[][][] paths = getPaths();
+                        g.setStroke(_lineStroke);
+                        for (int i = 0; i < paths.length; i++) {
+                                int[][] path = paths[i];
+                                int last = path[0].length - 1;
+                                if (path[0][0] == path[0][last] && path[1][0] == path[1][last]) {
+                                        g.drawPolygon(path[0], path[1], last);
+                                } else {
+                                        g.drawPolyline(path[0], path[1], last + 1);
+                                }
+                        }
                         // paint the arrowhead (if necessary)
-                        g.setStroke(new BasicStroke(getThickness(), BasicStroke.CAP_BUTT,
-                                        BasicStroke.JOIN_MITER));
-
-                        paintArrow(g, _start, _startOffset, _endOffset);
-                        paintArrow(g, _end, _endOffset, _startOffset);
-
-                        g.setStroke(_lineStroke);
-                        g.drawLine(_start.getX() + _startOffset.x, _start.getY()
-                                        + _startOffset.y, _end.getX() + _endOffset.x, _end.getY()
-                                        + _endOffset.y);
-
+                        paintArrows(g);
+                        // g.drawLine(_start.getX() + _startOffset.x, _start.getY()
+                        // + _startOffset.y, _end.getX() + _endOffset.x, _end.getY()
+                        // + _endOffset.y);
+                        // TODO deal with the offset
                         _isCircle = false;
                 }
@@ -345 +360 @@
                 if (showLineHighlight() && isHighlighted()) {
                         g.setColor(getHighlightColor());
-                        g.setStroke(new BasicStroke(MINIMUM_THICKNESS,
-                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
+                        g.setStroke(new BasicStroke(MINIMUM_THICKNESS, CAP, JOIN));
                         ((Graphics2D) g).draw(this.getArea());
                 }
+        }
+
+        protected int[][][] getPaths() {
+                List<List<Point>> pointPaths = new LinkedList<List<Point>>();
+                Collection<Line> visited = new HashSet<Line>();
+                LinkedList<Line> toExplore = new LinkedList<Line>();
+                toExplore.add(this);
+                while (toExplore.size() > 0) {
+                        Line nextLine = toExplore.remove(0);
+                        // Start at the item we have already explored... unless both have
+                        // been explored
+                        if (!visited.contains(nextLine)) {
+                                pointPaths.add(nextLine.getPath(visited, toExplore));
+                        }
+                }
+                // Put the paths into int arrays
+                int[][][] paths = new int[pointPaths.size()][][];
+                Iterator<List<Point>> iter = pointPaths.iterator();
+
+                for (int i = 0; i < paths.length; i++) {
+                        List<Point> pointPath = iter.next();
+                        int[][] path = new int[2][pointPath.size()];
+                        paths[i] = path;
+                        // Add all the x and y's to the array
+                        for (int j = 0; j < path[0].length; j++) {
+                                path[0][j] = pointPath.get(j).x;
+                                path[1][j] = pointPath.get(j).y;
+                        }
+                }
+                return paths;
+        }
+
+        protected List<Point> getPath(Collection<Line> visited,
+                        LinkedList<Line> toExplore) {
+                LinkedList<Point> points = new LinkedList<Point>();
+                // put the start item points into our list
+                Item start = getStartItem();
+                Item end = getEndItem();
+                visited.add(this);
+
+                start.appendPath(visited, points,
+                                                true, toExplore);
+                end.appendPath(visited, points, false,
+                                                toExplore);
+                return points;
+        }
+
+        public void paintArrows(Graphics2D g) {
+                g.setColor(getPaintColor());
+                g
+                                .setStroke(new BasicStroke(getThickness(), CAP,
+                                                BasicStroke.JOIN_MITER));
+                paintArrow(g, _start, _startOffset, _endOffset);
+                paintArrow(g, _end, _endOffset, _startOffset);
 
                 if (_virtualSpot != null) {
@@ -393 +461 @@
                 int length = (int) Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
 
-                if (arrowLength < 0 && length > MINIMUM_ARROW_HEAD_LENGTH) {
+                // The length of the line must at least be as long as the arrow or we
+                // wont show the arrow
+                if (length <= MINIMUM_ARROW_HEAD_LENGTH)
+                        return;
+                if (arrowLength == AUTO_ARROWHEAD_LENGTH) {
                         arrowLength = length / ARROW_HEAD_TO_LENGTH_RATIO;
                         arrowLength = Math.max(MINIMUM_ARROW_HEAD_LENGTH, arrowLength);
+                        arrowLength = Math.min(MAXIMUM_ARROW_HEAD_LENGTH, arrowLength);
                         withArrow.setArrowhead(null);
                         if (arrowRatio < 0)
@@ -571 +644 @@
                                 dash[i] = (float) pattern[i];
                         _lineStroke = new BasicStroke(Math.max(thick, MINIMUM_THICKNESS),
-                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, dash,
-                                        0.0f);
+                                        CAP, JOIN, 10f, dash, 0.0f);
                 } else
                         _lineStroke = new BasicStroke(Math.max(thick, MINIMUM_THICKNESS),
-                                        BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
+                                        CAP, JOIN);
         }
 
@@ -629 +701 @@
                 int length = (int) Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
                 length /= ARROW_HEAD_TO_LENGTH_RATIO;
-                arrow.setArrowheadLength(Math.max(MINIMUM_ARROW_HEAD_LENGTH, length));
+                arrow.setArrowheadLength(Math.min(MAXIMUM_ARROW_HEAD_LENGTH,Math.max(MINIMUM_ARROW_HEAD_LENGTH, length)));
         }
 
@@ -718 +790 @@
 
         private static int[] ArrowHeadLength = new int[] { /* AUTO_ARROWHEAD_LENGTH, */
-        0, 20, 40, 80 };
+        0, 20, 40, MAXIMUM_ARROW_HEAD_LENGTH };
 
         /**
@@ -805 +877 @@
                 Item spot = new Dot(mouseX, mouseY, -1);
                 spot.setThickness(Math.max(this.getThickness(), 5));
-                if (this.getColor() != Color.RED)
-                        spot.setColor(Color.RED);
+                if (DEFAULT_HIGHLIGHT.equals(this.getColor()))
+                        spot.setColor(ALTERNATE_HIGHLIGHT);
                 else
-                        spot.setColor(Color.BLUE);
+                        spot.setColor(DEFAULT_HIGHLIGHT);
 
                 // calculate nearest point on line from spot
@@ -913 +985 @@
 
                 // lines that are in 'connected' mode, also cannot be attached
-                if (spot.isFloating() && spot.getLines().get(0).getOppositeEnd(spot).isFloating())
+                if (spot.isFloating()
+                                && spot.getLines().get(0).getOppositeEnd(spot).isFloating())
                         return merger;
 
@@ -1074 +1147 @@
 
         public Integer getPossibleConstraint() {
-                if (_start.getY() == _end.getY()
-                                && _start.getX() != _end.getX())
+                if (_start.getY() == _end.getY() && _start.getX() != _end.getX())
                         return Constraint.HORIZONTAL;
-                else if (_start.getX() == _end.getX()&& _start.getY() != _end.getY())
+                else if (_start.getX() == _end.getX() && _start.getY() != _end.getY())
                         return Constraint.VERTICAL;
                 return null;

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

@@ -229 +229 @@
         /**
          * Returns the Text Item that was used to create this Picture object. This
-         * is required by KMSWriter for saving the Frame.
+         * is required when saving the Frame.
          * 
          * @return The Text Item used to create this Picture.

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

@@ -58 +58 @@
         public static final int MINIMUM_RANGED_CHARS = 2;
 
-        public static final int UP = 0;
-
-        public static final int DOWN = 1;
-
-        public static final int LEFT = 2;
-
-        public static final int RIGHT = 3;
-
-        public static final int HOME = 4;
-
-        public static final int END = 5;
-
-        public static final int PAGE_DOWN = 6;
-
-        public static final int PAGE_UP = 7;
+        public static final int NONE = 0;
+
+        public static final int UP = 1;
+
+        public static final int DOWN = 2;
+
+        public static final int LEFT = 3;
+
+        public static final int RIGHT = 4;
+
+        public static final int HOME = 5;
+
+        public static final int END = 6;
+
+        public static final int PAGE_DOWN = 7;
+
+        public static final int PAGE_UP = 8;
 
         private int _maxWidth = -1;
@@ -392 +394 @@
                 // move the cursor to the new location
                 float[] caret = last.getCaretInfo(hit);
-                int y = getLineDrop(last) * line;
-
-                int x = ((int) (getX() + caret[0]) + getJustOffset(last));
+                float y = getLineDrop(last) * line;
+
+                int x = ((int) (getX() + caret[0] + 0.5) + getJustOffset(last));
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() + /* DisplayIO.getOffset() + */y
-                                + (int) caret[1]);
+                return new Point(x, (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -614 +615 @@
                 // move the cursor to the new location
                 float[] caret = current.getCaretInfo(hit);
-                int y = getLineDrop(current) * line;
-
-                int x = ((int) (getX() + caret[0]) + getJustOffset(current));
+                float y = getLineDrop(current) * line;
+
+                int x = (int) (getX() + caret[0] + 0.5) + getJustOffset(current);
                 x = Math
                                 .min(
                                                 x,
                                                 (getX() - Item.MARGIN_RIGHT - (2 * getGravity()) + getBoundsWidth()));
-                return new Point(x, getY() + y + (int) caret[1]);
+                return new Point(x, (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -698 +699 @@
                 // move the cursor to the new location
                 float[] caret = current.getCaretInfo(hit);
-                int y = getLineDrop(current) * line;
-
-                return new Point((int) (getX() + caret[0]) + getJustOffset(current),
-                                getY() + y + (int) caret[1]);
+                float y = getLineDrop(current) * line;
+
+                return new Point((int) (getX() + caret[0] + 0.5)
+                                + getJustOffset(current), (int) (getY() + y + caret[1] + 0.5));
         }
 
@@ -937 +938 @@
         }
 
-        private int getLineDrop(TextLayout layout) {
+        private float getLineDrop(TextLayout layout) {
                 if (getSpacing() < 0)
-                        return (int) (layout.getAscent() + layout.getDescent() + layout
-                                        .getLeading());
-
-                return (int) (layout.getAscent() + layout.getDescent() + getSpacing());
+                        return layout.getAscent() + layout.getDescent()
+                                        + layout.getLeading();
+
+                return layout.getAscent() + layout.getDescent() + getSpacing();
         }
 

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

@@ -4 +4 @@
 
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.io.Logger;
 
 public class CometStats {
-        protected static String COLUMN_SEPARATOR = " | ";
-        
+        static String COLUMN_SEPARATOR = " | ";
+
         protected int _sessions = 0;
 
@@ -18 +17 @@
         protected long _dark = 0;
 
+        /*
+         * public CometStats(Frame topFrame) { this(topFrame, false); }
+         * 
+         * public CometStats(Frame topFrame, boolean includeCurrentSession) { _name =
+         * topFrame.getName(); Frame backupFrame = topFrame; if
+         * (includeCurrentSession) { _active =
+         * SessionStats.getFrameActiveTime().getTime(); if (_active > 0) { _sessions =
+         * 1; _dark = SessionStats.getFrameDarkTime().getTime(); } }
+         *  // Keep going back until we have reached the end of the comet tail while
+         * (backupFrame != null) { long backupActive =
+         * backupFrame.getActiveTime().getTime(); // Update the time if user spent
+         * time editing the frame // backupActive will be zero if the frame has not
+         * been saved yet if (backupActive > 0) { _sessions++; _active +=
+         * backupActive; _dark += backupFrame.getDarkTime().getTime(); }
+         * FrameGraphics.OverwriteMessage("Computed: " + backupFrame.getName()); //
+         * Get the backup of the backup; backupFrame = backupFrame.getBackupFrame(); }
+         * _sessions = topFrame.getVersion() + 1; }
+         */
+
         public CometStats(Frame topFrame) {
-                this(topFrame, false);
-        }
+                _name = topFrame.getName();
 
-        public CometStats(Frame topFrame, boolean includeCurrentSession) {
-                _name = topFrame.getName();
-                Frame backupFrame = topFrame;
-                if (includeCurrentSession) {
-                        _active = SessionStats.getFrameActiveTime().getTime();
-                        if (_active > 0) {
-                                _sessions = 1;
-                                _dark = SessionStats.getFrameDarkTime().getTime();
-                        }
-                }
-
-                // Keep going back until we have reached the end of the comet tail
-                while (backupFrame != null) {
-                        long backupActive = backupFrame.getActiveTime().getTime();
-                        // Update the time if user spent time editing the frame
-                        // backupActive will be zero if the frame has not been saved yet
-                        if (backupActive > 0) {
-                                _sessions++;
-                                _active += backupActive;
-                                _dark += backupFrame.getDarkTime().getTime();
-                        }
-                        FrameGraphics.OverwriteMessage("Computed: " + backupFrame.getName());
-                        // Get the backup of the backup;
-                        backupFrame = backupFrame.getBackupFrame();
-                }
+                _active = SessionStats.getFrameActiveTime().getTime()
+                                + topFrame.getActiveTime().getTime();
+                _dark = SessionStats.getFrameDarkTime().getTime()
+                                + topFrame.getDarkTime().getTime();
+                _sessions = topFrame.getVersion() + 1;
         }
 
@@ -57 +54 @@
                 StringBuffer sb = new StringBuffer();
                 sb.append(SessionStats.getDate());
-                sb.append("CometName: ").append(_name).append('\n');
+                sb.append("CometStats: ").append(_name).append('\n');
                 sb.append("Versions: ").append(_sessions).append('\n');
-                sb.append("            Current  | Average  | Total").append('\n');
+                sb.append("           | Current  | Average  | Total").append('\n');
+                sb.append("-----------|----------|----------|---------").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()
                                 / (1.0 * _sessions)));
@@ -70 +68 @@
                 Time currentTotal = SessionStats.getFrameTotalTime();
 
-                sb.append("ActiveTime: ").append(Logger.EasyTimeFormat(currentActive))
-                                .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageActive))
-                                .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(active)).append('\n');
-                sb.append("  DarkTime: ").append(Logger.EasyTimeFormat(currentDark))
-                                .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageDark)).append(
-                                                COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(dark)).append('\n');
-                sb.append(" TotalTime: ").append(Logger.EasyTimeFormat(currentTotal))
-                                .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageTotal))
-                                .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(total));
+                sb.append("ActiveTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(currentActive))
+                                .append(COLUMN_SEPARATOR).append(
+                                                Logger.EasyTimeFormat(averageActive)).append(
+                                                COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(active))
+                                .append('\n');
+                sb.append("  DarkTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(currentDark))
+                                .append(COLUMN_SEPARATOR).append(
+                                                Logger.EasyTimeFormat(averageDark)).append(
+                                                COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(dark))
+                                .append('\n');
+                sb.append(" TotalTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(currentTotal))
+                                .append(COLUMN_SEPARATOR).append(
+                                                Logger.EasyTimeFormat(averageTotal)).append(
+                                                COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(total));
                 return sb.toString();
         }

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

@@ -10 +10 @@
 
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
+import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.TimeKeeper;
@@ -21 +23 @@
 public class SessionStats {
 
+        public static final String COLUMN_SEPARATOR = CometStats.COLUMN_SEPARATOR;
+
+        public static final String COLUMN_SEPARATOR2 = "-|-";
+
         public static final String DARK_TIME_ATTRIBUTE = "DarkTime:";
 
@@ -30 +36 @@
 
         public enum ItemType {
-                Text, Dot, Picture, Line;
+                Text, Dot, Line, Picture, Total;
         }
 
@@ -37 +43 @@
         }
 
-        private static final int STAT_TYPES = 4;
-
-        private static final int ITEM_TYPES = 4;
+        private static final int STAT_TYPES = StatType.values().length;
+
+        private static final int ITEM_TYPES = ItemType.values().length;
 
         private static int[][] _ItemStats = new int[ITEM_TYPES][STAT_TYPES];
@@ -108 +114 @@
                 Date currentTime = new Date();
                 long elapsedTime = currentTime.getTime() - _StartTime.getTime();
-                String time = "" + (int) ((double)elapsedTime / MILLISECONDS_PER_MINUTE + 0.5); // (new
+                String time = ""
+                                + (int) ((double) elapsedTime / MILLISECONDS_PER_MINUTE + 0.5); // (new
                 // SimpleDateFormat("m").format(elapsedTime));
 
@@ -222 +229 @@
         }
 
+        private static StringBuffer getCompactStat(String name, int value,
+                        int minValueWidth, int minTotalWidth) {
+                StringBuffer stats = new StringBuffer();
+                // prevent divide by zero errors
+                if (value > 0) {
+                        String perHour = getRate(value);
+                        String valueString = "" + value;
+                        while (valueString.length() < minValueWidth)
+                                valueString = " " + valueString;
+                        stats.append(valueString).append("@").append(perHour.toString())
+                                        .append("/h");
+                }
+                while (stats.length() < minTotalWidth) {
+                        stats.append(' ');
+                }
+                return stats.append(COLUMN_SEPARATOR);
+        }
+
         private static String getRate(int value) {
                 return "" + Math.round(value * 60 / getMinutesUsed());
@@ -262 +287 @@
                 FrameEdited(frameName);
                 _SavedFrames++;
-                
-                _FrameEvents.clear();
-                _FrameAccessTime = new Date();
-                _FrameAccessDarkTime = (Time) _DarkTime.clone();
+
+                NewFrameSession();
         }
 
@@ -302 +325 @@
 
                 _FrameEvents.add(Logger.EasyDateFormat("mm:ss:SSS", elapsedTime) + " "
-                                + DisplayIO.getMouseX() + " " + DisplayIO.getMouseY() + " "
+                                + DisplayIO.getMouseX() + " " + FrameMouseActions.getY() + " "
                                 + description);
         }
 
         public static Time getFrameDarkTime() {
-                return new Time(_DarkTime.getTime()
-                                - _FrameAccessDarkTime.getTime());
-        }
-        
+                return new Time(_DarkTime.getTime() - _FrameAccessDarkTime.getTime());
+        }
 
         public static Time getFrameActiveTime() {
-                return new Time(getFrameTotalTime().getTime() - getFrameDarkTime().getTime());
+                return new Time(getFrameTotalTime().getTime()
+                                - getFrameDarkTime().getTime());
         }
 
         public static Time getFrameTotalTime() {
-                return new Time((new Date()).getTime()
-                                - _FrameAccessTime.getTime());
-        }
-        
-        public static String getFrameEventList() {
+                return new Time((new Date()).getTime() - _FrameAccessTime.getTime());
+        }
+
+        public static String getFrameEventList(Frame currentFrame) {
                 StringBuilder eventList = new StringBuilder();
                 // First put on the session and darkTime
-                Time darkTime = getFrameDarkTime();
-                Time activeTime = getFrameActiveTime();
+                Time darkTime = currentFrame == null ? getFrameDarkTime()
+                                : currentFrame.getDarkTime();
+                Time activeTime = currentFrame == null ? getFrameActiveTime()
+                                : currentFrame.getActiveTime();
                 eventList.append(ACTIVE_TIME_ATTRIBUTE).append(
                                 Logger.EasyTimeFormat(activeTime)).append('\n');
@@ -335 +358 @@
                         eventList.deleteCharAt(eventList.length() - 1);
                 return eventList.toString();
+        }
+
+        public static String getFrameEventList() {
+                return getFrameEventList(null);
         }
 
@@ -399 +426 @@
 
         public static String getItemStats() {
-                StringBuffer stats = getLength();
+
+                StringBuffer sb = getLength();
+
                 int max = 0;
+                final int TOTAL_INDEX = ITEM_TYPES - 1;
                 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];
+                        _ItemStats[TOTAL_INDEX][i] = 0;
+                        for (int j = 0; j < TOTAL_INDEX; j++) {
+                                _ItemStats[TOTAL_INDEX][i] += _ItemStats[j][i];
                         }
+                }
+                for (int i = 0; i < STAT_TYPES; i++) {
+                        max = Math.max(_ItemStats[TOTAL_INDEX][i], max);
                 }
                 int maxWidthValue = ("" + max).length();
                 int maxWidthRate = (getRate(max)).length();
 
+                int maxNameWidth = 0;
+                int maxColumnWidth = 0;
+                ItemType[] itemTypes = ItemType.values();
+                StatType[] statTypes = StatType.values();
+                // Get the width of the longest itemType
+                for (int i = 0; i < ITEM_TYPES; i++) {
+                        maxNameWidth = Math.max(maxNameWidth, itemTypes[i].toString()
+                                        .length());
+                }
+
                 for (int i = 0; i < STAT_TYPES; i++) {
-                        int total = 0;
-                        int nonZeroItems = 0;
-                        String statName = StatType.values()[i].toString();
-                        for (int j = 0; j < ITEM_TYPES; j++) {
+                        maxNameWidth = Math.max(maxColumnWidth, statTypes[i].toString()
+                                        .length());
+                }
+                maxColumnWidth = Math.max(maxWidthRate + maxWidthValue + 3,
+                                maxNameWidth);
+
+                sb.append(getBufferedString("", maxNameWidth)).append(COLUMN_SEPARATOR);
+
+                StringBuffer lineSeparator = getBufferedString("", maxNameWidth, '-');
+                lineSeparator.append(COLUMN_SEPARATOR2);
+
+                for (int i = 0; i < STAT_TYPES; i++) {
+                        sb.append(
+                                        getBufferedString(statTypes[i].toString(), maxColumnWidth))
+                                        .append(COLUMN_SEPARATOR);
+                        lineSeparator.append(getBufferedString("", maxColumnWidth, '-')
+                                        .append(COLUMN_SEPARATOR2));
+                }
+                //Remove the last column separator
+                lineSeparator.delete(lineSeparator.length()
+                                - COLUMN_SEPARATOR2.length(), lineSeparator.length() - 1);
+                sb.delete(sb.length() - COLUMN_SEPARATOR.length(), sb.length() - 1);
+                sb.append('\n');
+                sb.append(lineSeparator).append('\n');
+
+                for (int j = 0; j < ITEM_TYPES; j++) {
+                        sb.append(getBufferedString(itemTypes[j].toString(), maxNameWidth))
+                                        .append(COLUMN_SEPARATOR);
+                        for (int i = 0; i < STAT_TYPES; i++) {
+                                int total = 0;
+                                int nonZeroItems = 0;
+                                String statName = StatType.values()[i].toString();
+
                                 int value = _ItemStats[j][i];
                                 if (value > 0)
                                         nonZeroItems++;
                                 total += value;
-                                appendStat(stats, ItemType.values()[j].toString() + statName,
-                                                value);
+                                sb.append(getCompactStat(ItemType.values()[j].toString()
+                                                + statName, value, maxWidthValue, maxColumnWidth));
                         }
-                        // Only display a total if the number of items to be counted for the
-                        // statType > 1
-                        if (nonZeroItems > 1)
-                                appendStat(stats, "Total" + statName, total, true, false,
-                                                maxWidthValue, maxWidthRate);
-                }
-                stats.deleteCharAt(stats.length() - 1);
-                return stats.toString();
+                        sb.delete(sb.length() - COLUMN_SEPARATOR.length(), sb.length() - 1);
+                        sb.append('\n');
+                }
+                // Remove the last newline character
+                sb.deleteCharAt(sb.length() - 1);
+                return sb.toString();
+        }
+
+        private static StringBuffer getBufferedString(String string, int width) {
+                return getBufferedString(string, width, ' ');
+        }
+
+        private static StringBuffer getBufferedString(String string, int width,
+                        char bufferChar) {
+                StringBuffer sb = new StringBuffer(string);
+                while (sb.length() < width) {
+                        sb.append(bufferChar);
+                }
+                return sb;
         }
 
@@ -487 +570 @@
                 return stats;
         }
-        
+
         public static StringBuffer getDate() {
                 StringBuffer stats = new StringBuffer("Date: ");
@@ -510 +593 @@
                 DeletedItems(items);
         }
+
+        public static void NewFrameSession() {
+                _FrameEvents.clear();
+                _FrameAccessTime = new Date();
+                _FrameAccessDarkTime = (Time) _DarkTime.clone();
+        }
 }

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

@@ -20 +20 @@
         protected long _treeDark = 0;
 
-        public TreeStats(Frame topFrame, Set<String> visited) {
-                this(topFrame, false, visited);
+
+        public TreeStats(Frame topFrame) {
+                this(topFrame, new HashSet<String>());
         }
 
-        public TreeStats(Frame topFrame, boolean includeCurrentSession) {
-                this(topFrame, includeCurrentSession, new HashSet<String>());
-        }
-
-        public TreeStats(Frame topFrame, boolean includeCurrentSession, Set<String> visited) {
-                super(topFrame, includeCurrentSession);
+        public TreeStats(Frame topFrame, Set<String> visited) {
+                super(topFrame);
                 visited.add(_name.toLowerCase());
                 FrameGraphics.OverwriteMessage("Computed: " + _name);
@@ -69 +66 @@
                 StringBuffer sb = new StringBuffer();
                 sb.append(SessionStats.getDate());
-                sb.append("TopFrame: ").append(_name).append('\n');
+                sb.append("TreeStats: ").append(_name).append('\n');
                 sb.append("Frames:   ").append(_treeFrames).append('\n');
                 sb.append("Versions: ").append(_treeSessions).append('\n');
-                sb.append("           VersionAve| FrameAve | Total").append('\n');
+                sb.append("           |VersionAve| FrameAve | Total").append('\n');
+                sb.append("-----------|----------|----------|---------").append('\n');
                 Time averageActive = new Time((long) (0.5 + active.getTime()
                                 / (1.0 * _treeFrames)));
@@ -86 +84 @@
                                 / (1.0 * _treeSessions)));
 
-                sb.append("ActiveTime: ").append(Logger.EasyTimeFormat(averageActiveEdit))
+                sb.append("ActiveTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageActiveEdit))
                                 .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageActive))
                                 .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(active)).append('\n');
-                sb.append("  DarkTime: ").append(Logger.EasyTimeFormat(averageDarkEdit))
+                sb.append("  DarkTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageDarkEdit))
                                 .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageDark)).append(
                                                 COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(dark)).append('\n');
-                sb.append(" TotalTime: ").append(Logger.EasyTimeFormat(averageTotalEdit))
+                sb.append(" TotalTime").append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageTotalEdit))
                                 .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(averageTotal))
                                 .append(COLUMN_SEPARATOR).append(Logger.EasyTimeFormat(total));