Changeset 1430 for trunk/src/org/expeditee/encryption/items/surrogates/Label.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/encryption/items/surrogates/Label.java (modified) (1 diff)

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();