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

Timestamp:

07/24/19 13:58:00 (5 years ago)

Author:

bln4

Message:

Created a unioned list for item properties in DefaultFrameWriter. Used it in Item.

File:

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

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

@@ -334 +334 @@
         {
                 EncryptionDetail unencryptedOnSave = new EncryptionDetail(EncryptionDetail.Type.UnencryptedOnSave);
-                for(Character tag: DefaultFrameWriter.getItemTags().keySet()) {
-                        if (tag == 'T' || tag == 'S') {
-                                surrogatePropertyInheritanceDefault.put(tag + "", false);
+                for (String tag: DefaultFrameWriter.getItemTags().keySet()) {
+                        if (tag == "T" || tag == "S") {
+                                surrogatePropertyInheritanceDefault.put(tag, false);
                         } else {
-                                surrogatePropertyInheritanceDefault.put(tag + "", true);
-                        }
-                        primaryPropertyEncryptionDefault.put(tag + "", unencryptedOnSave);
-                }
-                
-                for(String tag: DefaultFrameWriter.getItemTagsExt().keySet()) {
-                        surrogatePropertyInheritanceDefault.put(tag, true);
+                                surrogatePropertyInheritanceDefault.put(tag, true);
+                        }
                         primaryPropertyEncryptionDefault.put(tag, unencryptedOnSave);
                 }
@@ -4129 +4124 @@
                 EncryptionDetail inheritanceCheckOnSave = new EncryptionDetail(EncryptionDetail.Type.InheritanceCheckOnSave);
                 
-                for (Character tag: DefaultFrameWriter.getItemTags().keySet()) {
+                for (Character tag: DefaultFrameWriter.getItemCharTags().keySet()) {
                         if (tag == 'T') {
                                 primaryPropertyEncryption.put(tag + "", reencryptOnSave.clone());
@@ -4143 +4138 @@
                 }
                 
-                for (String tag: DefaultFrameWriter.getItemTagsExt().keySet()) {
+                for (String tag: DefaultFrameWriter.getItemStrTags().keySet()) {
                         primaryPropertyEncryption.put(tag, inheritanceCheckOnSave.clone());
                         surrogate.surrogatePropertyInheritance.put(tag + "", true);