Changeset 741

Timestamp:

01/23/14 09:38:55 (10 years ago)

Author:

jts21

Message:

Items now keep their old ID when being anchored on the same frame as they were picked up from, unless the frame already has an item with that ID

Location:

trunk/src/org/expeditee

Files:

• agents/HFormat.java (modified) (2 diffs)
• items/Item.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package org.expeditee.agents;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.expeditee.gui.Frame;
+import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
@@ -25 +28 @@
                         return null;
                 
+                List<Item> changedItems = new ArrayList<Item>();
+                
                 float anchorY = 0F;
                 float yThreshold = 0F;

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

@@ -366 +366 @@
 
         private Frame _parent = null;
+        private Frame _oldParent = null;
 
         protected int _highlightThickness = 2;
@@ -1784 +1785 @@
 
         public void setParent(Frame frame) {
+                _oldParent = _parent;
                 _parent = frame;
 
@@ -2164 +2166 @@
         public void anchor() {
                 Frame current = getParentOrCurrentFrame();
-                setID(current.getNextItemID());
+                // only set the id if we've moved to a different frame, or if the frame already has an item with that id
+                if(!current.equals(_oldParent) || current.getItemWithID(getID()) != null) {
+                        int id = _id;
+                        setID(current.getNextItemID());
+                        // System.out.println(this + " - Set ID to " + _id + " (was " + id + ")");
+                } else {
+                        // System.out.println(this + " - Kept old ID of " + _id);
+                }
                 setOffset(0, 0);
                 setParent(current);