Changeset 156

Timestamp:

07/25/08 09:24:45 (16 years ago)

Author:

ra33

Message:

Added calculate action

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (8 diffs)
• actions/Misc.java (modified) (6 diffs)
• actions/Simple.java (modified) (13 diffs)
• agents/ComputeTree.java (modified) (1 diff)
• agents/DisplayTree.java (modified) (1 diff)
• agents/Format.java (modified) (3 diffs)
• agents/SearchAgent.java (modified) (5 diffs)
• agents/SearchTree.java (modified) (1 diff)
• gui/AttributeUtils.java (modified) (2 diffs)
• gui/Browser.java (modified) (2 diffs)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/Frame.java (modified) (21 diffs)
• gui/FrameGraphics.java (modified) (1 diff)
• gui/FrameIO.java (modified) (2 diffs)
• gui/FrameKeyboardActions.java (modified) (14 diffs)
• gui/FrameMouseActions.java (modified) (30 diffs)
• gui/FrameUtils.java (modified) (8 diffs)
• gui/FreeItems.java (modified) (2 diffs)
• items/Item.java (modified) (5 diffs)
• items/ItemUtils.java (modified) (3 diffs)
• items/Text.java (modified) (4 diffs)
• items/XRayable.java (modified) (1 diff)

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

@@ -22 +22 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.io.Conversion;
@@ -38 +39 @@
  * When adding an action to a class in the actions folder the following must be
  * considered:
- * <li> If the first parameter is of type Frame or Item they will be called with
- * the current frame and the item used to execute the action.</li>
- * <li> If the second item is also of type Frame or Item it will be set to the
- * current frame or item.</li>
+ * <li> If the first parameter is of type Frame, the current frame will be
+ * passed as a parameter.
+ * <li> If the next param is of type Item the item on the end of the cursor will
+ * be passed or the item that was clicked to execute the action if nothing is on
+ * the end of the cursor. current frame or item.</li>
  * <li> If there are multiple overloads for the same method they should be
  * declared in order of the methods with the most parameteres to least
@@ -383 +385 @@
          *            The starting Frame that the JAG is being launched on
          */
