Changeset 50

Timestamp:

05/16/08 10:25:28 (16 years ago)

Author:

ra33

Message:

A whole day of big changes.
Adding the ability to have Text at the end of Lines.
Also a lot of refactoring to improve the quality of code relating to constraints and lines

Location:

trunk/src/org/expeditee

Files:

• actions/Simple.java (modified) (10 diffs)
• agents/ComputeTree.java (modified) (1 diff)
• agents/DefaultAgent.java (modified) (1 diff)
• agents/DisplayTree.java (modified) (1 diff)
• agents/SwitchyardTree.java (modified) (1 diff)
• agents/TreeProcessor.java (modified) (1 diff)
• agents/WriteTree.java (modified) (1 diff)
• gui/AttributeUtils.java (modified) (9 diffs)
• gui/Browser.java (modified) (1 diff)
• gui/DisplayIO.java (modified) (1 diff)
• gui/Frame.java (modified) (5 diffs)
• gui/FrameKeyboardActions.java (modified) (10 diffs)
• gui/FrameMouseActions.java (modified) (24 diffs)
• gui/FrameUtils.java (modified) (3 diffs)
• io/ExpReader.java (modified) (9 diffs)
• io/ExpWriter.java (modified) (11 diffs)
• io/KMSWriter.java (modified) (1 diff)
• items/Constraint.java (modified) (3 diffs)
• items/Dot.java (modified) (9 diffs)
• items/Item.java (modified) (27 diffs)
• items/ItemUtils.java (modified) (5 diffs)
• items/Line.java (modified) (18 diffs)
• items/Text.java (modified) (3 diffs)

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

@@ -9 +9 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Random;
 
 import org.expeditee.agents.DisplayTree;
@@ -26 +27 @@
 import org.expeditee.items.Line;
 import org.expeditee.items.Text;
+import org.expeditee.items.Item.SelectedMode;
 import org.expeditee.simple.BelowMinParametreCountException;
 import org.expeditee.simple.Context;
@@ -206 +208 @@
                         }
                 }
-
+                // The statement below assumes there are no other programs running at
+                // the same time
+                assert (_programsRunning == 0);
                 // Report the number of test passed and failed
                 FrameGraphics.DisplayMessage("Total tests: "
@@ -239 +243 @@
 
         private static void FlagError(Item item) {
-                // item.setColor(Color.CYAN);
                 FrameUtils.DisplayFrame(item.getParent().getFrameName(), true);
+                item.setSelectedMode(SelectedMode.Normal);
                 item.setSelectionColor(Color.CYAN);
                 FrameIO.SaveFrame(item.getParent());
@@ -349 +353 @@
                                                                 endOfToken + 1));
                                         } else {
-                                                throw new Exception("Expected matching \" "
-                                                                + code.toString());
+                                                throw new RuntimeException("Expected matching \" ");
                                         }
                                         break;
@@ -745 +748 @@
                                         throw new UnitTestFailedException("false", "true");
                                 return Status.OK;
