Changeset 637

Timestamp:

12/18/13 10:30:05 (11 years ago)

Author:

jts21

Message:

Fix bug where merging attributes can create ghost items. Not an ideal fix though (doesn't correct the source of the problem, just patches it up afterwards so the user doesn't see anything wrong)

File:

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

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

@@ -996 +996 @@
                                         left = merge(FreeItems.getInstance(), clicked);
                                 }
+                                Collection<Item> toDelete = new LinkedList<Item>();
+                                toDelete.addAll(FreeItems.getInstance());
+                                toDelete.removeAll(left);
                                 anchor(left);
                                 FreeItems.getInstance().clear();
+                                DisplayIO.getCurrentFrame().removeAllItems(toDelete);
                                 updateCursor();
                                 // Make sure the dot goes away when anchoring a line end behind
@@ -2847 +2851 @@
                 Item res = null;
 
-                for (Item i : merger) {
+                for (Item i : merger) {                 
                         if (!i.isVisible())
                                 continue;