Changeset 1430 for trunk

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.

Location:

trunk/src/org/expeditee

Files:

• encryption/Actions.java (modified) (2 diffs)
• encryption/io/EncryptedExpWriter.java (modified) (1 diff)
• encryption/items/surrogates/Label.java (modified) (1 diff)
• gui/AttributeUtils.java (modified) (1 diff)
• gui/DisplayController.java (modified) (1 diff)
• gui/Frame.java (modified) (2 diffs)
• items/Item.java (modified) (6 diffs)

trunk/src/org/expeditee/encryption/Actions.java

@@ -23 +23 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.MessageBay;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -31 +32 @@
 public class Actions implements CryptographyConstants {
         
-        public static void TestSurrogate(Item primary) {
-                System.out.println("Test surrogates: ");
+        public static void SetSurrogateFor(Text surrogate, Text action) {
+                Frame frame = DisplayController.getCurrentFrame();
+                String[] split = action.getText().split(" ");
+                
+                if (split.length >= 2) {
+                        int primaryID = Integer.parseInt(split[1]);
+                        Item itemWithID = frame.getItemWithID(primaryID);
+                        if (itemWithID == null) {
+                                MessageBay.displayMessage("No item with ID " + primaryID + " exists on this frame.");
+                                return;
+                        } else {
+                                itemWithID.addToSurrogates(surrogate);
+                        }
+                } else {
+                        MessageBay.displayMessage("Usage: SetSurrogateFor Int, inject desired surrogate.");
+                }
         }
         

trunk/src/org/expeditee/encryption/io/EncryptedExpWriter.java

@@ -194 +194 @@
                 Function<Item, Boolean> isTagInherited = surrogate -> surrogate.isTagInherited(tag + "");
                 BinaryOperator<Boolean> trueExists = (a, b) -> a || b;
-                boolean surrogatesInherit = surrogateItems.stream().map(isTagInherited).collect(Collectors.reducing(trueExists)).get();
+                boolean surrogatesInherit = surrogateItems.stream().map(isTagInherited).collect(Collectors.reducing(trueExists)).orElseGet(() -> false);
                 boolean userHasKey = Label.getLabel(toWrite.getEncryptionLabel()) == LabelResult.SuccessResolveLabelToKey;
                 
-                // If we have no surrogates that inherit this property from us, and we have the label required to encrypt it, then we should entry it.
+                // If we have no surrogates that inherit this property from us, and we have the label required to encrypt it, then we should encrypt it.
                 if (!surrogatesInherit && userHasKey) {
                         EncryptionDetail reencryptOnSave = new EncryptionDetail(EncryptionDetail.Type.ReencryptOnSave);

trunk/src/org/expeditee/encryption/items/surrogates/Label.java

@@ -54 +54 @@
 
         public static List<String> getAccessibleLabelsNames(ItemsList itemsList) {
+                // TODO make copy of itemsList in here and then adjust callers so they do not need to make copy.
+                // Alternatively, filter instead of removeIf
                 Text[] userLabels = KeyList.UserLabels.get();
                 Stream<String> accessibleUserWideLabels = Arrays.asList(userLabels).stream().map(label -> label.getText());
                 
-                Predicate<Item> isLabelWithoutEncryptionLabel = item -> item.getEncryptionLabel() == null || item.getEncryptionLabel().isEmpty();
-                itemsList.removeIf(isLabelWithoutEncryptionLabel);
+                Predicate<Item> isItemWithoutEncryptionLabel = item -> item.getEncryptionLabel() == null || item.getEncryptionLabel().isEmpty();
+                itemsList.removeIf(isItemWithoutEncryptionLabel);
                 Stream<String> accessibleFrameLocalLabels = itemsList.underlying().stream().map(item -> item.getEncryptionLabel()).distinct();
                 

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

@@ -308 +308 @@
                         _Attrib.put("EncryptionLabel",          Item.class.getMethod("getEncryptionLabel"), 
                                                                                                 Item.class.getMethod("setEncryptionLabel", pString));
+                        _Attrib.put("ID",                                       Item.class.getMethod("getID"), 
+                                                                                                Item.class.getMethod("setIDFail", pInt));
                         
                         // Text Items

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

@@ -1235 +1235 @@
                 
                 Label.progressSurrogateMode();
+                Frame currentFrame = DisplayController.getCurrentFrame();
+                ItemsList primaryBody = currentFrame.getPrimaryBody();
+                ItemsList primaryBodyCopy = new ItemsList(primaryBody);
+                List<String> accessibleLabelsNames = Label.getAccessibleLabelsNames(primaryBodyCopy);
+                StringBuilder sb = new StringBuilder("Surrogate Mode currently accepts labels: ");
+                for (String acceessibleLabel: accessibleLabelsNames) {
+                        sb.append(acceessibleLabel + ", ");
+                }
+                String message = sb.substring(0, sb.length() - 2);
+                MessageBay.displayMessage(message);
                 
                 getCurrentFrame().parse();

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

@@ -31 +31 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.Stack;
 import java.util.stream.Collectors;
@@ -1020 +1021 @@
                 if (item.isSurrogate()) {
                         removeItem(item, recalculate, _surrogateItemsBody);
+                        Set<Item> primariesSurrogates = item.getPrimary().getSurrogates();
+                        primariesSurrogates.remove(item);
                 } else {
                         removeItem(item, recalculate, _primaryItemsBody);

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;