Changeset 1430 for trunk/src/org/expeditee/items/Item.java

Timestamp:

08/14/19 14:22:44 (5 years ago)

Author:

bln4

Message:

Fixed bug for when there are no surrogates left for a primary.

File:

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

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

@@ -1043 +1043 @@
          * TODO: What does it mean to have a negative ID# (as used in TDFC)? cts16
          */
-        public int getID()
-        {
+        public int getID() {
                 return _id;
         }
@@ -2219 +2218 @@
                 }
         }
+        
+        /**
+         * Function called when a user attempts to set the ID of a Item.  Simply provides
+         * feedback to the user telling them that they are not allowed to do this.  This
+         * function is provided so that users are able to get the ID of a item when 
+         * extracting properties.  See {@link org.expeditee.gui.AttributeUtils}.
+         * 
+         * @param newID The requested new ID that will be ignored.
+         */
+        public void setIDFail(int newID) {
+                MessageBay.displayMessage("A user cannot change the ID of an item.");
+        }
 
         /**
@@ -4156 +4167 @@
 
         public void addToSurrogates(Item surrogate) {
+                this.getParent().removeItem(surrogate);
                 this.surrogateItems.add(surrogate);
                 surrogate.setAsSurrogateFor(this);
@@ -4162 +4174 @@
                 EncryptionDetail reencryptOnSave = new EncryptionDetail(EncryptionDetail.Type.ReencryptOnSave);
                 EncryptionDetail unencryptedOnSave = new EncryptionDetail(EncryptionDetail.Type.UnencryptedOnSave);
-                EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
                 
                 for (Character tag: DefaultFrameWriter.getItemCharTags().keySet()) {
@@ -4179 +4190 @@
                 
                 for (String tag: DefaultFrameWriter.getItemStrTags().keySet()) {
-                        primaryPropertyEncryption.put(tag, inheritanceCheckOnSave.clone());
+                        primaryPropertyEncryption.put(tag, unencryptedOnSave.clone());
                         surrogate.surrogatePropertyInheritance.put(tag + "", true);
                 }
@@ -4231 +4242 @@
          */
         protected boolean subjectToInheritanceCheckOnSave(String tag) {
+                if (tag.equals(DefaultFrameWriter.TYPE_AND_ID_STR)) {
+                        return false;
+                }
                 Item primary = getPrimary();
                 if (primary == null) return false;