Changeset 67 for trunk/src/org/expeditee/gui/FrameMouseActions.java

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (9 diffs)

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

@@ -1 +1 @@
 package org.expeditee.gui;
 
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -261 +262 @@
                 // pre-cache the frame if it is linked
                 if (on != null && on.getLink() != null && on.isLinkValid()) {
-                        FrameIO.Precache(on.getLink());
+                        FrameIO.Precache(on.getAbsoluteLink());
                 }
 
@@ -739 +740 @@
                                                                         .getPosition(), false);
                                                         pickup(newPoint);
-                                                        ItemUtils.EnclosedCheck(toDisconnect.getCurrentFrame().getItems());
+                                                        ItemUtils.EnclosedCheck(toDisconnect
+                                                                        .getParentOrCurrentFrame().getItems());
                                                         return;
                                                 }
@@ -913 +915 @@
 
                                                 if (toCopy.size() > 0) {
+                                                        //Find the closest item to the mouse cursor
+                                                        double currentX = DisplayIO.getMouseX();
+                                                        double currentY = DisplayIO.getMouseY();
+                                                        Item closest = null;
+                                                        double shortestDistance = Double.MAX_VALUE; 
+                                                        for(int i = 0; i < toCopy.size(); i++) {
+                                                                Item next = toCopy.get(i);
+                                                                if (next instanceof Line)
+                                                                        continue;
+                                                                double distance = Point.distance(currentX, currentY, next.getX(), next.getY());
+                                                                if (distance  < shortestDistance) {
+                                                                        shortestDistance = distance;
+                                                                        closest = next;
+                                                                }
+                                                        }
+                                                        //Move the cursor to closest item
+                                                        DisplayIO.setCursorPosition(closest.getPosition());
+                                                        //Pickup copy of the stuff inside the rectange
                                                         pickup(copy(toCopy));
+                                                        //Remove the rectangle
                                                         DisplayIO.getCurrentFrame().removeAllItems(
                                                                         d.getAllConnected());
                                                 } else {
+                                                        //Pick up a copy of the rectangle
                                                         pickup(copy(d.getAllConnected()));
                                                 }
@@ -1443 +1465 @@
                 setTdfcItem(linker);
 
-                // Set the link for an @Parent annotation item if one is on the frame
-                for (Item i : next.getItems()) {
-                        if ((i instanceof Text) && ItemUtils.isTag(i, ItemUtils.TAG_PARENT)
-                                        && i.getLink() == null)
-                                i.setLink(DisplayIO.getCurrentFrame().getFrameName());
+                for (Text i : next.getBodyTextItems(true)) {
+                        // Set the link for @Parent annotation item if one
+                        if (ItemUtils.isTag(i, ItemUtils.TAG_PARENT) && i.getLink() == null) {
+                                Frame parent = linker.getParentOrCurrentFrame();
+                                i.setLink(parent.getFrameName());
+                        } else if (ItemUtils.isTag(i, ItemUtils.TAG_BACKUP)) {
+                                // Delink backup tag if it is on the frame
+                                i.setLink(null);
+                        }
                 }
 
@@ -1594 +1620 @@
                         // reset the mouse cursor
                         updateCursor();
-                        FrameGraphics.Repaint();
-
                         ItemUtils.EnclosedCheck(current.getItems());
                         FrameGraphics.Repaint();
@@ -1604 +1628 @@
 
         private static void deleteItems(List<Item> itemList) {
-                Frame current = DisplayIO.getCurrentFrame();
+                List<Frame> modifiedFrames = new LinkedList<Frame>();
+                // Get a list of all the modified frames
+                for (Item i : itemList) {
+                        Frame parent = i.getParent();
+                        if (parent != null)
+                                modifiedFrames.add(parent);
+                }
+
                 List<Item> toUndo = new LinkedList<Item>();
                 List<Item> seen = new LinkedList<Item>();
-
-                // Mike: Removed code that checked for rectangles and removed them
-                // completely!!
 
                 // disconnect any connected items
@@ -1623 +1651 @@
                                         toUndo.addAll(copy(i));
                         }
-
                         seen.add(i);
                 }
-
-                // Mike: What is the point of the code below
-                // It causes problems when deleting three items off the cursor which
-                // include a non dot or line item
-                /*
-                 * // check for rectangle deletion if (itemList.size() == 3) { boolean
-                 * rectangle = false; Dot dot = null; // check that this is indeed a
-                 * rectangle for (Item check : itemList) { if (dot == null && check
-                 * instanceof Dot) dot = (Dot) check; else if (check != dot &&
-                 * !dot.getLines().contains(check)) { rectangle = false; break; } else
-                 * rectangle = true; } // if this is a rectangle, remove the entire
-                 * rectangle if (rectangle) { // List<Item> copy =
-                 * copy(dot.getAllConnected());
-                 * current.addAllToUndo(dot.getAllConnected());
-                 * current.removeAllItems(dot.getAllConnected()); itemList.clear(); //
-                 * reset the mouse cursor updateCursor(); FrameGraphics.Repaint();
-                 * return; } }
-                 */
-
-                current.removeAllItems(itemList);
-                current.addAllToUndo(itemList);
+                for (Frame f : modifiedFrames) {
+                        f.removeAllItems(itemList);
+                        ItemUtils.EnclosedCheck(f.getItems());
+                }
+                // TODO: How should undelete deal with undo when items are removed from
+                // the current frame as well as the overlay frame
+                DisplayIO.getCurrentFrame().addAllToUndo(itemList);
                 itemList.clear();
         }
@@ -1964 +1977 @@
 
                 FrameGraphics.Repaint();
-                ItemUtils.EnclosedCheck(toAnchor.getCurrentFrame().getItems());
+                ItemUtils.EnclosedCheck(toAnchor.getParentOrCurrentFrame().getItems());
         }