Changeset 1443 for trunk/src/org/expeditee/gui/DisplayController.java

Timestamp:

11/08/19 13:23:37 (5 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.

File:

• trunk/src/org/expeditee/gui/DisplayController.java (modified) (1 diff)

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