Changeset 1431 for trunk/src/org/expeditee/items/Picture.java

Timestamp:

08/15/19 12:57:28 (5 years ago)

Author:

bln4

Message:

Recoding of the Labels class to improve surrogate mode functionality. Surrogate mode is now maintained when you navigate from one frame to another, even if that frame has a different set of labels. Completely different sets of labels cause Expeditee to exit surrogate mode with a message to the user.

File:

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

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

@@ -39 +39 @@
 import org.expeditee.encryption.core.EncryptedImage;
 import org.expeditee.encryption.items.surrogates.Label;
+import org.expeditee.encryption.items.surrogates.Label.LabelInfo;
 import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.gio.EcosystemManager;
@@ -786 +787 @@
                                 _image = Image.getImage(_path);
                         } else {
-                                LabelResult result = Label.getLabel(encryptionLabel);
-                                if (result == LabelResult.SuccessResolveLabelToKey) {
+                                LabelInfo result = Label.getLabel(encryptionLabel);
+                                if (result.is(LabelResult.SuccessResolveLabelToKey)) {
                                         _image = EncryptedImage.getImage(_path, result.key);
                                 } else {