+                        }
+                        if (tokens[0].equals("assertfail")) {
+                                assertExactParametreCount(tokens, 0);
+                                throw new UnitTestFailedException("pass", "fail");
                         } else if (tokens[0].equals("assertnull")) {
                                 assertExactParametreCount(tokens, 1);
@@ -1042 +1049 @@
 
                                 return Status.OK;
+                        } else if (tokens[0].equals("getrandominteger")) {
+                                assertExactParametreCount(tokens, 3);
+                                int lowerBound = (int) context.getPrimitives().getIntegerValue(
+                                                tokens[1]);
+                                int upperBound = (int) context.getPrimitives().getIntegerValue(
+                                                tokens[2]);
+                                Random random = new Random();
+                                long result = Math.abs(random.nextInt())
+                                                % (upperBound - lowerBound) + lowerBound;
+                                context.getPrimitives().setValue(tokens[3],
+                                                new SInteger(result));
+                                return Status.OK;
+                        } else if (tokens[0].equals("getrandomreal")) {
+                                assertExactParametreCount(tokens, 3);
+                                double lowerBound = context.getPrimitives().getDoubleValue(
+                                                tokens[1]);
+                                double upperBound = context.getPrimitives().getDoubleValue(
+                                                tokens[2]);
+                                Random random = new Random();
+                                double result = random.nextDouble() * (upperBound - lowerBound)
+                                                + lowerBound;
+                                context.getPrimitives().setValue(tokens[3], new SReal(result));
+                                return Status.OK;
+                        } else if (tokens[0].equals("getrandomtextitem")) {
+                                assertExactParametreCount(tokens, 2);
+                                assertVariableType(tokens[1], 1, SPointer.framePrefix);
+                                assertVariableType(tokens[2], 2, SPointer.itemPrefix);
+                                List<Text> items = ((Frame) context.getPointers().getVariable(
+                                                tokens[1]).getValue()).getBodyTextItems(false);
+                                Random random = new Random();
+                                int itemIndex = random.nextInt(items.size());
+                                context.getPointers()
+                                                .setObject(tokens[2], items.get(itemIndex));
+                                return Status.OK;
                         }
                 } else if (tokens[0].equals("or")) {
@@ -1136 +1177 @@
                         String command = getMessage(tokens, context, code.toString(), " ",
                                         1);
-                        Process p = Runtime.getRuntime().exec(command);
-                        FrameGraphics.DisplayMessage(command, Color.darkGray);
-                        
-                        BufferedReader stdInput = new BufferedReader(new InputStreamReader(
-                                        p.getInputStream()));
-                        BufferedReader stdError = new BufferedReader(new InputStreamReader(
-                                        p.getErrorStream()));
-                        String message = "";
-                        while ((message = stdInput.readLine()) != null) {
-                                FrameGraphics.DisplayMessage(message);
-                        }
-                        while ((message = stdError.readLine()) != null) {
-                                FrameGraphics.ErrorMessage(message);
+                        try {
+                                Process p = Runtime.getRuntime().exec(command);
+                                FrameGraphics.DisplayMessage(command, Color.darkGray);
+
+                                BufferedReader stdInput = new BufferedReader(
+                                                new InputStreamReader(p.getInputStream()));
+                                BufferedReader stdError = new BufferedReader(
+                                                new InputStreamReader(p.getErrorStream()));
+                                String message = "";
+                                while ((message = stdInput.readLine()) != null) {
+                                        FrameGraphics.DisplayMessage(message);
+                                }
+                                while ((message = stdError.readLine()) != null) {
+                                        FrameGraphics.ErrorMessage(message);
+                                }
+                        } catch (Exception e) {
+                                throw new RuntimeException(e.getMessage());
                         }
                         return Status.OK;
@@ -1666 +1711 @@
                                         DisplayIO.setCurrentFrame(frame);
                                         pause(thisFramesPause);
-                                        
+
                                         long freeMemory = runtime.freeMemory();
-                                        if(freeMemory < DisplayTree.GARBAGE_COLLECTION_THRESHOLD){
+                                        if (freeMemory < DisplayTree.GARBAGE_COLLECTION_THRESHOLD) {
                                                 runtime.gc();
-                                                FrameGraphics.DisplayMessage("Force Garbage Collection!");
+                                                FrameGraphics
+                                                                .DisplayMessage("Force Garbage Collection!");
                                         }
                                 }
@@ -1693 +1739 @@
                         String fileName = context.getPrimitives().getStringValue(tokens[3]);
                         WriteTree wt = new WriteTree(format, fileName);
-                        if (wt.initialise(source)){
+                        if (wt.initialise(source)) {
                                 wt.setStartFrame(source);
                                 wt.run();

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

@@ -3 +3 @@
 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/DefaultAgent.java

@@ -1 +1 @@
 package org.expeditee.agents;
 
-import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;

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

@@ -4 +4 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
-import org.expeditee.gui.FrameUtils;
-import org.expeditee.gui.TimeKeeper;
 import org.expeditee.items.Item;
 import org.expeditee.items.ItemUtils;

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

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

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

@@ -4 +4 @@
 import java.util.Stack;
 
-import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;

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

@@ -6 +6 @@
 
 import org.expeditee.actions.Actions;
-import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;

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

@@ -66 +66 @@
                         _GetMethods = new LinkedList<Method>();
                         _GetMethods.add(Item.class.getMethod("getDateCreated", param));
-                        
+
                         _GetMethods.add(Item.class.getMethod("getColor", param));
                         _GetMethods.add(Item.class.getMethod("getBackgroundColor", param));
@@ -74 +74 @@
                         _GetMethods.add(Item.class.getMethod("getFillPattern", param));
                         _GetMethods.add(Item.class.getMethod("getThickness", param));
-                        
+
                         _GetMethods.add(Item.class.getMethod("getOwner", param));
                         _GetMethods.add(Item.class.getMethod("getLinkMark", param));
@@ -99 +99 @@
                         _GetMethods.add(Text.class.getMethod("getJustification", param));
                         _GetMethods.add(Text.class.getMethod("getWidth", param));
-                        _GetMethods.add(Text.class.getMethod("getSize", param));
+                        _GetMethods.add(Item.class.getMethod("getSize", param));
 
                         _GetMethods.add(Frame.class.getMethod("getOwner", param));
@@ -111 +111 @@
                         Class[] pString = { String.class };
                         Class[] pInt = { int.class };
+                        Class[] pFloat = { float.class };
                         Class[] pColor = { Color.class };
                         Class[] pBool = { boolean.class };
@@ -119 +120 @@
                         _SetMethods = new HashMap<String, Method>();
 
-                        _SetMethods.put("size", Item.class.getMethod("setSize", pInt));
-                        _SetMethods.put("s", Item.class.getMethod("setSize", pInt));
+                        _SetMethods.put("thickness", Item.class.getMethod("setThickness",
+                                        pFloat));
+                        _SetMethods.put("t", Item.class.getMethod("setThickness", pFloat));
 
                         _SetMethods.put("color", Item.class.getMethod("setColor", pColor));
@@ -173 +175 @@
                         _SetMethods.put("family", Text.class
                                         .getMethod("setFamily", pString));
-                        _SetMethods.put("face", Text.class.getMethod("setFontStyle", pString));
-                        _SetMethods.put("fontstyle", Text.class.getMethod("setFontStyle", pString));
+                        _SetMethods.put("face", Text.class.getMethod("setFontStyle",
+                                        pString));
+                        _SetMethods.put("fontstyle", Text.class.getMethod("setFontStyle",
+                                        pString));
                         _SetMethods.put("justification", Text.class.getMethod(
                                         "setJustification", pInt));
                         _SetMethods.put("width", Text.class.getMethod("setWidth", pInt));
+                        _SetMethods.put("size", Item.class.getMethod("setSize", pInt));
+                        _SetMethods.put("s", Item.class.getMethod("setSize", pInt));
 
                         _SetMethods.put("foregroundcolor", Frame.class.getMethod(
@@ -548 +554 @@
 
                         try {
-                                Object[] params = Conversion.Convert(possible, value,
-                                                current);
+                                Object[] params = Conversion.Convert(possible, value, current);
 
                                 try {
@@ -561 +566 @@
                                         e.printStackTrace();
                                 } catch (InvocationTargetException e) {
-                                        // TODO Auto-generated catch block
-                                        e.printStackTrace();
+                                        FrameGraphics.DisplayMessage(toSet.getClass()
+                                                        .getSimpleName()
+                                                        + " type does not support that attribute.");
+                                        // e.printStackTrace();
                                 }
                         } catch (NumberFormatException e) {
@@ -620 +627 @@
         public static void setSingleValue(Text text, String value) {
                 assert (value != null);
-                
+
                 String oldText = text.getTextNoList();
                 String attribute = stripAttribute(oldText);

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

@@ -138 +138 @@
 
                 DisplayIO.setCurrentFrame(firstFrame);
+                DisplayIO.UpdateTitle();
 
                 FrameKeyboardActions keyboardListner = new FrameKeyboardActions();

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

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

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

@@ -231 +231 @@
         public List<Text> getBodyTextItems(boolean includeAnnotations) {
                 List<Text> bodyTextItems = new ArrayList<Text>();
-                Text frameTitle = getTitle();
-
                 for (Item i : getItems()) {
                         // only add up normal body text items
@@ -426 +424 @@
 
                 for (Item i : _body)
-                        if (i.isVisible() && i != _frameName && i.intersects(poly)) {
+                        if (i.isVisible() /*&& i != _frameName*/ && i.intersects(poly)) {
                                 if (!results.contains(i))
                                         results.add(i);
@@ -730 +728 @@
                                         line.getStartItem().addLine(line);
                                         line.getEndItem().addLine(line);
+                                } else {
+                                        i.setOffset(0, 0);
                                 }
                         }
@@ -1133 +1133 @@
 
         /**
-         * Creates a new Text Item with no text. The newly created Item is a copy
-         * the ItemTemplate if one is present, and inherits all the attributes of
-         * the Template
-         * 
-         * @return The newly created Text Item
+         * Creates a new text item with the given text.
+         * @param text
+         * @return
          */
         public Text createNewText(String text) {
@@ -1145 +1143 @@
         }
 
+        /**
+         * Creates a new Text Item with no text. The newly created Item is a copy
+         * the ItemTemplate if one is present, and inherits all the attributes of
+         * the Template
+         * 
+         * @return The newly created Text Item
+         */
         public Text createBlankText(String templateType) {
                 Text t;

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

@@ -16 +16 @@
 import org.expeditee.actions.Simple;
 import org.expeditee.io.Logger;
+import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
 import org.expeditee.items.Item;
@@ -121 +122 @@
                 // check for dot's being replaced with text
                 if (on != null && on instanceof Dot) {
+                        if (ch == KeyEvent.VK_BACK_SPACE || ch == KeyEvent.VK_DELETE) {
+                                return;
+                        }
                         replaceDot((Dot) on, ch);
+                        ItemUtils.EnclosedCheck(DisplayIO.getCurrentFrame().getItems());
                         return;
                 }
@@ -183 +188 @@
         }
 
-        private static void replaceDot(Dot dot, char ch) {
+        public static Text replaceDot(Dot dot, char ch) {
                 SessionStats.CreatedItem();
                 Text text = createText(ch);
+                text.setPosition(dot.getPosition());
+                text.setThickness(dot.getThickness());
                 FrameUtils.LastEdited = text;
 
-                List<Line> lines = new LinkedList<Line>();
-                lines.addAll(dot.getLines());
+                //Copy the lines list so it can be modified
+                List<Line> lines = new LinkedList<Line>(dot.getLines());
                 for (Line line : lines)
                         line.replaceEnd(dot, text);
-
-                dot.removeAllLines();
+                
                 DisplayIO.getCurrentFrame().removeItem(dot);
                 DisplayIO.getCurrentFrame().addItem(text);
-                return;
+                return text;
         }
 
@@ -206 +212 @@
                 List<Line> lines = new LinkedList<Line>();
                 lines.addAll(text.getLines());
-                for (Line line : lines)
+                if (lines.size() > 0)
+                        dot.setColor(lines.get(0).getColor());
+                for (Line line : lines){
                         line.replaceEnd(text, dot);
-                text.removeAllLines();
-
-                DisplayIO.getCurrentFrame().removeItem(text);
+                }
+                text.delete();
                 DisplayIO.getCurrentFrame().addItem(dot);
                 DisplayIO.setCursor(Item.DEFAULT_CURSOR);
@@ -576 +583 @@
                         if (enclosed != null && enclosed.size() > 0) {
                                 // ensure only one dot\line is present in the list
-                                List<Dot> dots = FrameUtils.getEnclosingDots();
+                                List<Item> dots = FrameUtils.getEnclosingDots();
                                 List<Item> connected = dots.get(0).getAllConnected();
 
@@ -621 +628 @@
 
                                 if (key == COLOR_CHANGE && connected.size() > 0) {
-                                        for (Dot d : dots) {
+                                        for (Item d : dots) {
                                                 SetFillColor(d);
                                                 break;
@@ -743 +750 @@
                 dummyItem = createText();
                 if (Frame.textItemAttachedToCursor()) {
-                        Text t = (Text)Frame.getItemAttachedToCursor();
+                        Text t = (Text) Frame.getItemAttachedToCursor();
                         dummyItem.setSize(t.getSize());
                         for (int i = 0; i < t.getText().size(); i++) {
@@ -987 +994 @@
          */
         private static void SetSize(Item ip, int diff, boolean moveCursor) {
-                List<Item> toSize;
+                List<Item> toSize = new ArrayList<Item>();
                 // the mouse is only moved when the Item is on the frame, not free
                 // boolean moveMouse = false;
@@ -995 +1002 @@
                 if (ip == null) {
                         if (Frame.itemAttachedToCursor())
-                                toSize = new ArrayList<Item>(Frame.FreeItems);
+                                toSize.addAll(Frame.FreeItems);
                         else {
                                 FrameGraphics
@@ -1009 +1016 @@
                         }
                         toSet = ip;
-
-                        toSize = toSet.getConnected();
-                        // moveMouse = true;
+                        Item currentItem = FrameUtils.getCurrentItem();
+
+                        if (currentItem != null && (currentItem instanceof Text)
+                                        && FrameUtils.getCurrentItems() == null) {
+                                toSize.add(currentItem);
+                        } else {
+                                toSize.addAll(toSet.getLines());
+                        }
                 }
 

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

@@ -13 +13 @@
 import java.util.List;
 
-import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 
 import org.expeditee.actions.Actions;
 import org.expeditee.actions.NavigationActions;
-import org.expeditee.agents.Format;
 import org.expeditee.items.Constraint;
 import org.expeditee.items.Dot;
@@ -223 +221 @@
 
                 _lastClickedIn = FrameUtils.getCurrentItems();
+                // if (_lastClickedIn != null){
+                // System.out.println(_lastClickedIn.size());}
 
                 SessionStats.MouseClicked(e.getButton());
@@ -632 +632 @@
                 Item attachedToCursor = Frame.getItemAttachedToCursor();
 
-                if (clicked instanceof Text && !(attachedToCursor instanceof Text)) {
+                if (clicked instanceof Text
+                                && !(attachedToCursor instanceof Text || attachedToCursor
+                                                .isLineEnd())) {
                         return false;
                 }
@@ -692 +694 @@
                                         if (toDisconnect != null) {
                                                 if (toDisconnect.getSelectedMode() == Item.SelectedMode.Normal) {
+                                                        DisplayIO.setCursorPosition(toDisconnect
+                                                                        .getPosition(), false);
                                                         pickup(toDisconnect);
                                                         return;
                                                 } else {
                                                         List<Line> lines = toDisconnect.getLines();
+                                                        // This is to remove constraints from single lines
+                                                        // with constraints...
+                                                        // ie. partially deleted rectangles
                                                         if (lines.size() == 1) {
-                                                                // remove constraints
                                                                 toDisconnect.removeAllConstraints();
 
@@ -706 +712 @@
                                                         }
                                                         // If we are then detatch the line and pick up its
-                                                        // end
-                                                        // point...
+                                                        // end point...
                                                         Frame currentFrame = DisplayIO.getCurrentFrame();
-                                                        Item newPoint = toDisconnect.copy();
-                                                        newPoint.setID(currentFrame.getNextItemID());
+                                                        Item newPoint = null;
+
+                                                        // If the point we are disconnecting is text...
+                                                        // Then we want to leave the text behind
+                                                        // And disconnect a point
+                                                        if (toDisconnect instanceof Text) {
+                                                                newPoint = new Dot(toDisconnect.getX(),
+                                                                                toDisconnect.getY(), -1);
+                                                                Item.DuplicateItem(toDisconnect, newPoint);
+                                                        } else {
+                                                                newPoint = toDisconnect.copy();
+                                                        }
+
                                                         currentFrame.addItem(newPoint);
                                                         // remove the current item from the connected
                                                         // list for this item
-                                                        for (Item i : lines) {
-                                                                if (i == l) {
-                                                                        toDisconnect.removeLine(l);
-                                                                        break;
-                                                                }
-                                                        }
-                                                        if (toDisconnect == l.getStartItem()) {
-                                                                l.setStartItem(newPoint);
-                                                        } else {
-                                                                l.setEndItem(newPoint);
-                                                        }
-
+                                                        l.replaceEnd(toDisconnect, newPoint);
                                                         // remove unneeded constrains
-                                                        List<Constraint> constraints = toDisconnect
-                                                                        .getConstraints();
-                                                        if (constraints != null) {
-                                                                for (Constraint c : constraints) {
-                                                                        Item oppositeEnd = l
-                                                                                        .getOppositeEnd(newPoint);
-                                                                        if (c.contains(oppositeEnd)) {
-                                                                                toDisconnect.removeConstraint(c);
-                                                                                oppositeEnd.removeConstraint(c);
-                                                                                break;
-                                                                        }
-                                                                }
-                                                        }
+                                                        newPoint.removeAllConstraints();
 
                                                         toDisconnect
@@ -746 +739 @@
                                                                         .getPosition(), false);
                                                         pickup(newPoint);
-
+                                                        ItemUtils.EnclosedCheck(toDisconnect.getCurrentFrame().getItems());
                                                         return;
                                                 }
                                         }
                                 }
-
+                                if (clicked.isLineEnd())
+                                        DisplayIO.setCursorPosition(clicked.getPosition(), false);
                                 pickup(clicked);
                                 return;
@@ -1228 +1222 @@
                                 if (Frame.FreeItems.size() == 2 && on instanceof Line) {
                                         Line line = (Line) on;
-                                        if (Frame.FreeItems.get(0) instanceof Dot)
-                                                line.showVirtualSpot((Dot) Frame.FreeItems.get(0),
-                                                                DisplayIO.getMouseX(), DisplayIO.getMouseY());
-                                        else if (Frame.FreeItems.get(1) instanceof Dot)
-                                                line.showVirtualSpot((Dot) Frame.FreeItems.get(1),
-                                                                DisplayIO.getMouseX(), DisplayIO.getMouseY());
+                                        if (Frame.FreeItems.get(0).isLineEnd())
+                                                line.showVirtualSpot(Frame.FreeItems.get(0), DisplayIO
+                                                                .getMouseX(), DisplayIO.getMouseY());
+                                        else if (Frame.FreeItems.get(1).isLineEnd())
+                                                line.showVirtualSpot(Frame.FreeItems.get(1), DisplayIO
+                                                                .getMouseX(), DisplayIO.getMouseY());
                                         else
                                                 // The user is pointing at another point or text item
@@ -1242 +1236 @@
                                         // FrameGraphics.ChangeSelectionMode(on,
                                         // Item.SelectedMode.Connected);
+                                        // TODO: The method below is for the most part redundant
                                         FrameGraphics.Highlight(on);
                                 }
@@ -1256 +1251 @@
                                 // highlighting
                         } else if (on == null) {
-                                List<Dot> enclosure = FrameUtils.getEnclosingDots();
+                                List<Item> enclosure = FrameUtils.getEnclosingDots();
                                 if (enclosure != null && enclosure.size() > 1) {
                                         if (enclosure.get(0).getLines().size() > 1 &&
@@ -1289 +1284 @@
                 if (Frame.itemAttachedToCursor()) {
                         move(Frame.FreeItems);
+                        // System.out.println(Frame.FreeItems.size());
                 }
 
@@ -1300 +1296 @@
         }
 
-        private boolean ContainsOneOf(List<Dot> enclosure, List<Item> freeItems) {
+        private boolean ContainsOneOf(List<Item> enclosure, List<Item> freeItems) {
                 if (freeItems == null)
                         return false;
@@ -1311 +1307 @@
 
         /**
+         * Checks if lines are being rubber banded.
+         * 
+         * @return true if the user is rubberBanding one or more lines
+         */
+        private static boolean rubberBanding() {
+                if (Frame.FreeItems.size() < 2) {
+                        return false;
+                }
+
+                // if rubber-banding, there will be 1 lineend and the rest will be lines
+                boolean foundLineEnd = false;
+                for (Item i : Frame.FreeItems) {
+                        if (i.isLineEnd()) {
+                                if (foundLineEnd) {
+                                        return false;
+                                }
+                                foundLineEnd = true;
+                        } else if (!(i instanceof Line)) {
+                                return false;
+                        }
+                }
+                return true;
+        }
+
+        /**
          * Updates the current mouse cursor to whatever it should be. i.e. Hidden
          * when rubber-banding lines, otherwise default (arrow)
          */
         private static void updateCursor() {
-                // if rubber-banding, there will be exactly 2 items on the cursor
-                if (Frame.FreeItems.size() != 2)
+                if (rubberBanding()) {
+                        DisplayIO.setCursor(Item.HIDDEN_CURSOR);
+                } else {
                         DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-                else {
-                        Dot d = null;
-                        // check that it is indeed a line being rubber-banded
-                        if (Frame.FreeItems.get(0) instanceof Line
-                                        && Frame.FreeItems.get(1) instanceof Dot)
-                                d = (Dot) Frame.FreeItems.get(1);
-                        else if (Frame.FreeItems.get(1) instanceof Line
-                                        && Frame.FreeItems.get(0) instanceof Dot)
-                                d = (Dot) Frame.FreeItems.get(0);
-
-                        if (d != null) {
-                                DisplayIO.setCursor(Item.HIDDEN_CURSOR);
-                        } else
-                                DisplayIO.setCursor(Item.DEFAULT_CURSOR);
-                }
-
+                }
         }
 
@@ -1578 +1585 @@
                         List<Item> toUndo = new LinkedList<Item>();
 
-                        if (toDelete instanceof Dot) {
-                                toUndo.addAll(deleteDot((Dot) toDelete));
+                        if (toDelete.isLineEnd()) {
+                                toUndo.addAll(deleteDot(toDelete));
                         } else
                                 toUndo.addAll(copy(toDelete.getConnected()));
@@ -1601 +1608 @@
                 List<Item> seen = new LinkedList<Item>();
 
+                // Mike: Removed code that checked for rectangles and removed them
+                // completely!!
+
                 // disconnect any connected items
                 for (Item i : itemList) {
                         if (i.getLines().size() > 0) {
-
-                                // check for rectangle deletion
-                                if (itemList.size() == 3) {
-                                        boolean rectangle = false;
-                                        // check that this is indeed a rectangle
-                                        for (Item check : itemList)
-                                                if (check != i && !i.getLines().contains(check)) {
-                                                        rectangle = false;
-                                                        break;
-                                                } else
-                                                        rectangle = true;
-
-                                        // if this is a rectangle, remove the entire
-                                        // rectangle
-                                        if (rectangle) {
-                                                List<Item> copy = copy(i.getAllConnected());
-                                                current.addAllToUndo(copy);
-                                                current.removeAllItems(i.getAllConnected());
-                                                itemList.clear();
-                                                // reset the mouse cursor
-                                                updateCursor();
-                                                FrameGraphics.Repaint();
-                                                return;
-                                        }
-                                }
-
-                                List<Item> copy = deleteDot((Dot) i);
+                                List<Item> copy = deleteDot(i);
                                 // add the copied items to the undo stack
                                 for (Item cop : copy)
@@ -1666 +1650 @@
         }
 
-        private static List<Item> deleteDot(Dot dot) {
+        private static List<Item> deleteDot(Item dot) {
 
                 if (dot instanceof WidgetCorner) { // Brook
@@ -1750 +1734 @@
                         Dot dot = null;
                         // check that this is indeed a rectangle
+                        // This wont work now that corners can be Text items
                         for (Item check : merger) {
-                                if (dot == null && check instanceof Dot)
+                                if (dot == null && check.isLineEnd())
                                         dot = (Dot) check;
                                 else if (check != dot && !dot.getLines().contains(check)) {
@@ -1786 +1771 @@
                                         mergee.removeAllConstraints();
                                         mergee.removeAllLines();
+                                        mergee.setThickness(4 * mergee.getThickness());
                                         return mergee.getAllConnected();
                                 } else {
@@ -1819 +1805 @@
                         } else {
                                 // check for attribute merging
-                                if (i instanceof Text) {
+                                if (i instanceof Text && !i.isLineEnd()) {
                                         Text txt = (Text) i;
 
@@ -1826 +1812 @@
                                                 // set mouse position for text merges
                                                 if (mergee instanceof Text)
-                                                        // 18Feb Rob doesnt want cursor to jump when
-                                                        // inserting text
                                                         ((Text) mergee).insertText(txt.getTextNoList(),
                                                                         DisplayIO.getMouseX(), DisplayIO
@@ -1833 +1817 @@
 
                                                 else if (mergee instanceof Dot) {
-                                                        mergee.getParent().removeItem(mergee);
+                                                        txt.setPosition(mergee.getPosition());
+                                                        txt.setThickness(mergee.getThickness());
+                                                        Frame parent = mergee.getParent();
+                                                        parent.removeItem(mergee);
+                                                        anchor(txt);
+                                                        // change the end points of the lines to the text
+                                                        // item
+                                                        while (mergee.getLines().size() > 0) {
+                                                                Line l = mergee.getLines().get(0);
+                                                                l.replaceEnd(mergee, txt);
+                                                        }
                                                         break;
                                                 }
@@ -1898 +1892 @@
                         Frame.FreeItems.add(i);
 
-                        if (i instanceof Dot)
-                                ((Dot) i).setFloating(true);
+                        i.setFloating(true);
                 }
 
@@ -1968 +1961 @@
 
         public static void anchor(Item toAnchor) {
-                // System.out.println("Anchor:" + toAnchor.getX() + "," +
-                // toAnchor.getY());
-
-                Frame current = null;
-
-                // if the item is from an overlay the parent will NOT be null
-                if (toAnchor.getParent() == null) {
-                        current = DisplayIO.getCurrentFrame();
-                } else {
-                        current = toAnchor.getParent();
-                }
-                // update the items ID to prevent conflicts with the current frame
-                //if (toAnchor.getID() < 0 || current.getItems().contains(toAnchor))
-                //      ;
-                toAnchor.setID(current.getNextItemID());
-                toAnchor.setOffset(0, 0);
-                toAnchor.setParent(current);
-
-                current.addItem(toAnchor);
-                current.setResort(true);
-
-                toAnchor.setRelativeLink();
-
-                if (toAnchor instanceof Dot) {
-                        for (Line line : ((Dot) toAnchor).getLines()) {
-                                if (line.getID() < 0 && !current.getItems().contains(line)) {
-                                        line.setID(current.getNextItemID());
-                                        line.setSelectionColor();
-                                        // Mike: Why was this line here?
-                                        // anchor(line);
-                                }
-                        }
-                        ((Dot) toAnchor).setFloating(false);
-                } else if (toAnchor instanceof Text) {
-                        // ensure all text items have their selection cleared
-                        ((Text) toAnchor).clearSelection();
-                        ((Text) toAnchor).setAlpha(0);
-                } else if (toAnchor instanceof Line) {
-                        ((Line) toAnchor).fixArrowheadLength();
-                }
+                toAnchor.anchor();
 
                 FrameGraphics.Repaint();
-                ItemUtils.EnclosedCheck(current.getItems());
+                ItemUtils.EnclosedCheck(toAnchor.getCurrentFrame().getItems());
         }
 
@@ -2049 +2003 @@
                                         else
                                                 line.toggleArrowHeadLength(arg0.getWheelRotation());
-                                        line.getParent().change();
+                                        // line.getParent().change();
                                         FrameGraphics.Repaint();
                                 }
@@ -2061 +2015 @@
 
                         Item ip = FrameUtils.getCurrentItem();
-                        if (ip != null && clicks > 1)
+                        if (ip != null && clicks > 1) {
+                                float size = ip.getSize();
+                                if (ip instanceof Dot || ip instanceof Line)
+                                        size = ip.getThickness();
                                 // base the number of clicks on the size of the object
-                                clicks = (int) Math.ceil(ip.getSize() / 20.0 * clicks);
+                                clicks = (int) Math.ceil(size / 20.0 * clicks);
+                        }
 
                         FrameKeyboardActions.functionKey(rotationType, clicks);

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

@@ -1071 +1071 @@
         public static List<Item> getCurrentItems() {
 
-                List<Dot> enclosure = getEnclosingDots();
+                List<Item> enclosure = getEnclosingDots();
                 if (enclosure == null || enclosure.size() == 0)
                         return null;
@@ -1085 +1085 @@
         }
 
-        public static List<Dot> getEnclosingDots() {
+        public static List<Item> getEnclosingDots() {
                 // update enclosed shapes
                 Frame current = DisplayIO.getCurrentFrame();
                 List<Item> items = current.getItems();
 
-                ArrayList<Dot> used = new ArrayList<Dot>(0);
-                ArrayList<Dot> seen = new ArrayList<Dot>(0);
+                ArrayList<Item> used = new ArrayList<Item>(0);
+                ArrayList<Item> seen = new ArrayList<Item>(0);
 
                 for (Item i : items)
-                        if (i instanceof Dot) {
-                                Dot d = (Dot) i;
-                                if (d.isEnclosed() && !seen.contains(d)) {
-                                        Polygon p = d.getEnclosedShape();
+                        if (i.isLineEnd()) {
+                                if (i.isEnclosed() && !seen.contains(i)) {
+                                        Polygon p = i.getEnclosedShape();
                                         if (p
                                                         .contains(DisplayIO.getMouseX(), DisplayIO
                                                                         .getMouseY())) {
 
-                                                used.add(d);
-                                                seen.addAll(d.getEnclosingDots());
+                                                used.add(i);
+                                                seen.addAll(i.getEnclosingDots());
                                         }
                                 }
@@ -1116 +1115 @@
                         // otherwise, determine which polygon is closest to the cursor
                 } else {
-                        Collections.sort(used, new Comparator<Dot>() {
-                                public int compare(Dot d1, Dot d2) {
+                        Collections.sort(used, new Comparator<Item>() {
+                                public int compare(Item d1, Item d2) {
                                         Polygon p1 = d1.getEnclosedShape();
                                         Polygon p2 = d2.getEnclosedShape();

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

@@ -37 +37 @@
 
         private String _frameName;
-        
+
         /**
          * Does nothing, location must be set before use
@@ -43 +43 @@
         public ExpReader(String frameName) {
                 _frameName = frameName;
-                
+
                 if (_ItemTags != null && _FrameTags != null)
                         return;
-                
+
                 _ItemTags = new LinkedHashMap<Character, Method>();
                 _FrameTags = new LinkedHashMap<Character, Method>();
@@ -123 +123 @@
                         _ItemTags.put('k', Text.class.getMethod("setJustification", pInt));
 
-                        _ItemTags.put('h', Dot.class.getMethod("setThickness", pFloat));
+                        _ItemTags.put('h', Item.class.getMethod("setThickness", pFloat));
                         _ItemTags.put('l', Item.class.getMethod("setLineIDs", pString));
-                        _ItemTags
-                                        .put('c', Dot.class.getMethod("setConstraintIDs", pString));
+                        _ItemTags.put('c', Item.class
+                                        .getMethod("setConstraintIDs", pString));
 
                         // Lines and constraints are created differently
@@ -164 +164 @@
 
                 try {
-                        //Framename must be set before setting the frame number
+                        // Framename must be set before setting the frame number
                         newFrame.setFrameName(_frameName);
-                        
+
                         // First read all the header lines
                         while (_reader.ready() && !(next = _reader.readLine()).equals("Z")) {
@@ -173 +173 @@
                                 }
                         }
-                        
+
                         // Now read all the items
                         Item currentItem = null;
                         while (_reader.ready() && !(next = _reader.readLine()).equals("Z")) {
                                 // if this is the start of a new item add a new item
-                                if (isValidLine(next) ) {
+                                if (isValidLine(next)) {
                                         if (getTag(next) == 'S') {
                                                 String value = getValue(next);
                                                 int id = Integer.parseInt(value.substring(2));
-                                                
+
                                                 switch (value.charAt(0)) {
-                                                case 'P': //check if its a point
+                                                case 'P': // check if its a point
                                                         currentItem = new Dot(id);
-                                                        _linePoints.put(currentItem.getID(), currentItem);
                                                         break;
                                                 default:
@@ -192 +191 @@
                                                         break;
                                                 }
+                                                _linePoints.put(currentItem.getID(), currentItem);
                                                 newFrame.addItem(currentItem);
                                         } else if (currentItem != null) {
@@ -232 +232 @@
                                         java.awt.Point startend = separateValues(next.substring(2));
 
-                                        Dot a = (Dot) _linePoints.get(startend.x);
-                                        Dot b = (Dot) _linePoints.get(startend.y);
+                                        Item a = _linePoints.get(startend.x);
+                                        Item b = _linePoints.get(startend.y);
 
                                         new Constraint(a, b, idtype.x, idtype.y);
@@ -276 +276 @@
                 } catch (Exception e) {
                         System.out.println("Error running tag method: " + tag);
-                        //e.printStackTrace();
+                        // e.printStackTrace();
                 }
         }
@@ -318 +318 @@
                         toRun.invoke(frame, vals);
                 } catch (Exception e) {
-                        System.out.println("Error running method: " + toRun.toGenericString());
+                        System.out.println("Error running method: "
+                                        + toRun.toGenericString());
                         e.printStackTrace();
                 }

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

@@ -12 +12 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.items.Constraint;
-import org.expeditee.items.Dot;
 import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
@@ -106 +105 @@
                         _ItemTags.put("k", Text.class.getMethod("getJustification", param));
 
-                        _ItemTags.put("h", Dot.class.getMethod("getThickness", param));
-                        _ItemTags.put("l", Dot.class.getMethod("getLineIDs", param));
-                        _ItemTags.put("c", Dot.class.getMethod("getConstraintIDs", param));
+                        _ItemTags.put("h", Item.class.getMethod("getThickness", param));
+                        _ItemTags.put("l", Item.class.getMethod("getLineIDs", param));
+                        _ItemTags.put("c", Item.class.getMethod("getConstraintIDs", param));
 
                 } catch (Exception e) {
@@ -148 +147 @@
                 // write out each Item in the Frame.
                 List<Item> items = frame.getItems();
-                
+
                 // iWidgets are handled specially since 8 items are written as one
                 List<InteractiveWidget> seenWidgets = new LinkedList<InteractiveWidget>();
@@ -154 +153 @@
                 // do not write items with ID -1, also skip any lines
                 for (Item i : items) {
-                        
+
                         // Ensure only one of the WidgetCorners represent a single widget
                         if (i instanceof WidgetCorner) {
-                                InteractiveWidget iw = ((WidgetCorner)i).getWidgetSource();
-                                if (seenWidgets.contains(iw)) continue;
+                                InteractiveWidget iw = ((WidgetCorner) i).getWidgetSource();
+                                if (seenWidgets.contains(iw))
+                                        continue;
                                 seenWidgets.add(iw);
                         }
-        
+
                         if (i.getID() >= 0 && !(i instanceof Line)) {
                                 writeItem(i);
                         }
                 }
-                
+
                 // write any lines or constraints
                 writeTerminator();
@@ -172 +172 @@
                 writeTerminator();
                 writeConstraintData();
-                
+
                 return;
         }
@@ -179 +179 @@
                 Iterator<String> it = _FrameTags.keySet().iterator();
                 Object[] param = {};
-                
+
                 while (it.hasNext()) {
                         String tag = it.next();
@@ -217 +217 @@
 
         // writes the given Item out to the file
-        //This method is not used to write out LINE items
+        // This method is not used to write out LINE items
         public void writeItem(Item item) throws IOException {
                 if (_writer == null)
@@ -227 +227 @@
                 else if (item instanceof WidgetCorner)
                         item = ((WidgetCorner) item).getWidgetSource().getSource();
-                
+
                 if (item.getLines().size() > 0)
                         writePoint(item);
@@ -233 +233 @@
                         writeClass(item);
                 // lines are saved at the end of the file
-                //So dont worry about them in here
+                // So dont worry about them in here
                 else
                         System.out.println("Unknown Item: " + item.getID());
-                
+
                 writeLine("");
         }
@@ -259 +259 @@
                         if (lines != null && lines.size() > 0) {
                                 for (Line line : lines) {
-                                        
+
                                         // Brook: widget edges are not saved
                                         if (line instanceof WidgetEdge) {
@@ -289 +289 @@
                         Item i = _points.get(0);
 
-                        if (i instanceof Dot) {
-                                Dot p = (Dot) i;
-
-                                // if there are any constraints to write
-                                if (p.getConstraints() != null) {
-                                        List<Constraint> constraints = p.getConstraints();
-
-                                        // do not write constraints that have already been
-                                        // written
-                                        for (Constraint c : constraints) {
-                                                if (_points.contains(c.getStart())
-                                                                && _points.contains(c.getEnd())) {
-                                                        writeLine("C", c.getID() + " "
-                                                                        + c.getConstraintType());
-                                                        writeLine("s", c.getLineEnds());
-                                                        writeLine("");
-                                                }
-
+                        // if there are any constraints to write
+                        if (i.getConstraints() != null) {
+                                List<Constraint> constraints = i.getConstraints();
+
+                                // do not write constraints that have already been
+                                // written
+                                for (Constraint c : constraints) {
+                                        if (_points.contains(c.getStart())
+                                                        && _points.contains(c.getEnd())) {
+                                                writeLine("C", c.getID() + " " + c.getType());
+                                                writeLine("s", c.getLineEnds());
+                                                writeLine("");
                                         }
+
                                 }
                         }

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

@@ -339 +339 @@
                                                                 && _points.contains(c.getEnd())) {
                                                         writeLine("C", c.getID() + " "
-                                                                        + c.getConstraintType());
+                                                                        + c.getType());
                                                         writeLine("s", c.getLineEnds());
                                                 }

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

@@ -60 +60 @@
          *         constants defined in this class.
          */
-        public int getConstraintType() {
+        public int getType() {
                 return _type;
         }
@@ -72 +72 @@
         }
 
-        public boolean contains(Item d) {
-                if (_start == d || _end == d)
+        public boolean contains(Item i) {
+                if (_start == i || _end == i)
                         return true;
 
@@ -97 +97 @@
         }
 
-        public void replacePoint(Dot toReplace, Dot with) {
-                if (_start == toReplace)
+        public void replaceEnd(Item toReplace, Item with) {
+                assert(_start != _end);
+                if (_start == toReplace) {
                         _start = with;
-
-                if (_end == toReplace)
+                } else if (_end == toReplace) {
                         _end = with;
+                }
+                toReplace.removeConstraint(this);
+                with.addConstraint(this);
         }
 

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

@@ -1 +1 @@
 package org.expeditee.items;
 
+import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Polygon;
@@ -7 +8 @@
 import java.util.LinkedList;
 import java.util.List;
+
+import org.expeditee.gui.Frame;
 
 /**
@@ -22 +25 @@
         private static final int _MINIMUM_DOT_SIZE = 6;
 
-        // contains all dots (including this one) that form an enclosure
-        // if this dot is part of an enclosing shape
-        private List<Dot> _enclosure = null;
-
         // the polygon surrounding this point, used for 'gravity'
         private Polygon _poly = null;
-
-        // The thickness (in pixels) of this Point
-        private float _thickness = -1;
 
         private int _pointType = Item.POINTTYPE_SQUARE;
@@ -82 +78 @@
         @Override
         public void setThickness(float thick) {
-                _thickness = thick;
+                super.setThickness(thick);
 
                 updatePolygon();
-
-                // update the size of any lines
+        }
+        
+        @Override
+        public void setColor(Color c) {
+                super.setColor(c);
+
+                // update the colour of any lines
                 for (Line line : getLines())
-                        line.setThickness(thick);
-        }
-
-        /**
-         * Returns the thickness (in pixels) of this Dot.
-         * 
-         * @return The 'thickness' of this Dot. (returns -1 if the thickness is not
-         *         set).
-         */
-        @Override
-        public float getThickness() {
-                return _thickness;
+                        line.setColor(c);
         }
 
@@ -134 +124 @@
                 g.setColor(getPaintColor());
 
-                int thick = (int) _thickness;
+                int thick = (int) getThickness();
                 if (thick < 2)
                         thick = 2;
@@ -216 +206 @@
 
         @Override
-        public int getSize() {
-                return (int) getThickness();
-        }
-
-        @Override
-        public void setSize(int size) {
-        }
-
-        @Override
         public void setAnnotation(boolean val) {
         }
@@ -277 +258 @@
 
                 if (merger instanceof Text) {
+                        merger.setPosition(this.getPosition());
                         List<Line> lines = new LinkedList<Line>();
                         lines.addAll(getLines());
                         for (Line line : lines)
                                 line.replaceEnd(this, merger);
-
-                        removeAllLines();
+                        this.delete();
                         return merger;
                 }
@@ -300 +281 @@
         }
 
-        /**
-         * Sets the list of Dots (including this one) that form a closed shape.
-         * Passing null sets this dot back to its normal (non-enclosed) state.
-         * 
-         * @param enclosed
-         *            The List of Dots including this one that form a closed shape,
-         *            or null.
-         */
-        public void setEnclosedList(List<Dot> enclosed) {
-                _enclosure = enclosed;
-        }
-
-        /**
-         * Returns the polygon that represents the shape created by all the Dots in
-         * this Dot's enclosed list. If the list is null, then null is returned.
-         * 
-         * @return A Polygon the same shape and position as created by the Dots in
-         *         the enclosed list.
-         */
-        public Polygon getEnclosedShape() {
-                if (_enclosure == null)
-                        return null;
-
-                Polygon poly = new Polygon();
-                for (Dot d : _enclosure) {
-                        poly.addPoint(d.getX(), d.getY());
-                }
-
-                return poly;
-        }
-
-        /**
-         * Returns the list of Dots that, along with this Dot, form an enclosed
-         * polygon. If this Dot is not part of an enclosure null may be returned.
-         * 
-         * @return The List of Dots that form an enclosed shape with this Dot, or
-         *         null if this Dot is not part of an enclosure.
-         */
-        public List<Dot> getEnclosingDots() {
-                return _enclosure;
-        }
-
-        /**
-         * Returns whether this Dot has an assigned enclosure list of other Dots.
-         * The result is the same as getEnclosedShape() != null.
-         * 
-         * @return True if this Dot has an enclosure list of other Dots, false
-         *         otherwise.
-         */
-        public boolean isEnclosed() {
-                return _enclosure != null;
-        }
-
         @Override
         public String getTypeAndID() {
@@ -370 +298 @@
                         l.delete();
         }
+        
+        @Override
+        public void anchor() {
+                super.anchor();
+                Frame current = getCurrentFrame();
+                for (Line line : getLines()) {
+                        if (line.getID() < 0 && !current.getItems().contains(line)) {
+                                line.setID(current.getNextItemID());
+                                line.setSelectionColor();
+                                // Mike: Why was this line here?
+                                // anchor(line);
+                        }
+                }
+        }
+        
+        @Override
+        public void addLine(Line line) {
+                super.addLine(line);
+                line.setColor(getColor());
+                line.setThickness(getThickness());
+                line.setLinePattern(getLinePattern());
+        }
+        
+        @Override
+        public void lineColorChanged(Color c) {
+                if (getColor() != c) {
+                        setColor(c);
+                }
+        }
 }

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

@@ -33 +33 @@
  * 
  */
-public abstract class Item implements Comparable<Item>, Runnable { 
+public abstract class Item implements Comparable<Item>, Runnable {
+
+        // contains all dots (including this one) that form an enclosure
+        // if this dot is part of an enclosing shape
+        private List<Item> _enclosure = null;
 
         public static int PERMISSION_NONE = 0;
+
         public static int PERMISSION_FOLLOW_LINKS = 1;
+
         public static int PERMISSION_COPY = 2;
+
         public static int PERMISSION_TDFC = 3;
+
         public static int PERMISSION_FULL = 4;
-        
+
         public static final int NEAR_DISTANCE = 15;
-        
+
         /**
          * The default Color to draw highlighting in
@@ -51 +59 @@
 
         public static final Color DEPRESSED_HIGHLIGHT = Color.GREEN;
-        
+
         public static final Color DISCONNECT_HIGHLIGHT = Color.BLUE;
 
@@ -74 +82 @@
 
         protected static final double DEFAULT_ARROWHEAD_RATIO = 0.5;
-        
+
         public static final Color GREEN = Color.GREEN.darker();
 
@@ -81 +89 @@
          * this Item.
          */
-        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.RED,
-                        Color.BLUE, Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(),
+        public static Color[] COLOR_WHEEL = { Color.BLACK, Color.RED, Color.BLUE,
+                        Item.GREEN, Color.MAGENTA, Color.YELLOW.darker(),
                         DisplayIO.DEFAULT_BACKGROUND };
 
-        public static Color[] FILL_COLOR_WHEEL = { Color.BLACK, new Color(255,150,150),
-                new Color(150,150,255), new Color(150,255,150), new Color(255,150,255), new Color(255,255,100),
-                DisplayIO.DEFAULT_BACKGROUND };
+        public static Color[] FILL_COLOR_WHEEL = { Color.BLACK,
+                        new Color(255, 150, 150), new Color(150, 150, 255),
+                        new Color(150, 255, 150), new Color(255, 150, 255),
+                        new Color(255, 255, 100), DisplayIO.DEFAULT_BACKGROUND };
 
         public static final int UNCHANGED_CURSOR = -100;
@@ -144 +153 @@
                 dest.setOffset(source.getOffset());
                 dest.setOwner(source.getOwner());
+                dest.setThickness(source.getThickness());
                 dest.setSize(source.getSize());
                 dest.setTopShadowColor(source.getTopShadowColor());
@@ -167 +177 @@
                 return org.expeditee.gui.UserSettings.LineHighlight;
         }
-        
+
         public enum SelectedMode {
                 None, Enclosed, Connected, Disconnect, Normal
         }
-        
+
         public void setSelectedMode(SelectedMode mode) {
                 setSelectedMode(mode, DEFAULT_HIGHLIGHT);
         }
-        
+
         protected SelectedMode _mode = SelectedMode.None;
-        
+
         private Point _offset = new Point(0, 0);
 
@@ -213 +223 @@
 
         private Color _colorFill = null;
-        
+
         private Color _color = null;
 
@@ -249 +259 @@
 
         // list of points constrained with this point
-        private List<Constraint> _constraints = null;
+        private List<Constraint> _constraints = new ArrayList<Constraint>();
 
         private LinkedList<String> _actions = null;
-        
+
         private String _link_frameset = null;
 
@@ -258 +268 @@
 
         private String _fillPattern = null;
-        
+
         private boolean _visible = true;
-        
+
         private SelectedMode _lastMode = SelectedMode.None;
+
+        private float _thickness = -1.0F;
 
         protected Item() {
@@ -300 +312 @@
          */
         public void addConstraint(Constraint c) {
-                if (_constraints == null)
-                        _constraints = new ArrayList<Constraint>();
-
                 // do not add duplicate constraint
                 if (_constraints.contains(c))
@@ -320 +329 @@
                         return;
                 }
-
-                line.setColor(getColor());
-                line.setSize(getSize());
-                line.setLinePattern(getLinePattern());
 
                 _lines.add(line);
@@ -381 +386 @@
         final public String getAbsoluteLink() {
                 String link = getLink();
-                
+
                 if (link == null)
                         return null;
-                //assert (_parent!= null);
-                if (_parent == null){
-                        //if parent is null it is an item on the message box
-                        //so it must already be absolute
-                        assert(!FrameIO.isPositiveInteger(link));
+                // assert (_parent!= null);
+                if (_parent == null) {
+                        // if parent is null it is an item on the message box
+                        // so it must already be absolute
+                        assert (!FrameIO.isPositiveInteger(link));
                         return link;
                 }
@@ -394 +399 @@
                 // if its a relative link then return absolute
                 if (FrameIO.isPositiveInteger(link)) {
-                        return _parent.getFramesetName()
-                                        + Conversion.getFrameNumber(link);
+                        return _parent.getFramesetName() + Conversion.getFrameNumber(link);
                 }
                 return link;
@@ -689 +693 @@
                 return _owner;
         }
-        
+
         public Color getPaintBackgroundColor() {
                 if (_colorBackground == null) {
@@ -752 +756 @@
          * @return The size of this Item.
          */
-        public abstract int getSize();
-
-        public float getThickness() {
-                return 0;
+        public int getSize() {
+                return -1;
         }
 
@@ -809 +811 @@
                 if (p == null)
                         return false;
-                
+
                 // return p.getBounds().intersects(getArea().getBounds());
                 Area a = new Area(p);
-                
+
                 a.intersect(this.getArea());
                 return !a.isEmpty();
@@ -830 +832 @@
 
         public boolean isFrameName() {
-                if (this.getParent() == null || this.getParent().getFrameNameItem() != this)
+                if (this.getParent() == null
+                                || this.getParent().getFrameNameItem() != this)
                         return false;
                 return true;
@@ -869 +872 @@
 
         public boolean isNear(int x, int y) {
-                
-                
+
                 int xLeft = getPolygon().getBounds().x;
                 int yTop = getPolygon().getBounds().y;
-                
-                return (x > xLeft - NEAR_DISTANCE && y > yTop - NEAR_DISTANCE 
-                                && x < xLeft + getBoundsWidth() + NEAR_DISTANCE
-                                && y < yTop + getBoundsHeight() + NEAR_DISTANCE);
+
+                return (x > xLeft - NEAR_DISTANCE && y > yTop - NEAR_DISTANCE
+                                && x < xLeft + getBoundsWidth() + NEAR_DISTANCE && y < yTop
+                                + getBoundsHeight() + NEAR_DISTANCE);
         }
 
@@ -945 +947 @@
         }
 
+        /**
+         * Removes all constraints that this item has.
+         * 
+         */
         public void removeAllConstraints() {
-                if (_constraints != null)
-                        _constraints.clear();
+                while (_constraints.size() > 0) {
+                        Constraint c = _constraints.get(0);
+                        c.getEnd().removeConstraint(c);
+                        c.getStart().removeConstraint(c);
+                }
         }
 
@@ -1015 +1024 @@
 
                 if (_parent == null)
-                        framesetName = DisplayIO.getCurrentFrame()
-                                        .getFramesetName();
+                        framesetName = DisplayIO.getCurrentFrame().getFramesetName();
                 else
                         framesetName = _parent.getFramesetName();
@@ -1118 +1126 @@
         public void setColor(Color c) {
                 _color = c;
-
-                // update the colour of any lines
-                for (Line line : getLines())
-                        line.setColor(c);
         }
 
@@ -1275 +1279 @@
 
                 // update the position of any dots that are constrained by this one
-                if (_constraints != null) {
-                        for (Constraint c : _constraints) {
-                                Item other = c.getOppositeEnd(this);
-
-                                // only set the position if the other dot is still fixed to the
-                                // frame
-                                if (!other.isFloating()) {
-                                        if (c.getConstraintType() == Constraint.HORIZONTAL
-                                                        && other.getY() != getY())
-                                                other.setY(getY());
-
-                                        if (c.getConstraintType() == Constraint.VERTICAL
-                                                        && other.getX() != getX())
-                                                other.setX(getX());
-                                }
+                for (Constraint c : _constraints) {
+                        Item other = c.getOppositeEnd(this);
+
+                        // only set position if the other dot is still fixed to the
+                        // frame
+                        if (!other.isFloating()) {
+                                if (c.getType() == Constraint.HORIZONTAL
+                                                && other.getY() != getY())
+                                        other.setY(getY());
+
+                                if (c.getType() == Constraint.VERTICAL
+                                                && other.getX() != getX())
+                                        other.setX(getX());
                         }
                 }
@@ -1316 +1318 @@
          * Dots this is the thickness.
          */
-        public abstract void setSize(int size);
-
-        public void setThickness(float thick) throws UnsupportedOperationException {
-                throw new UnsupportedOperationException(
-                                "Item type does not support thickness attribute!");
+        public void setSize(int size) {
+        }
+
+        public void setThickness(float thick) {
+                _thickness = thick;
+                // update the size of any lines
+                for (Line line : getLines())
+                        line.setThickness(thick);
+        }
+
+        /**
+         * Returns the thickness (in pixels) of this Dot.
+         * 
+         * @return The 'thickness' of this Dot. (returns -1 if the thickness is not
+         *         set).
+         */
+        public float getThickness() {
+                return _thickness;
         }
 
@@ -1386 +1401 @@
                 return Item.UNCHANGED_CURSOR;
         }
-        
+
         private void updateArrowPolygon() {
                 if (getArrowheadLength() < 0 || getArrowheadRatio() < 0)
@@ -1404 +1419 @@
                 }
         }
-        
+
         protected abstract void updatePolygon();
 
@@ -1414 +1429 @@
                 return _visible;
         }
-        
-        
-        
+
         // BROOK: Overrideable
-        public void onRemovedFromFrame() {}
-        public void onAddedToFrame(boolean isOverlayed, int overlayLevel) {}
-        public void onParentFameHidden() {} // because of caching
-        public void onParentFameShown(boolean isOverlayed, int overlayLevel) {} // because of caching
+        public void onRemovedFromFrame() {
+        }
+
+        public void onAddedToFrame(boolean isOverlayed, int overlayLevel) {
+        }
+
+        public void onParentFameHidden() {
+        } // because of caching
+
+        public void onParentFameShown(boolean isOverlayed, int overlayLevel) {
+        } // because of caching
 
         public void setSelectedMode(SelectedMode mode, Color color) {
@@ -1440 +1460 @@
                 return _mode;
         }
+
+        public void anchor() {
+                Frame current = getCurrentFrame();
+                setID(current.getNextItemID());
+                setOffset(0, 0);
+                setParent(current);
+
+                current.addItem(this);
+                current.setResort(true);
+                setRelativeLink();
+                setFloating(false);
+        }
+
+        /**
+         * Gets the parent frame if it is set or the current frame if this item does
+         * not have a parent set.
+         * 
+         * @return
+         */
+        public Frame getCurrentFrame() {
+                // if the item is from an overlay the parent will NOT be null
+                if (getParent() == null) {
+                        return DisplayIO.getCurrentFrame();
+                }
+                return getParent();
+        }
+
+        /**
+         * Sets the list of Dots (including this one) that form a closed shape.
+         * Passing null sets this dot back to its normal (non-enclosed) state.
+         * 
+         * @param enclosed
+         *            The List of Dots including this one that form a closed shape,
+         *            or null.
+         */
+        public void setEnclosedList(List<Item> enclosed) {
+                _enclosure = enclosed;
+        }
+
+        /**
+         * Returns the polygon that represents the shape created by all the Dots in
+         * this Dot's enclosed list. If the list is null, then null is returned.
+         * 
+         * @return A Polygon the same shape and position as created by the Dots in
+         *         the enclosed list.
+         */
+        public Polygon getEnclosedShape() {
+                if (_enclosure == null)
+                        return null;
+
+                Polygon poly = new Polygon();
+                for (Item d : _enclosure) {
+                        poly.addPoint(d.getX(), d.getY());
+                }
+
+                return poly;
+        }
+
+        /**
+         * Returns the list of Dots that, along with this Dot, form an enclosed
+         * polygon. If this Dot is not part of an enclosure null may be returned.
+         * 
+         * @return The List of Dots that form an enclosed shape with this Dot, or
+         *         null if this Dot is not part of an enclosure.
+         */
+        public List<Item> getEnclosingDots() {
+                return _enclosure;
+        }
+
+        /**
+         * Returns whether this Dot has an assigned enclosure list of other Dots.
+         * The result is the same as getEnclosedShape() != null.
+         * 
+         * @return True if this Dot has an enclosure list of other Dots, false
+         *         otherwise.
+         */
+        public boolean isEnclosed() {
+                return _enclosure != null;
+        }
+
+        public boolean isLineEnd() {
+                return _lines.size() > 0;
+        }
+
+        /**
+         * Method that is called to notify an item that is on the end of a line that
+         * its line has changed color.
+         * 
+         * @param c
+         *            the new color for the line
+         */
+        protected void lineColorChanged(Color c) {
+                for (Line l : getLines()) {
+                        if (l.getColor() != c)
+                                l.setColor(c);
+                }
+        }
 }

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

@@ -450 +450 @@
                                         for (Constraint c : consts) {
                                                 if (c.contains(line.getEndItem())) {
-                                                        if (c.getConstraintType() == Constraint.VERTICAL) {
+                                                        if (c.getType() == Constraint.VERTICAL) {
                                                                 vConst.add(line.getStartItem());
                                                                 vConst.add(line.getEndItem());
@@ -659 +659 @@
                 _seen.clear();
 
-                // get all dots on the Frame
-                List<Dot> dots = new ArrayList<Dot>(0);
+                // get all lineEnds on the Frame
+                List<Item> lineEnds = new ArrayList<Item>(0);
                 for (Item i : items) {
-                        if (i instanceof Dot) {
-                                Dot d = (Dot) i;
-                                d.setEnclosedList(null);
-
-                                if (d.getLines().size() == 2)
-                                        dots.add(d);
-                        }
-                }
-
-                // if there are no dots on the Frame, then there can't be an enclosure
-                if (dots.size() == 0)
+                        if (i.isLineEnd()) {
+                                i.setEnclosedList(null);
+
+                                if (i.getLines().size() == 2)
+                                        lineEnds.add(i);
+                        }
+                }
+
+                // if there are no line endpoints on the Frame, then there can't be an enclosure
+                if (lineEnds.size() == 0)
                         return;
 
                 //TODO optimise this code!!
-                // iterate through all the dots
-                for (Dot searchFor : dots) {
+                // iterate through all the lineEnds
+                for (Item searchFor : lineEnds) {
                         _seen.clear();
 
@@ -683 +682 @@
                                 _seen.add(l);
                                 if (traverse(searchFor, l.getOppositeEnd(searchFor))) {
-                                        _path.add((Dot) l.getOppositeEnd(searchFor));
-
-                                        for (Dot d : _path)
-                                                d.setEnclosedList(_path);
-
-                                        _path = new ArrayList<Dot>(0);
+                                        _path.add(l.getOppositeEnd(searchFor));
+
+                                        for (Item i : _path)
+                                                i.setEnclosedList(_path);
+
+                                        _path = new ArrayList<Item>(0);
 
                                         break;
@@ -699 +698 @@
         private static List<Line> _seen = new ArrayList<Line>();
 
-        private static List<Dot> _path = new ArrayList<Dot>();
-
-        private static boolean traverse(Dot toFind, Item searchFrom) {
+        private static List<Item> _path = new ArrayList<Item>();
+
+        private static boolean traverse(Item toFind, Item searchFrom) {
                 if (toFind == null || searchFrom == null
-                                || !(searchFrom instanceof Dot))
+                                || !searchFrom.isLineEnd())
                         return false;
 
@@ -716 +715 @@
                                 _seen.add(l);
                                 if (traverse(toFind, l.getOppositeEnd(searchFrom))) {
-                                        _path.add((Dot) l.getOppositeEnd(searchFrom));
+                                        _path.add(l.getOppositeEnd(searchFrom));
                                         return true;
                                 }

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

@@ -81 +81 @@
 
                 // initialise the line size
-                float thick;
-
-                if (_start instanceof Dot && _end instanceof Dot)
-                        thick = (((Dot) _start).getThickness() + ((Dot) _end)
-                                        .getThickness()) / 2.0f;
-                else if (_start instanceof Dot)
-                        thick = ((Dot) _start).getThickness();
-                else if (_end instanceof Dot)
-                        thick = ((Dot) _end).getThickness();
-                else
+                float thick = (_start.getThickness() + _end.getThickness()) / 2.0f;
+
+                if (thick < 0)
                         thick = 1;
+                /*
+                 * if (_start instanceof Dot && _end instanceof Dot) thick = (((Dot)
+                 * _start).getThickness() + ((Dot) _end) .getThickness()) / 2.0f; else
+                 * if (_start instanceof Dot) thick = ((Dot) _start).getThickness();
+                 * else if (_end instanceof Dot) thick = ((Dot) _end).getThickness();
+                 * else thick = 1;
+                 */
 
                 setThickness(thick);
@@ -134 +134 @@
 
         /**
-         * Replaces either the start or end point of this Line with the given Dot.
-         * This is used when merging two Dots.
+         * Replaces either the start or end point of this Line with the given
+         * LineEnd. This is used when merging LineEnds. It will also add and remove
+         * the line from the LineEnds as well as adjust constraints.
          * 
          * @param replace
@@ -144 +145 @@
          */
         public void replaceEnd(Item replace, Item with) {
-                if (_start == replace)
+                Item otherEnd = null;
+                if (_start == replace) {
                         setStartItem(with);
-                else
+                        otherEnd = _end;
+                } else if (_end == replace) {
                         setEndItem(with);
+                        otherEnd = _start;
+                }
+                // if no end was replaced
+                if (otherEnd == null)
+                        return;
+                // Copy the constraints list so the endPoints list can be modified
+                List<Constraint> constraints = new ArrayList<Constraint>(replace
+                                .getConstraints());
+                // Now change all the constraints for this line only
+                for (int i = 0; i < constraints.size(); i++) {
+                        Constraint c = constraints.get(i);
+                        if (c.contains(otherEnd)) {
+                                c.replaceEnd(replace, with);
+                        }
+                }
         }
 
@@ -154 +172 @@
                         _start.removeLine(this);
 
-                        if (!(start instanceof Dot)) {
-                                _startOffset.x = _start.getX() - start.getX();
-                                _startOffset.y = _start.getY() - start.getY();
-                        } else {
+                        /*
+                         * if (!(start instanceof Dot)) { _startOffset.x = _start.getX() -
+                         * start.getX(); _startOffset.y = _start.getY() - start.getY(); }
+                         * else
+                         */{
                                 _startOffset.x = 0;
                                 _startOffset.y = 0;
@@ -172 +191 @@
                         _end.removeLine(this);
 
-                        if (!(end instanceof Dot)) {
-                                _endOffset.x = _end.getX() - end.getX();
-                                _endOffset.y = _end.getY() - end.getY();
-                        } else {
+                        /*
+                         * if (!(end instanceof Dot)) { _endOffset.x = _end.getX() -
+                         * end.getX(); _endOffset.y = _end.getY() - end.getY(); } else
+                         */{
                                 _endOffset.x = 0;
                                 _endOffset.y = 0;
@@ -211 +230 @@
         }
 
+        @Override
         public void setX(int x) {
         }
 
+        @Override
         public void setY(int y) {
         }
@@ -287 +308 @@
                 g.setColor(getPaintColor());
 
-                //if (this._mode == Item.SelectedMode.Disconnect)
-                //      System.out.println("Disconnect mode!");
-                
+                // if (this._mode == Item.SelectedMode.Disconnect)
+                // System.out.println("Disconnect mode!");
+
                 if (_start instanceof Text && ((Text) _start).startsWith("@c")) {
                         g.setStroke(_lineStroke);
@@ -340 +361 @@
                         Point endOffset) {
                 // only draw an arrowhead if necessary
-                if (!(this._mode == Item.SelectedMode.Disconnect 
-                                && withArrow._mode == Item.SelectedMode.Disconnect)
-                                && (!withArrow.hasVisibleArrow()
-                                || withArrow.getLines().size() > 1))
+                if (!(this._mode == Item.SelectedMode.Disconnect && withArrow._mode == Item.SelectedMode.Disconnect)
+                                && (!withArrow.hasVisibleArrow() || withArrow.getLines().size() > 1))
                         return;
 
@@ -356 +375 @@
                 double arrowRatio = withArrow.getArrowheadRatio();
 
-                //set the size of the disconnect indicator arrowhead
-                if (this._mode == Item.SelectedMode.Disconnect){
-                        //System.out.println("Disconnect mode!");
+                // set the size of the disconnect indicator arrowhead
+                if (this._mode == Item.SelectedMode.Disconnect) {
+                        // System.out.println("Disconnect mode!");
                         arrowLength = 15;
                         arrowRatio = 0.3;
-                        //Make sure the arrowhead positions get recalculated
+                        // Make sure the arrowhead positions get recalculated
                         withArrow.setArrowhead(null);
                 }
-                
+
                 // if the arrowhead is 'auto', then one and only one end must be
                 // floating
@@ -489 +508 @@
                         return end;
                 } else if (distStart < DISCONNECT_THRESHHOLD) {
-                        start._mode = Item.SelectedMode.Disconnect;
+                        if (start.getLines().size() > 1
+                                        || start.getConstraints().size() > 0)
+                                start._mode = Item.SelectedMode.Disconnect;
+                        else
+                                start._mode = Item.SelectedMode.Normal;
                         return start;
                 } else if (distEnd < DISCONNECT_THRESHHOLD) {
-                        end._mode = Item.SelectedMode.Disconnect;
+                        if (end.getLines().size() > 1 || end.getConstraints().size() > 0)
+                                end._mode = Item.SelectedMode.Disconnect;
+                        else
+                                end._mode = Item.SelectedMode.Normal;
                         return end;
                 }
@@ -520 +546 @@
                 super.setColor(c);
 
-                if (_start.getColor() != c)
-                        _start.setColor(c);
-
-                if (_end.getColor() != c)
-                        _end.setColor(c);
-        }
-
-        @Override
-        public int getSize() {
-                return _start.getSize();
-        }
-
-        @Override
-        public void setSize(int size) {
+                _start.lineColorChanged(c);
+                _end.lineColorChanged(c);
         }
 
@@ -543 +557 @@
                         thick = DEFAULT_THICKNESS;
 
-                if (_start instanceof Dot) {
-                        Dot start = (Dot) _start;
-                        if (start.getThickness() != thick)
-                                start.setThickness(thick);
-                }
-
-                if (_end instanceof Dot) {
-                        Dot end = (Dot) _end;
-                        if (end.getThickness() != thick)
-                                end.setThickness(thick);
-                }
+                if (_start.getThickness() != thick)
+                        _start.setThickness(thick);
+
+                if (_end.getThickness() != thick)
+                        _end.setThickness(thick);
 
                 int[] pattern = _start.getLinePattern();
@@ -734 +742 @@
         private Dot _virtualSpot = null;
 
-        public void showVirtualSpot(Dot orig, int mouseX, int mouseY) {
+        public void showVirtualSpot(Item orig, int mouseX, int mouseY) {
                 if (orig.getLines().size() != 1)
                         return;
@@ -742 +750 @@
                         return;
 
-                Dot spot = orig.copy();
+                Dot spot = new Dot(-1, orig.getX(), orig.getY());
+                Item.DuplicateItem(orig, spot);
                 spot.setThickness(Math.max(this.getThickness(), 5));
                 if (this.getColor() != Color.RED)
@@ -817 +826 @@
         }
 
-        public Item forceMerge(Item merger, int mouseX, int mouseY) {
-                Dot spot = (Dot) merger;
-
-                if (spot.getConstraints() != null)
-                        spot.getConstraints().clear();
-
-                if (_end.getConstraints() != null)
-                        _end.getConstraints().clear();
-
-                if (_start.getConstraints() != null)
-                        _start.getConstraints().clear();
+        public Item forceMerge(Item spot, int mouseX, int mouseY) {
+
+                spot.removeAllConstraints();
+
+                _end.removeAllConstraints();
+
+                _start.removeAllConstraints();
 
                 // calculate nearest point on line from spot
@@ -840 +845 @@
                 // if the line is horizontal
                 if (slope1 == 0) {
-                        x = merger.getX();
+                        x = spot.getX();
                         y = _start.getY();
                         // if the line is vertical
                 } else if (slope2 == 0) {
                         x = _start.getX();
-                        y = merger.getY();
+                        y = spot.getY();
                         // otherwise, the line is sloped
                 } else {
@@ -875 +880 @@
         @Override
         public Item merge(Item merger, int mouseX, int mouseY) {
-                if (!(merger instanceof Dot))
+                if (!(merger.isLineEnd()))
                         return merger;
 
-                Dot spot = (Dot) merger;
+                Item spot = merger;
 
                 // dots with multiple lines cannot be attached, nor can dots with no
@@ -1015 +1020 @@
                         _end.delete();
         }
+
+        @Override
+        public void anchor() {
+                super.anchor();
+                fixArrowheadLength();
+        }
+
+        /**
+         * Removes constraints from the end points of this line.
+         */
+        @Override
+        public void removeAllConstraints() {
+                // Find all constraints that include both the start and end.
+                for (Constraint c : _start.getConstraints()) {
+                        if (c.contains(_end)) {
+                                _start.removeConstraint(c);
+                                _end.removeConstraint(c);
+                        }
+                }
+        }
 }

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

@@ -905 +905 @@
                                 Rectangle textOutline = text.getLogicalHighlightShape(0,
                                                 text.getCharacterCount()).getBounds();
-                                textOutline.translate(getX(), textY);
+                                textOutline.width += 2;
+                                textOutline.height += 2;
+                                
+                                textOutline.translate(getX() -1, textY - 1);
                                 if (p.intersects(textOutline))
                                         return true;
@@ -1451 +1454 @@
         @Override
         public Item merge(Item merger, int mouseX, int mouseY) {
-                if (merger instanceof Dot) {
-                        Dot d = (Dot) merger;
+                
+                if (merger.isLineEnd()) {
+                        if (merger instanceof Text)
+                                insertText(((Text)merger).getTextNoList(), mouseX, mouseY);
+                        
+                        //this.setPosition(merger.getPosition());
                         List<Line> lines = new LinkedList<Line>();
-                        lines.addAll(d.getLines());
-                        for (Line line : lines)
-                                line.replaceEnd(d, this);
-
-                        d.removeAllLines();
+                        lines.addAll(merger.getLines());
+                        for (Line line : lines){
+                                line.replaceEnd(merger, this);
+                        }
+                        merger.delete();
+                        this.setOffset(0,0);
                         return null;
                 }
@@ -1569 +1577 @@
                 setVisible(false);
         }
+        
+        @Override
+        public void anchor() {
+                super.anchor();
+                // ensure all text items have their selection cleared
+                clearSelection();
+                setAlpha(0);
+        }
 }