Changeset 1443 for trunk

Timestamp:

11/08/19 13:23:37 (4 years ago)

Author:

bnemhaus

Message:

Changed Label::progressSurrogate mode so that a null return values signifies that asking for surrogate mode makes no sense because there are no labels in play.

Fixed bug with DisplayController::toggleSurrogateMode. It was printing incorrect messages to the message bay when the user was supposed to be exiting surrogate mode. This was fixed by querying Label::isInSurrogateMode.

Location:

trunk/src/org/expeditee

Files:

• encryption/items/surrogates/Label.java (modified) (2 diffs)
• gui/DisplayController.java (modified) (1 diff)

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

@@ -38 +38 @@
         }
         
+        public static boolean isInSurrogateMode() {
+                return isInSurrogateMode;
+        }
+        
+        /**
+         * Progresses surrogate mode and returns a list of labels that are currently in effect.
+         * @param context The list of expeditee Items to be considered for context.  These are checked for labels.
+         * @return Returns either:
+         *      <ol type='a'> 
+         *              <li> A list of length 1 specifying the label that the current surrogate mode accepts or </li>
+         *              <li> A list of length 0 which specifies that surrogate mode is in unprivileged view or </li>
+         *              <li> Null, which means there are no labels in play on this frame 
+         *                      (so asking for surrogate mode does not make sense) </li> 
+         *  </ol>
+         */
         public static List<String> progressSurrogateMode(ItemsList context) {
                 // Maintain the local cache of user labels
@@ -45 +60 @@
                 
                 List<String> localLabels = getLabelsFromContext(context);
-                if (userLabels.isEmpty() || localLabels.isEmpty()) {
-                        // If either the labels in the context are empty or the user
-                        // has no labels then we are not able to enter surrogate mode.
-                        return userLabels;
-                }
+                if (localLabels.isEmpty()) {
+                        // If there are no labels on this Frame return null;
+                        return null;
+                } 
                 
                 ArrayList<String> intersection = new ArrayList<String>(userLabels);

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

@@ -1238 +1238 @@
                 ItemsList primaryBodyCopy = new ItemsList(primaryBody);
                 List<String> accessibleLabelsNames = Label.progressSurrogateMode(primaryBodyCopy);
-                if (accessibleLabelsNames.isEmpty()) {
-                        MessageBay.displayMessage("Surrogate Mode currently accepts no labels. (Unprivileged view)");
+                if (Label.isInSurrogateMode()) {
+                        if (accessibleLabelsNames == null) {
+                                MessageBay.displayMessage("Unable to enter surrogate mode as there are no encryption labels on the current Frame");
+                        } else if (accessibleLabelsNames.isEmpty()) {
+                                MessageBay.displayMessage("Surrogate Mode currently accepts no labels. (Unprivileged view)");
+                        } else {
+                                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);
+                        }
                 } else {
-                        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);
-                }
-                
+                        if (accessibleLabelsNames == null) {
+                                MessageBay.displayMessage("Unable to enter surrogate mode as there are no encryption labels on the current Frame");
+                        } else {
+                                MessageBay.displayMessage("No longer in surrogate mode.");
+                        }
+                }
+                                
                 getCurrentFrame().parse();
                 getCurrentFrame().refreshSize();