Changeset 1431 for trunk/src/org/expeditee/gui/DisplayController.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/gui/DisplayController.java (modified) (1 diff)

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

@@ -1234 +1234 @@
                 }
                 
-                Label.progressSurrogateMode();
                 Frame currentFrame = DisplayController.getCurrentFrame();
                 ItemsList primaryBody = currentFrame.getPrimaryBody();
                 ItemsList primaryBodyCopy = new ItemsList(primaryBody);
-                List<String> accessibleLabelsNames = Label.getAccessibleLabelsNames(primaryBodyCopy);
-                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);
+                List<String> accessibleLabelsNames = Label.progressSurrogateMode(primaryBodyCopy);
+                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);
+                }
                 
                 getCurrentFrame().parse();