-        private static void LaunchAgent(String name, String parameters, Frame source, Item clicked) {
+        private static void LaunchAgent(String name, String parameters,
+                        Frame source, Item clicked) {
                 // Use the correct case version for printing error messages
                 String nameWithCorrectCase = name;
@@ -444 +447 @@
                         t.setPriority(Thread.MIN_PRIORITY);
 
+                        Item itemParam = clicked;
+                        if (FreeItems.textAttachedToCursor()) {
+                                itemParam = FreeItems.getItemAttachedToCursor();
+                        }
+
                         // check for errors during initialisation
-                        if (!_Agent.initialise(source, clicked)) {
+                        if (!_Agent.initialise(source, itemParam)) {
                                 MessageBay.errorMessage("Error initialising agent: "
                                                 + nameWithCorrectCase);
@@ -521 +529 @@
                 Class[] paramTypes = method.getParameterTypes();
 
+                int paramCount = paramTypes.length;
                 // if the method has no parameters
-                if (paramTypes.length == 0)
+                if (paramCount == 0)
                         return new Object[0];
 
-                Object[] objects = new Object[paramTypes.length];
+                Object[] objects = new Object[paramCount];
                 int ind = 0;
 
@@ -531 +540 @@
                 // or launcher
                 // length must be at least one if we are still running
-                if (paramTypes[0] == Frame.class) {
-                        objects[0] = source;
-                        ind = 1;
-                } else if (Item.class.isAssignableFrom(paramTypes[0])) {
-                        objects[0] = launcher;
-                        ind = 1;
-                }
-
-                // if the first class was a frame or item, the second class might be the
-                // other
-                if (paramTypes.length > 1 && objects[0] != null) {
-                        if (paramTypes[1] == Frame.class) {
-                                objects[1] = source;
-                                ind = 2;
-                        } else if (Item.class.isAssignableFrom(paramTypes[1])) {
-                                objects[1] = launcher;
-                                ind = 2;
-                        }
+                if (paramTypes[ind] == Frame.class) {
+                        objects[ind] = source;
+                        ind++;
+                }
+
+                if (paramCount > ind && Item.class.isAssignableFrom(paramTypes[ind])) {
+                        objects[ind] = launcher;
+                        ind++;
                 }
 
@@ -670 +669 @@
          */
         public static String getCapitalizedFontName(String fontName) {
-                //Initialize the fonts if they have not already been loaded
+                // Initialize the fonts if they have not already been loaded
                 initFonts();
                 return _Fonts.get(fontName.toLowerCase());
@@ -688 +687 @@
                 }
         }
-        
-        public static HashMap<String, String> getFonts(){
+
+        public static HashMap<String, String> getFonts() {
                 initFonts();
                 return _Fonts;

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

@@ -9 +9 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
 
 import javax.imageio.ImageIO;
 
+import org.expeditee.gui.AttributeUtils;
+import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -28 +33 @@
 import org.expeditee.stats.StatsLogger;
 import org.expeditee.stats.TreeStats;
+import org.nfunk.jep.Node;
+import org.nfunk.jep.Variable;
 
 /**
@@ -88 +95 @@
                                                 action);
                         }
+                } else {
+                        MessageBay.errorMessage("Item must be a text item.");
                 }
         }
@@ -106 +115 @@
                         if (deletedFrameName != null) {
                                 DisplayIO.Back();
-                                //Remove any links on the previous frame to the one being deleted
+                                // Remove any links on the previous frame to the one being
+                                // deleted
                                 Frame current = DisplayIO.getCurrentFrame();
                                 for (Item i : current.getItems())
@@ -116 +126 @@
                                 MessageBay.displayMessage(deletedFrame + " renamed "
                                                 + deletedFrameName);
-                                //FrameGraphics.Repaint();
+                                // FrameGraphics.Repaint();
                                 return;
                         }
@@ -645 +655 @@
                 return item;
         }
+
+        public static void calculate(Frame frame, Item toCalculate) {
+                if (toCalculate instanceof Text) {
+                        Text text = (Text) toCalculate;
+                        org.nfunk.jep.JEP myParser = new org.nfunk.jep.JEP();
+                        myParser.addStandardFunctions();
+                        myParser.addStandardConstants();
+                        myParser.setImplicitMul(true);
+
+                        Observer observer = new Observer() {
+                                private String _attribute = "";
+                                public void update(Observable ob, Object o) {
+                                        _attribute = ((Variable)o).getName() + ": ";
+                                }
+                                
+                                @Override
+                                public String toString() {
+                                        return _attribute;
+                                }
+                        };
+
+                        // Check for variables
+                        for (Text t : frame.getTextItems()) {
+                                AttributeValuePair avp = AttributeUtils.getPair(t.getText());
+                                if (avp != null) {
+                                        myParser.addVariable(avp.getAttribute(), avp
+                                                        .getDoubleValue());
+                                }
+                        }
+                        
+                        myParser.getSymbolTable().addObserver(observer);
+                        myParser.setAllowAssignment(true);
+                        myParser.setAllowUndeclared(true);
+                        
+                        // Do the calculation
+                        Node node = myParser.parseExpression(text.getText());
+                        if (node == null) {
+                                for (String s : myParser.getErrorInfo().split("\n")) {
+                                        MessageBay.errorMessage(s);
+                                }
+                        } else {
+                                Double result = myParser.getValue();
+                                NumberFormat nf = NumberFormat.getInstance();
+                                nf.setMinimumFractionDigits(0);
+                                nf.setMaximumFractionDigits(15);
+                                text.setText(observer.toString() + nf.format(result));
+                                text.setPosition(FrameMouseActions.MouseX,
+                                                FrameMouseActions.MouseY);
+                                FrameMouseActions.resetOffset();
+                        }
+
+                }
+        }
 }

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

@@ -24 +24 @@
 import org.expeditee.agents.WriteTree;
 import org.expeditee.gui.AttributeUtils;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -312 +313 @@
                         t.start();
                 } else {
-                        assert (testSuite.runSuite());
+                        if (!testSuite.runSuite()){
+                                throw new RuntimeException(frameset + " failed");
+                        }
                 }
 
@@ -826 +829 @@
                                                 .getVariable(tokens[1]).getValue();
                                 boolean bFound = false;
-                                for (Text itemToSearch : frameToSearch.getBodyTextItems(true,
-                                                true)) {
+                                for (Text itemToSearch : frameToSearch.getTextItems()) {
                                         bFound = context.searchItem(itemToSearch, context
                                                         .getPrimitives().getStringValue(tokens[2]),
@@ -862 +864 @@
                                                 tokens[2]);
                                 SearchAgent searchAgent = new SearchFrameset();
-                                searchAgent.initialise(frameset, resultsFrameset,
+                                searchAgent.initialise(null, null, frameset, resultsFrameset,
                                                 replacementString, pattern);
                                 _agent = searchAgent;
@@ -899 +901 @@
                                 SearchAgent searchAgent = new SearchTree();
                                 _agent = searchAgent;
-                                searchAgent.initialise(topFrameName, resultsFrameset,
+                                searchAgent.initialise(null, null, topFrameName, resultsFrameset,
                                                 replacementString, pattern);
                                 searchAgent.run();
@@ -962 +964 @@
                                 Item valueItem = null;
                                 // Begin the search
-                                for (Text text : targetFrame.getBodyTextItems(true)) {
+                                for (Text text : targetFrame.getTextItems()){
                                         String s = text.getText().toLowerCase();
 
@@ -978 +980 @@
                                                         .getParagraphEndPosition();
 
-                                        for (Text text : targetFrame.getBodyTextItems(true)) {
+                                        for (Text text : targetFrame.getTextItems()) {
                                                 Point startPoint = text.getPosition();
                                                 if (Math.abs(startPoint.y - endPoint.y) < 10
@@ -1196 +1198 @@
                                         Item valueItem = null;
                                         // Begin the search
-                                        for (Text text : targetFrame.getBodyTextItems(true)) {
+                                        for (Text text : targetFrame.getTextItems()) {
                                                 String s = text.getText().toLowerCase();
                                                 if (s.startsWith(targetAttribute)) {
@@ -1213 +1215 @@
                                                                 .getParagraphEndPosition();
 
-                                                for (Text text : targetFrame.getBodyTextItems(true)) {
+                                                for (Text text : targetFrame.getTextItems()) {
                                                         Point startPoint = text.getPosition();
                                                         if (Math.abs(startPoint.y - endPoint.y) < 10
@@ -1254 +1256 @@
                                         context.getPrimitives().setValue(frameNameVar,
                                                         frame.getName());
-                                } else if (tokens[0].startsWith("getframefilepath")) {
+                                } else if (tokens[0].startsWith("getframetitle")) {
+                                        String frameTitleVar = DEFAULT_ITEM;
+                                        String frameVar = DEFAULT_FRAME;
+
+                                        if (tokens.length > 1) {
+                                                assertExactParametreCount(tokens, 2);
+                                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                                                frameTitleVar = tokens[2];
+                                                frameVar = tokens[1];
+                                        }
+                                        Frame frame = (Frame) context.getPointers().getVariable(
+                                                        frameVar).getValue();
+                                        context.getPointers().setObject(frameTitleVar,
+                                                        frame.getTitleItem());
+                                }else if (tokens[0].startsWith("getframefilepath")) {
                                         assertExactParametreCount(tokens, 2);
                                         String frameName = context.getPrimitives().getStringValue(
@@ -1371 +1388 @@
                                         // assertPrimitiveType(tokens[2], 2);
                                         String link = ((Item) context.getPointers().getVariable(
-                                                        tokens[1]).getValue()).getLink();
+                                                        tokens[1]).getValue()).getAbsoluteLink();
                                         context.getPrimitives().setValue(tokens[2],
                                                         new SString(link));
@@ -1645 +1662 @@
                         } else if (ifStatement.equals("ifdefined")) {
                                 result = context.isDefined(tokens[1]);
-                        } else if (ifStatement.equals("ifnotdef")) {
+                        } else if (ifStatement.equals("ifnotdefined")) {
                                 result = !context.isDefined(tokens[1]);
                         } else if (ifStatement.equals("ifzero")) {
@@ -1982 +1999 @@
                         } else
                                 context.readFrame(frameName, frameVar, null);
-                } else if (tokens[0].equals("readkbdcond")) {
+                }else if (tokens[0].equals("exitexpeditee")) {
+                        Browser._theBrowser.exit();
+                }else if (tokens[0].equals("readkbdcond")) {
 
                         String nextCharVarName = DEFAULT_CHAR;

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

@@ -5 +5 @@
 import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.items.Item;

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

@@ -3 +3 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
-import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Item;

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

@@ -52 +52 @@
                 ArrayList<Item> columnHeads = new ArrayList<Item>();
 
-                ArrayList<ArrayList<Item>> columns = new ArrayList<ArrayList<Item>>();
+                ArrayList<ArrayList<Text>> columns = new ArrayList<ArrayList<Text>>();
 
-                for (Item t : itemsToFormat) {
+                for (Text t : itemsToFormat) {
                         int col = findColumn(columnHeads, t);
                         // if this is the head of a new column
                         if (col < 0) {
                                 columnHeads.add(t);
-                                columns.add(new ArrayList<Item>());
+                                columns.add(new ArrayList<Text>());
                                 // otherwise the column for this item has already been
                                 // found set the column to be the one we just added...
@@ -92 +92 @@
 
                 // sort lists by their X axis
-                Collections.sort(columns, new Comparator<ArrayList<Item>>() {
-                        public int compare(ArrayList<Item> o1, ArrayList<Item> o2) {
+                Collections.sort(columns, new Comparator<ArrayList<Text>>() {
+                        public int compare(ArrayList<Text> o1, ArrayList<Text> o2) {
                                 if (o2.size() == 0)
                                         return -10;
@@ -112 +112 @@
 
                 for (int i = 0; i < columns.size() - 1; i++) {
-                        List<Item> list = columns.get(i);
+                        List<Text> list = columns.get(i);
 
                         int maxX = 0;

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

@@ -5 +5 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FreeItems;
-import org.expeditee.gui.MessageBay;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Item;
@@ -23 +21 @@
         @Override
         public boolean initialise(Frame frame, Item item) {
-                if (FreeItems.getInstance().size() != 1) {
-                        MessageBay
-                                        .displayMessage("Attach search pattern to the end of the cursor");
-                        return false;
-                }
-                Item cursorItem = Frame.getItemAttachedToCursor();
-                if (!(cursorItem instanceof Text))
-                        return false;
-
-                String pattern = ((Text) cursorItem).getText();
+                String pattern = item.getText();
                 String resultFrameset = null;
+                
+                //TODO use a results frame specified on the profile frame
                 if (item.getLink() == null) {
                         resultFrameset = frame.getFramesetName();
@@ -40 +31 @@
                                         false);
                 }
-                return initialise(frame.getFramesetName(), resultFrameset, null, pattern);
+                return initialise(frame, item, frame.getFramesetName(), resultFrameset, null, pattern);
         }
 
-        public boolean initialise(String startName, String resultsFrameset,
+        public boolean initialise(Frame frame, Item item, String startName, String resultsFrameset,
                         String replacementString, String pattern) {
                 _pattern = pattern;
@@ -57 +48 @@
                 _end = _results.getFirstFrame();
                 
-                return super.initialise(null, null);
+                return super.initialise(frame, item);
         }
         
@@ -86 +77 @@
                 if (frameToSearch == null)
                         return false;
-                for (Text itemToSearch : frameToSearch.getVisibleTextItems()) {
+                for (Text itemToSearch : frameToSearch.getTextItems()) {
                         // Search for the item and add it to the results page if
                         // it is found

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

@@ -42 +42 @@
                 overwriteMessage("Searching " + frameName);
 
-                for (Text itemToSearch : frameToSearch.getVisibleTextItems()) {
+                for (Text itemToSearch : frameToSearch.getTextItems()) {
                         // Search for the item and add it to the results page if
                         // it is found

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

@@ -95 +95 @@
                         _GetMethods.add(Item.class.getMethod("getLink", param));
                         _GetMethods.add(Item.class.getMethod("getFillColor", param));
+                        _GetMethods.add(Item.class.getMethod("getGradientColor", param));
                         _GetMethods.add(Item.class.getMethod("getFillPattern", param));
                         _GetMethods.add(Item.class.getMethod("getThickness", param));
@@ -709 +710 @@
                 return null;
         }
+
+        public static AttributeValuePair getPair(String text) {
+                //TODO Make this more efficient
+                String attribute = AttributeUtils.getAttribute(text);
+                String value = AttributeUtils.getValue(text);
+                if(attribute == null || value == null)
+                        return null;
+                return new AttributeValuePair(attribute, value);
+        }
 }

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

@@ -102 +102 @@
         }
 
-        public static boolean isInitComplete() {
+        private static boolean isInitComplete() {
                 return _initComplete;
         }
@@ -428 +428 @@
         }
 
+        public static Browser initialize(){
+                if (Browser._theBrowser == null) {
+                        Browser.main(null);
+                        try {
+                                while (!isInitComplete()) {
+                                        Thread.sleep(10);
+                                }
+                        } catch (Exception e) {
+                        }
+                }
+                return _theBrowser;
+        }
+
 }

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

@@ -62 +62 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp18Jul2008A";
+        public static final String TITLE = "Exp22Jul2008A";
 
         private DisplayIO() {
@@ -207 +207 @@
                 FrameMouseActions.setLastRobotMove(x, y);
 
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         List<Item> toMove = FreeItems.getInstance();
                         for (Item move : toMove) {

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

@@ -237 +237 @@
         }
 
-        public List<Text> getVisibleTextItems() {
-                List<Text> textItems = new ArrayList<Text>();
-                for (Item i : getItems(true)) {
-                        // only add up normal body text items
-                        if (i instanceof Text) {
-                                textItems.add((Text) i);
-                        }
-                }
-                return textItems;
-        }
-
         public List<Item> getItems() {
                 return getItems(false);
@@ -264 +253 @@
 
         /**
-         * Gets a list of all the non annotation text items on the frame, excluding
-         * the title and frame name.
+         * Returns a list of all the non annotation text items on the frame which
+         * are not the title or frame name or special annotation items.
          * 
          * @param includeAnnotations
-         *            true if annotations should be included in the list
-         * @return list of text items
-         */
-        public List<Text> getBodyTextItems(boolean includeAnnotations) {
-                return getBodyTextItems(includeAnnotations, false);
-        }
-
-        /**
-         * Returns a list of all the non annotation text items on the frame which
-         * are not the title or frame name.
-         * 
+         *            true if annotation items without special meaning should be
+         *            included
          * @param includeLineEnds
          *            true if text on the end of lines should be included in the
@@ -284 +264 @@
          * @return the list of body text items.
          */
-        public List<Text> getBodyTextItems(boolean includeAnnotations,
-                        boolean includeLineEnds) {
+        public List<Text> getBodyTextItems(boolean includeAnnotations) {
                 List<Text> bodyTextItems = new ArrayList<Text>();
                 for (Item i : getItems(true)) {
                         // only add up normal body text items
                         if ((i instanceof Text)
-                                        && (includeAnnotations || !i.isAnnotation())
-                                        && (includeLineEnds || !i.isLineEnd())) {
+                                        && ((includeAnnotations && !((Text) i)
+                                                        .isSpecialAnnotation()) || !i.isAnnotation())
+                                        && !i.isLineEnd()) {
                                 bodyTextItems.add((Text) i);
                         }
@@ -617 +597 @@
         public void resetDateCreated() {
                 setDateCreated(Logger.EasyDateFormat("ddMMMyyyy:HHmm"));
+                setActiveTime(new Time(0));
+                setDarkTime(new Time(0));
+                setVersion(0);
         }
 
@@ -662 +645 @@
                 if (item == null || item.equals(_frameName) || _body.contains(item))
                         return;
+
+                // When an annotation item is anchored the annotation list must be
+                // refreshed
+                if (item.isAnnotation()) {
+                        clearAnnotations();
+                }
 
                 if (item instanceof Line)
@@ -706 +695 @@
                         if (anchorRight != null) {
                                 i.setX(width - anchorRight);
-                                if(i.hasVector()){
+                                if (i.hasVector()) {
                                         bReparse = true;
                                 }
@@ -712 +701 @@
                         if (anchorBottom != null) {
                                 i.setY(height - anchorBottom);
-                                if(i.hasVector()){
+                                if (i.hasVector()) {
                                         bReparse = true;
                                 }
                         }
                 }
-                if(bReparse){
+                if (bReparse) {
                         FrameUtils.Parse(this, false);
                 }
@@ -725 +714 @@
 
         public void addAllItems(Collection<Item> toAdd) {
-                for (Item i : toAdd)
+                for (Item i : toAdd) {
+                        // If an annotation is being deleted clear the annotation list
+                        if (i.isAnnotation())
+                                i.getParentOrCurrentFrame().clearAnnotations();
                         addItem(i);
+                }
         }
 
         public void removeAllItems(Collection<Item> toRemove) {
-                for (Item i : toRemove)
+                for (Item i : toRemove) {
+                        // If an annotation is being deleted clear the annotation list
+                        if (i.isAnnotation())
+                                i.getParentOrCurrentFrame().clearAnnotations();
                         removeItem(i);
+                }
         }
 
         public void removeItem(Item item) {
+                // If an annotation is being deleted clear the annotation list
+                if (item.isAnnotation())
+                        item.getParentOrCurrentFrame().clearAnnotations();
+
                 if (_body.remove(item)) {
                         change();
@@ -954 +955 @@
         }
 
-        public Item getItemAbove(Item current) {
+        public Text getTextAbove(Text current) {
+                Collection<Text> currentTextItems = FrameUtils.getCurrentTextItems();
+                List<Text> toCheck = new ArrayList<Text>();
+                if (currentTextItems.contains(current)) {
+                        toCheck.addAll(currentTextItems);
+                } else {
+                        toCheck.addAll(getTextItems());
+                }
                 // Make sure the items are sorted
-                Collections.sort(_body);
-                int ind = _body.indexOf(current);
+                Collections.sort(toCheck);
+
+                int ind = toCheck.indexOf(current);
                 if (ind == -1)
                         return null;
@@ -963 +972 @@
                 // loop through all items above this one, return the first match
                 for (int i = ind - 1; i >= 0; i--) {
-                        Item check = _body.get(i);
-                        if (check.isVisible() && FrameUtils.inSameColumn(check, current))
+                        Text check = toCheck.get(i);
+                        if (FrameUtils.inSameColumn(check, current))
                                 return check;
                 }
@@ -992 +1001 @@
          *            The Item to get the column for.
          */
-        public List<Item> getColumn(Item from) {
+        public List<Text> getColumn(Item from) {
                 // Check that this item is on the current frame
                 if (!_body.contains(from))
                         return null;
 
-                // Make sure the items are sorted
-                Collections.sort(_body);
-
                 if (from == null) {
                         from = getLastNonAnnotationTextItem();
@@ -1007 +1013 @@
                         return null;
 
-                List<Item> column = new ArrayList<Item>();
+                // Get the enclosedItems
+                Collection<Text> enclosed = FrameUtils.getCurrentTextItems();
+                List<Text> toCheck = null;
+                if (enclosed.contains(from)) {
+                        toCheck = new ArrayList<Text>();
+                        toCheck.addAll(enclosed);
+                } else {
+                        toCheck = getBodyTextItems(true);
+                }
+
+                // Make sure the items are sorted
+                Collections.sort(toCheck);
+
+                List<Text> column = new ArrayList<Text>();
 
                 // Create a list of items consisting of the item 'from' and all the
                 // items below it which are also in the same column as it
-                for (int i = _body.indexOf(from); i < _body.size(); i++) {
-                        Item item = _body.get(i);
-                        if (item.isVisible() && isNormalTextItem(item)) {
-                                if (FrameUtils.inSameColumn(from, item))
-                                        column.add(item);
-                        }
+                for (int i = toCheck.indexOf(from); i < toCheck.size(); i++) {
+                        Text item = toCheck.get(i);
+                        if (FrameUtils.inSameColumn(from, item))
+                                column.add(item);
                 }
 
@@ -1314 +1331 @@
                 _body = newBody;
                 change();
+
+                if (!keepAnnotations)
+                        _annotations.clear();
         }
 
@@ -1352 +1372 @@
                 // Make it the width of the page
                 // t.setMaxWidth(FrameGraphics.getMaxFrameSize().width);
-                //if (t.getWidth() <= 0) {
-                        t.setRightMargin(FrameGraphics.getMaxFrameSize().width);
-                //}
+                // if (t.getWidth() <= 0) {
+                t.setRightMargin(FrameGraphics.getMaxFrameSize().width);
+                // }
                 addItem(t);
                 return t;
@@ -1460 +1480 @@
                                 && (FreeItems.getInstance().get(0) instanceof Line || FreeItems
                                                 .getInstance().get(1) instanceof Line);
-        }
-
-        public static boolean itemAttachedToCursor() {
-                return FreeItems.getInstance().size() > 0;
-        }
-
-        public static boolean textItemAttachedToCursor() {
-                return itemAttachedToCursor()
-                                && FreeItems.getInstance().get(0) instanceof Text;
-        }
-
-        // TODO move this method to FreeItems
-        public static Item getItemAttachedToCursor() {
-                if (itemAttachedToCursor())
-                        return FreeItems.getInstance().get(0);
-
-                return null;
         }
 
@@ -1548 +1551 @@
                                         if (t.getText().equals(""))
                                                 DisplayIO.getCurrentFrame().removeItem(t);
-                                        if (!Frame.itemAttachedToCursor()) {
+                                        if (!FreeItems.itemAttachedToCursor()) {
                                                 DisplayIO.setCursorPosition(((Text) it)
                                                                 .getParagraphEndPosition());
@@ -1710 +1713 @@
 
         public void addAnnotation(Text item) {
+                if (_annotations == null) {
+                        _annotations = new HashMap<String, Text>();
+                }
                 // Check if this item has already been processed
                 String[] tokens = item.getProcessedText();
@@ -1755 +1761 @@
 
         public boolean hasAnnotation(String annotation) {
+                if (_annotations == null)
+                        refreshAnnotationList();
                 return _annotations.containsKey(annotation.toLowerCase());
         }
 
         public String getAnnotationValue(String annotation) {
+                if (_annotations == null)
+                        refreshAnnotationList();
+
                 Text text = _annotations.get(annotation.toLowerCase());
                 if (text == null)
@@ -1769 +1780 @@
         }
 
-        Map<String, Text> _annotations = new HashMap<String, Text>();
+        Map<String, Text> _annotations = null;
 
         public void clearAnnotations() {
-                _annotations.clear();
+                _annotations = null;
         }
 
@@ -1779 +1790 @@
         }
 
+        private void refreshAnnotationList() {
+                if (_annotations == null)
+                        _annotations = new HashMap<String, Text>();
+                else
+                        _annotations.clear();
+                for (Text text : getTextItems()) {
+                        if (text.isAnnotation()) {
+                                addAnnotation(text);
+                        }
+                }
+        }
+
         public Collection<Text> getAnnotationItems() {
+                if (_annotations == null) {
+                        refreshAnnotationList();
+                }
                 return _annotations.values();
         }
@@ -1851 +1877 @@
                 return vectorItems;
         }
+
+        /**
+         * Gets a list of all the text items on the frame.
+         * 
+         * @return
+         */
+        public Collection<Text> getTextItems() {
+                Collection<Text> textItems = new ArrayList<Text>();
+                for (Item i : getItems(true)) {
+                        // only add up normal body text items
+                        if ((i instanceof Text)) {
+                                textItems.add((Text) i);
+                        }
+                }
+                return textItems;
+        }
 }

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

@@ -658 +658 @@
                         if (toDisconnect != null && !(i instanceof WidgetEdge)) {
                                 Item.HighlightMode newMode = toDisconnect.getHighlightMode();
-                                if (Frame.itemAttachedToCursor())
+                                if (FreeItems.itemAttachedToCursor())
                                         newMode = Item.HighlightMode.Normal;
                                 // unhighlight all the other dots

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

@@ -567 +567 @@
                         }
                 }
-
                 return template;
         }
@@ -947 +946 @@
 
                 Frame newFrame = FrameIO.CreateFrame(frameset, title, templateLink);
-
                 return newFrame;
         }

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

@@ -12 +12 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -444 +445 @@
                 Frame current = DisplayIO.getCurrentFrame();
                 Item title = current.getTitleItem();
-                List<Text> textItems = current.getBodyTextItems(false);
+
+                Collection<Text> currentItems = FrameUtils.getCurrentTextItems();
+                List<Text> textItems = new ArrayList<Text>();
+                // Move to the next text item in the box if
+                if (currentItems.contains(currentItem)) {
+                        textItems.addAll(currentItems);
+                } else {
+                        textItems.add(current.getTitleItem());
+                        textItems.addAll(current.getBodyTextItems(true));
+                }
+
+                Collections.sort(textItems);
+
                 if (textItems.size() == 0) {
                         // If there are no text items on the frame its a NoOp
@@ -484 +497 @@
                         return;
                 }
-                // If the user is on the title item
-                if (current != null && title != null && title == currentItem) {
-                        if (down) {
-                                // Move to the first item
-                                DisplayIO.MoveCursorToEndOfItem(textItems.get(0));
-                                FrameGraphics.Repaint();
-                        }
-                        return;
-                }
 
                 // Find the current item... then move to the next item
@@ -498 +502 @@
 
                 int nextIndex = i + (down ? 1 : -1);
-                if (nextIndex >= 0) {
-                        if (nextIndex < textItems.size()) {
-                                DisplayIO.MoveCursorToEndOfItem(textItems.get(nextIndex));
-                        }
-                } else if (title != null) {
-                        DisplayIO.MoveCursorToEndOfItem(title);
+                if (nextIndex >= 0 && nextIndex < textItems.size()) {
+                        DisplayIO.MoveCursorToEndOfItem(textItems.get(nextIndex));
+                } else {
+                        DisplayIO.MoveCursorToEndOfItem(currentItem);
                 }
                 FrameGraphics.Repaint();
@@ -894 +896 @@
                 // get whatever the user is pointing at
                 Item on = FrameUtils.getCurrentItem();
+                
                 // check for enclosed mode
                 if (on == null && key.ordinal() < FunctionKey.AudienceMode.ordinal()) {
                         Collection<Item> enclosed = FrameUtils.getCurrentItems(on);
-
+                        
                         if (enclosed != null && enclosed.size() > 0) {
                                 // ensure only one dot\line is present in the list
@@ -1054 +1057 @@
 
                         // Get the list of items that must be dropped
-                        List<Item> column = DisplayIO.getCurrentFrame().getColumn(
+                        List<Text> column = DisplayIO.getCurrentFrame().getColumn(
                                         toDropFrom);
 
@@ -1071 +1074 @@
                         Text dummyItem = null;
 
-                        if (Frame.textItemAttachedToCursor()) {
-                                dummyItem = (Text) Frame.getItemAttachedToCursor();
+                        if (FreeItems.textAttachedToCursor()) {
+                                dummyItem = (Text) FreeItems.getItemAttachedToCursor();
                                 String autoBullet = getAutoBullet(dummyItem.getText());
 
@@ -1080 +1083 @@
                         }
                         dummyItem = createText();
-                        if (Frame.textItemAttachedToCursor()) {
-                                Text t = (Text) Frame.getItemAttachedToCursor();
+                        if (FreeItems.textAttachedToCursor()) {
+                                Text t = (Text) FreeItems.getItemAttachedToCursor();
                                 dummyItem.setSize(t.getSize());
                                 int lines = t.getTextList().size();
@@ -1144 +1147 @@
                                         }
                                 }
-                                if (!Frame.textItemAttachedToCursor() && !dummyItem.isEmpty()) {
+                                if (!FreeItems.textAttachedToCursor() && !dummyItem.isEmpty()) {
                                         DisplayIO.getCurrentFrame().addItem(dummyItem);
                                 }
 
                                 // Move the item to the cursor position
-                                if (Frame.itemAttachedToCursor()) {
+                                if (FreeItems.itemAttachedToCursor()) {
                                         DisplayIO.setCursorPosition(dummyItem.getX(), dummyItem
                                                         .getY());
-                                        Item firstItem = Frame.getItemAttachedToCursor();
+                                        Item firstItem = FreeItems.getItemAttachedToCursor();
                                         int deltaX = firstItem.getX() - dummyItem.getX();
                                         int deltaY = firstItem.getY() - dummyItem.getY();
@@ -1164 +1167 @@
                         }
                         if (dummyItem.getText().length() == 0
-                                        || Frame.itemAttachedToCursor())
+                                        || FreeItems.itemAttachedToCursor())
                                 dummyItem.getParentOrCurrentFrame().removeItem(dummyItem);
                         dummyItem.setRightMargin(FrameGraphics.getMaxFrameSize().width);
@@ -1349 +1352 @@
                 // if the user is not pointing to any item
                 if (item == null) {
-                        if (Frame.itemAttachedToCursor())
+                        if (FreeItems.itemAttachedToCursor())
                                 toSize.addAll(FreeItems.getInstance());
                         else {
@@ -1532 +1535 @@
                 Frame currentFrame = DisplayIO.getCurrentFrame();
                 if (item == null) {
-                        if (Frame.itemAttachedToCursor()) {
+                        if (FreeItems.itemAttachedToCursor()) {
                                 color = FreeItems.getInstance().get(0).getColor();
                         } else {
@@ -1596 +1599 @@
 
                 if (setBackgroundColor) {
-                        if (item == null && Frame.itemAttachedToCursor()) {
+                        if (item == null && FreeItems.itemAttachedToCursor()) {
                                 for (Item i : FreeItems.getInstance())
                                         i.setBackgroundColor(color);
@@ -1604 +1607 @@
                         }
                 } else {
-                        if (item == null && Frame.itemAttachedToCursor()) {
+                        if (item == null && FreeItems.itemAttachedToCursor()) {
                                 for (Item i : FreeItems.getInstance())
                                         i.setColor(color);

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

@@ -246 +246 @@
                 NavigationActions.ResetLastAddToBack();
                 // System.out.println(modifiersEx);
+                if (_mouseDown == 0)
+                        _lastMouseClickDate = new Date();
+
                 int buttonPressed = e.getButton();
                 _mouseDown += buttonPressed;
-
-                _lastMouseClickDate = new Date();
                 _lastClickedOn = FrameUtils.getCurrentItem();
                 // load any frame if necessary
@@ -321 +322 @@
                 if (buttonPressed != MouseEvent.BUTTON1
                                 && (_context == CONTEXT_FREESPACE || _context == CONTEXT_AT_ENCLOSURE)
-                                && Frame.itemAttachedToCursor()) {
+                                && FreeItems.itemAttachedToCursor()) {
                         FrameGraphics.changeHighlightMode(_lastHighlightedItem,
                                         Item.HighlightMode.None);
 
-                        _lastHighlightedItem = Frame.getItemAttachedToCursor();
+                        _lastHighlightedItem = FreeItems.getItemAttachedToCursor();
                         for (Item i : FreeItems.getInstance()) {
                                 i.setHighlightColor(Item.DEPRESSED_HIGHLIGHT);
@@ -444 +445 @@
                                                 Item.HighlightMode.None);
 
-                        if (Frame.itemAttachedToCursor()) {
+                        if (FreeItems.itemAttachedToCursor()) {
                                 move(FreeItems.getInstance());
                         }
@@ -461 +462 @@
                         if (lastRanged != null) {
 
-                                Item i = Frame.getItemAttachedToCursor();
+                                Item i = FreeItems.getItemAttachedToCursor();
                                 if (i != null && i instanceof Text) {
                                         lastRanged.replaceSelectedText(((Text) i).getText());
@@ -518 +519 @@
                                         return;
                                 }
-                                // if the entire text is selected then pickup the item
-                                if (lastRanged.getSelectionSize() == lastRanged.getLength()) {
+                                // if the entire text is selected and its not a line end then
+                                // pickup the item
+                                boolean entireText = lastRanged.getSelectionSize() == lastRanged
+                                                .getLength();
+                                if (entireText && !lastRanged.isLineEnd()) {
                                         pickup(lastRanged);
                                         lastRanged.clearSelection();
-                                        FrameGraphics.Repaint();
+                                        FrameGraphics.refresh(true);
                                         return;
                                 } else {
                                         ranged.setText(lastRanged.cutSelectedText());
+                                        ranged.setWidth(lastRanged.getWidth());
+                                        // If its the whole text then replace last ranged with a dot
+                                        if (entireText) {
+                                                Item dot = FrameKeyboardActions.replaceText(lastRanged);
+                                                dot.setHighlightMode(HighlightMode.None);
+                                        }
                                 }
                                 // if the user is copying text from the item
@@ -539 +549 @@
                                 }
                                 ranged.setText(lastRanged.copySelectedText());
+                                ranged.setWidth(lastRanged.getWidth());
                         }
 
@@ -545 +556 @@
                         ranged.setPosition(DisplayIO.getMouseX(), FrameMouseActions.getY());
                         pickup(ranged);
-
                         lastRanged.clearSelection();
-                        FrameGraphics.Repaint();
+                        lastRanged.setHighlightMode(HighlightMode.None);
+                        refreshHighlights();
+                        FrameGraphics.refresh(false);
                         return;
                 }
@@ -591 +603 @@
                 if (e.getButton() == MouseEvent.BUTTON2) {
                         SessionStats.AddFrameEvent("Mu");
-                        middleButton(clickedOn, clickedIn);
+                        middleButton(clickedOn, clickedIn, e.isShiftDown());
                         return;
                 }
@@ -609 +621 @@
          * This method handles all left-click actions
          */
-        private static void leftButton(Item clicked, Collection<Item> clickedIn) {
+        private void leftButton(Item clicked, Collection<Item> clickedIn) {
                 // if the user is pointing at something then either follow the link or
                 // do TDFC
@@ -710 +722 @@
                         if (clicked.isLineEnd()
                                         || clicked.getAllConnected().contains(
-                                                        Frame.getItemAttachedToCursor())) {
+                                                        FreeItems.getItemAttachedToCursor())) {
                                 return true;
                         }
@@ -718 +730 @@
                         return false;
 
-                Item attachedToCursor = Frame.getItemAttachedToCursor();
+                Item attachedToCursor = FreeItems.getItemAttachedToCursor();
 
                 if (clicked instanceof Text
@@ -731 +743 @@
         public static void middleButton() {
                 Item currentItem = FrameUtils.getCurrentItem();
-                middleButton(currentItem, FrameUtils.getCurrentItems(currentItem));
+                getInstance().middleButton(currentItem,
+                                FrameUtils.getCurrentItems(currentItem), false);
                 updateCursor();
         }
@@ -737 +750 @@
         public static void rightButton() {
                 Item currentItem = FrameUtils.getCurrentItem();
-                rightButton(currentItem, FrameUtils.getCurrentItems(currentItem));
+                getInstance().rightButton(currentItem,
+                                FrameUtils.getCurrentItems(currentItem));
                 updateCursor();
         }
@@ -743 +757 @@
         public static void leftButton() {
                 Item currentItem = FrameUtils.getCurrentItem();
-                leftButton(currentItem, FrameUtils.getCurrentItems(currentItem));
+                getInstance().leftButton(currentItem,
+                                FrameUtils.getCurrentItems(currentItem));
                 updateCursor();
         }
@@ -750 +765 @@
          * This method handles all middle-click actions
          */
-        private static void middleButton(Item clicked, Collection<Item> clickedIn) {
+        private void middleButton(Item clicked, Collection<Item> clickedIn,
+                        boolean isShiftDown) {
                 // if the cursor has Items attached
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         // if the user is pointing at something, merge the items (if
                         // possible)
@@ -763 +779 @@
                                         return;
                                 }
-                                Item merger = Frame.getItemAttachedToCursor();
+                                Item merger = FreeItems.getItemAttachedToCursor();
                                 assert (merger != null);
-                                Collection<Item> left = merge(FreeItems.getInstance(), clicked);
+                                Collection<Item> left = null;
+                                // when anchoring a line end onto a text line end, holding shift
+                                // prevents the line ends from being merged
+                                if (isShiftDown) {
+                                        left = FreeItems.getInstance();
+                                } else {
+                                        left = merge(FreeItems.getInstance(), clicked);
+                                }
                                 anchor(left);
                                 FreeItems.getInstance().clear();
-                                FrameGraphics.Repaint();
                                 updateCursor();
+                                // Make sure the dot goes away when anchoring a line end behind
+                                // a text line end
+                                if (isShiftDown) {
+                                        refreshHighlights();
+                                }
                                 return;
                                 // otherwise, anchor the items
                         } else {
-                                if(clickedIn != null && FreeItems.getInstance().size() == 1){
-                                        Item item = Frame.getItemAttachedToCursor();
-                                        if(item instanceof Text){
-                                                Text text = (Text)item;
-                                                if(AttributeUtils.setAttribute(text, text)){
-                                                        clickedIn.removeAll(FrameUtils.getEnclosingLineEnds().iterator().next().getAllConnected());
-                                                        for(Item i: clickedIn){
+                                if (clickedIn != null && FreeItems.getInstance().size() == 1) {
+                                        Item item = FreeItems.getItemAttachedToCursor();
+                                        if (item instanceof Text) {
+                                                Text text = (Text) item;
+                                                if (AttributeUtils.setAttribute(text, text)) {
+                                                        clickedIn.removeAll(FrameUtils
+                                                                        .getEnclosingLineEnds().iterator().next()
+                                                                        .getAllConnected());
+                                                        for (Item i : clickedIn) {
                                                                 AttributeUtils.setAttribute(i, text);
                                                         }
@@ -786 +815 @@
                                         }
                                 }
-                                
+
                                 // if a line is being rubber-banded, check for auto
                                 // straightening
@@ -974 +1003 @@
          * This method handles all right-click action
          */
-        private static void rightButton(Item clicked, Collection<Item> clickedIn) {
+        private void rightButton(Item clicked, Collection<Item> clickedIn) {
                 // if the cursor has Items attached, then anchor a copy of them
 
                 List<Item> copies = null;
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         // if the user is clicking on something, merge the items
                         // unless it is a point onto somethin other than a lineEnd or a dot
                         if (clicked != null
                         // TODO Change the items merge methods so the logic is simplified
-                                        && (!(Frame.getItemAttachedToCursor() instanceof Dot)
+                                        && (!(FreeItems.getItemAttachedToCursor() instanceof Dot)
                                                         || clicked instanceof Dot || clicked.isLineEnd())) {
                                 // check permissions
@@ -1673 +1702 @@
                 refreshHighlights();
 
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         move(FreeItems.getInstance());
                         // System.out.println(FreeItems.getInstance().size());
@@ -1767 +1796 @@
 
                 // disable cursor changes when the cursor has items attached
-                if (Frame.itemAttachedToCursor()
+                if (FreeItems.itemAttachedToCursor()
                                 && DisplayIO.getCursor() != Item.TEXT_CURSOR)
                         _forceArrowCursor = false;
@@ -1849 +1878 @@
 
         public static void resetOffset() {
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         _offX = DisplayIO.getMouseX()
                                         - FreeItems.getInstance().get(0).getX()
@@ -1891 +1920 @@
 
                 // repaint things if necessary
-                if (Frame.itemAttachedToCursor())
+                if (FreeItems.itemAttachedToCursor())
                         move(FreeItems.getInstance());
         }
@@ -1918 +1947 @@
                 linker.setLink("" + next.getNumber());
 
-                for (Item i : next.getBodyTextItems(true)) {
+                for (Item i : next.getTextItems()) {
                         // Set the link for @Parent annotation item if one
                         if (ItemUtils.startsWithTag(i, ItemUtils.TAG_PARENT)
@@ -1955 +1984 @@
                         return;
 
-                if (Frame.itemAttachedToCursor())
+                if (FreeItems.itemAttachedToCursor())
                         return;
 
@@ -1983 +2012 @@
                 _offX = _offY = 0;
 
+                Frame current = DisplayIO.getCurrentFrame();
                 // check if the user is pointing at the frame's framename
                 if (toDelete != null
-                                && toDelete == DisplayIO.getCurrentFrame().getNameItem()) {
-                        DisplayIO.getCurrentFrame().clear(false);
+                                && toDelete == current.getNameItem()) {
+                        current.clear(false);
                         FrameGraphics.Repaint();
                         return;
@@ -1992 +2022 @@
 
                 // if the user is deleting items attached to the cursor
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         // if this is an item-swap
                         if (FreeItems.getInstance().size() == 1
@@ -2085 +2115 @@
                         }
 
-                        Frame current = toDelete.getParent();
-                        if (current != null) {
-                                current.setChanged(true);
+                        Frame parent = toDelete.getParent();
+                        if (parent != null) {
+                                parent.setChanged(true);
                         }
                         Collection<Item> toUndo = null;
@@ -2114 +2144 @@
                         }
                         SessionStats.DeletedItems(toUndo);
-                        if (current != null) {
-                                current.addAllToUndo(toUndo);
-                                current.removeAllItems(toUndo); // toDelete.getConnected()
+                        if (parent != null) {
+                                parent.addAllToUndo(toUndo);
+                                parent.removeAllItems(toUndo); // toDelete.getConnected()
                         }
                         // reset the mouse cursor
                         updateCursor();
-                        ItemUtils.EnclosedCheck(current.getItems());
+                        ItemUtils.EnclosedCheck(parent.getItems());
                         if (toDelete.hasOverlay()) {
-                                FrameUtils.Parse(current, false);
+                                FrameUtils.Parse(parent, false);
                                 FrameGraphics.requestRefresh(false);
                         }
@@ -2570 +2600 @@
                 Set<Frame> checkEnclosure = new HashSet<Frame>();
                 for (Item i : toAnchor) {
-                        //if (!i.hasVector())
-                                anchor(i, false);
+                        // if (!i.hasVector())
+                        anchor(i, false);
                         checkEnclosure.add(i.getParentOrCurrentFrame());
                         bReparse |= i.hasOverlay();
@@ -2737 +2767 @@
                 // TODO: Check why the new constrained line is not repainted immediately
                 FrameGraphics.requestRefresh(true);
+                FrameGraphics.refresh(true);
         }
 

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

@@ -140 +140 @@
          * @return
          */
-        public static int Align(List<Item> toAlign, boolean moveAll, int adjust) {
+        public static int Align(List<Text> toAlign, boolean moveAll, int adjust) {
                 Collections.sort(toAlign);
 
@@ -148 +148 @@
 
                 // get the first item
-                Item from = toAlign.get(0);
+                Text from = toAlign.get(0);
                 if (from.getParent() == null)
                         from = toAlign.get(1);
@@ -154 +154 @@
 
                 Frame curr = from.getParent();
-                Item above = curr.getItemAbove(from);
+                Text above = curr.getTextAbove(from);
 
                 String lastBullet = "";
 
                 if (above != null && curr.isNormalTextItem(above))
-                        lastBullet = FrameKeyboardActions.getAutoBullet(((Text) above)
-                                        .getText());
+                        lastBullet = FrameKeyboardActions.getAutoBullet(above.getText());
                 else {
-                        lastBullet = FrameKeyboardActions.getBullet(((Text) toAlign.get(0))
+                        lastBullet = FrameKeyboardActions.getBullet(toAlign.get(0)
                                         .getText());
                 }
@@ -168 +167 @@
                         // renumber...
                         for (int i = 0; i < toAlign.size(); i++) {
-                                assert toAlign.get(i) instanceof Text;
-
-                                Text currentText = ((Text) toAlign.get(i));
+
+                                Text currentText = toAlign.get(i);
                                 String currentBullet = FrameKeyboardActions
                                                 .getAutoBullet(currentText.getText());
@@ -329 +327 @@
 
                 // move any anchored connected items
-                if (Frame.itemAttachedToCursor()) {
+                if (FreeItems.itemAttachedToCursor()) {
                         List<Item> toAdd = new ArrayList<Item>();
                         List<Item> toCheck = new ArrayList<Item>(FreeItems.getInstance());
@@ -531 +529 @@
                 UserSettings.TitleTemplate = profile.getTitleItem();
 
-                List<Text> items = profile.getBodyTextItems(true, true);
-
                 // check for all tags setting user values
-                for (Text item : items) {
+                for (Text item : profile.getTextItems()) {
                         if (!item.isAnnotation())
                                 continue;
@@ -1464 +1460 @@
                 }
                 LastEdited = lastEdited;
-                
+
                 if (toReparse != null) {
                         Parse(toReparse, false);
@@ -1475 +1471 @@
 
         public static Collection<Text> getCurrentTextItems() {
-                Collection<Text> currentTextItems = new LinkedList<Text>();
+                Collection<Text> currentTextItems = new LinkedHashSet<Text>();
                 Collection<Item> currentItems = getCurrentItems(null);
                 if (currentItems != null) {

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

@@ -4 +4 @@
 
 import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 
 public class FreeItems extends ArrayList<Item> {
@@ -43 +44 @@
         }
 
+        public static boolean itemAttachedToCursor() {
+                return getInstance().size() > 0;
+        }
+
+        public static boolean textAttachedToCursor() {
+                return itemAttachedToCursor()
+                                && getInstance().get(0) instanceof Text;
+        }
+
+        public static Item getItemAttachedToCursor() {
+                if (itemAttachedToCursor())
+                        return getInstance().get(0);
+                return null;
+        }
+
+        public static Text getTextAttachedToCursor() {
+                if(textAttachedToCursor())
+                        return (Text)getInstance().get(0);
+                return null;
+        }
+
         //      
         // @Override

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

@@ -31 +31 @@
 import org.expeditee.gui.FrameKeyboardActions;
 import org.expeditee.gui.FrameUtils;
+import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.Overlay;
@@ -988 +989 @@
         public void performActions() {
                 Frame sourceFrame = null;
+                Item sourceItem = FreeItems.getItemAttachedToCursor();
+                if(sourceItem == null){
+                        sourceItem = this;
+                }
+                
                 // if a link exists make it the source frame for this action
                 if (getLink() != null) {
@@ -1000 +1006 @@
 
                 for (String s : getAction()) {
-                        Actions.PerformAction(sourceFrame, this, s);
+                        Actions.PerformAction(sourceFrame, sourceItem, s);
                 }
         }
@@ -1064 +1070 @@
                         Simple.ProgramFinished();
                 }
+                //Need to repaint any highlights etc
+                FrameGraphics.requestRefresh(true);
         }
 
@@ -2378 +2386 @@
                 return _anchorBottom;
         }
+        
+        public String getText() {
+                return toString();
+        }
 }

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

@@ -91 +91 @@
          * @return True if an Item was found that is the given Tag, False otherwise.
          */
-        public static boolean ContainsTag(List<Item> items, int tag) {
+        public static boolean ContainsTag(Collection<Item> items, int tag) {
                 return ContainsTag(items, GetTag(tag));
         }
 
-        public static boolean ContainsTag(List<Item> items, String tag) {
+        public static boolean ContainsTag(Collection<Item> items, String tag) {
                 return (FindTag(items, tag) != null);
         }
 
-        public static boolean ContainsExactTag(List<Item> items, int tag) {
+        public static boolean ContainsExactTag(Collection<Item> items, int tag) {
                 return ContainsExactTag(items, GetTag(tag));
         }
 
-        public static boolean ContainsExactTag(List<Item> items, String tag) {
+        public static boolean ContainsExactTag(Collection<Item> items, String tag) {
                 return (FindExactTag(items, tag) != null);
         }
@@ -133 +133 @@
          *         is found
          */
-        public static Text FindTag(List<Item> items, String toFind) {
+        public static Text FindTag(Collection<Item> items, String toFind) {
                 for (Item i : items) {
                         if (i instanceof Text && i.isAnnotation())
@@ -142 +142 @@
         }
 
-        public static Item FindExactTag(List<Item> items, String toFind) {
+        public static Item FindExactTag(Collection<Item> items, String toFind) {
                 for (Item i : items) {
                         if (i instanceof Text && i.isAnnotation())

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

@@ -25 +25 @@
 
 import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameKeyboardActions;
@@ -1165 +1166 @@
         // This needs to be fixed!!
         private void rebuild(boolean limitWidth) {
+                // TODO make this more efficient so it only clears annotation list when
+                // it really has to
+                if (isAnnotation()) {
+                        Frame parent = getParent();
+                        //parent can be null when running tests
+                        if (parent != null) {
+                                parent.clearAnnotations();
+                        }
+                }
+
                 // if there is no text, there is nothing to do
                 if (_text == null || _text.length() == 0) {
@@ -1755 +1766 @@
                 clearSelection();
                 setAlpha(0);
+                if (isLineEnd())
+                        DisplayIO.setCursor(Item.DEFAULT_CURSOR);
         }
 
@@ -1801 +1814 @@
                 String text = getText().toLowerCase();
                 // TODO make it so can just check the _overlay variable
-                //Mike cant remember the reason _overlay var cant be use! opps
-                if(!text.startsWith("@"))
+                // Mike cant remember the reason _overlay var cant be use! opps
+                if (!text.startsWith("@"))
                         return false;
                 return text.startsWith("@o") || text.startsWith("@ao")

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

@@ -164 +164 @@
                         return;
                 }
-                if(action.size() == 0)
+                if(action == null || action.size() == 0)
                         invalidateAll();
                 _source.setActions(action);