Changeset 1212

Timestamp:

01/30/19 12:58:59 (5 years ago)

Author:

bln4

Message:

Item.java -> Ability to query if a Item has a certain piece of data.

File:

• trunk/src/org/expeditee/items/Item.java (modified) (4 diffs)

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

@@ -399 +399 @@
                         dest.setID(parent.getNextItemID());
                 }
-
-                if (parent != null && !UserSettings.UserName.equals(parent.getOwner())) {
-                        dest.setOwner(UserSettings.UserName.get());
+                
+                final String currentUser = UserSettings.UserName.get();
+                if (parent != null && (parent.getOwner() == null || currentUser.compareTo(parent.getOwner()) != 0)) {
+                        dest.setOwner(currentUser);
                 }
         }
@@ -1674 +1675 @@
                 }
         }
+        
+        public boolean hasData(final String dataItem) {
+                if (_data != null && dataItem != null && dataItem.length() > 0) {
+                        for (final String d : _data) {
+                                if (d.compareTo(dataItem) == 0) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
 
         public void setActionCursorEnter(List<String> enter) {
@@ -1992 +2004 @@
                 _oldParent = _parent;
                 _parent = frame;
-
-                if (_parent != null && UserSettings.UserName != null
-                                && !UserSettings.UserName.equals(_parent.getOwner())) {
-                        setOwner(UserSettings.UserName.get());
+                
+                if (_parent == null) { return; }
+
+                final String currentUser = UserSettings.UserName.get();
+                final String existingOwner = _parent.getOwner();
+                if (currentUser != null && (existingOwner == null || currentUser.compareTo(existingOwner) != 0)) {
+                        setOwner(currentUser);
                 }
         }
@@ -2310 +2325 @@
          */
         public void setY(float newY) {
-                if (newY == 265) {
-                        System.err.println("Item::setY::setting y to 265");
-                }
                 setPosition(getX(), newY);
         }