Changeset 1422 for trunk

Timestamp:

07/31/19 12:15:08 (5 years ago)

Author:

bln4

Message:

Setting an encryption label on a @i annotation generates a surrogate with redacted as the image filename

File:

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

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

@@ -4035 +4035 @@
         
         public void setEncryptionLabel(String label) {
+                this.getSurrogates().clear();
+                this._encryptionLabel = label;
+                
                 if (this.getParent().getEncryptionLabel() == null) {
                         MessageBay.displayMessage("Items can only be entrypted if the frame they are on is.");
@@ -4042 +4045 @@
                 if (labelResult != LabelResult.SuccessResolveLabelToKey) {
                         MessageBay.displayMessage(labelResult.toString());
+                        this._encryptionLabel = null;
                         return;
                 }
                 
-                this._encryptionLabel = label;
-                this.getSurrogates().clear();
                 Item copy = this.copy();
-                if (copy instanceof Text) {     copy.setText("Encrypted"); }
+                if (copy.isAnnotation()) {
+                        if (ItemUtils.startsWithTag(copy, ItemUtils.TAG_IMAGE, true)) {
+                                copy.setText(ItemUtils.GetTag(ItemUtils.TAG_IMAGE) + ": redacted.png");
+                                copy.setVisible(true);
+                        }
+                } else if (copy instanceof Text) {
+                        copy.setText("Encrypted"); 
+                }
                 this.addToSurrogates(copy);
         }