Changeset 1431 for trunk/src/org/expeditee/items

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.

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (3 diffs)
• Picture.java (modified) (2 diffs)
• XRayable.java (modified) (1 diff)

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

@@ -50 +50 @@
 import org.expeditee.encryption.items.surrogates.EncryptionDetail;
 import org.expeditee.encryption.items.surrogates.EncryptionDetail.Type;
+import org.expeditee.encryption.items.surrogates.Label.LabelInfo;
+import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.encryption.items.surrogates.Label;
-import org.expeditee.encryption.items.surrogates.Label.LabelResult;
 import org.expeditee.gio.EcosystemManager;
 import org.expeditee.gio.GraphicsManager;
@@ -4053 +4054 @@
                         return;
                 }
-                LabelResult labelResult = Label.getLabel(label);
-                if (labelResult != LabelResult.SuccessResolveLabelToKey) {
+                LabelInfo labelResult = Label.getLabel(label);
+                if (!labelResult.is(LabelResult.SuccessResolveLabelToKey)) {
                         MessageBay.displayMessage(labelResult.toString());
                         this._encryptionLabel = null;
@@ -4232 +4233 @@
                 }
                 
-                return Label.getLabel(label) == LabelResult.SuccessResolveLabelToKey;
+                return Label.getLabel(label).is(LabelResult.SuccessResolveLabelToKey);
         }
         

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 {

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

@@ -25 +25 @@
 import org.expeditee.core.Colour;
 import org.expeditee.core.Point;
-import org.expeditee.encryption.core.EncryptedImage;
 import org.expeditee.encryption.items.surrogates.Label;
 import org.expeditee.gui.DisplayController;