Changeset 1480 for trunk

Timestamp:

12/03/19 16:49:18 (4 years ago)

Author:

bnemhaus

Message:

Window title now notifies you when you are in surrogate mode.
Window title also now notifies you when you are running demo mode.

Location:

trunk/src/org/expeditee

Files:

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

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

@@ -9 +9 @@
 import java.util.stream.Stream;
 
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.ItemsList;
 import org.expeditee.items.Item;
@@ -235 +236 @@
                 ErrorForbiddenLabel;
         }
+
+        public static String surrogateModeString() {
+                String surrogateModeString = null;
+                List<String> accessibleLabelsNames = getAccessibleLabelsNames(DisplayController.getCurrentFrame().getPrimaryBody());
+                if (accessibleLabelsNames.size() == 0) {
+                        surrogateModeString = "Surrogate Mode: Unprivileged";
+                        //_surrogateMode = new Text("Surrogate Mode: Unprivileged");
+                } else {
+                        String list = String.join(",", accessibleLabelsNames);
+                        if (accessibleLabelsNames.size() > 1) { 
+                                list = "(" + list + ")";
+                        } 
+                        surrogateModeString = "Surrogate Mode: " + list;
+                        //_surrogateMode = new Text("Surrogate Mode: " + list);
+                }
+                return surrogateModeString;
+        }
 } 

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

@@ -700 +700 @@
                 }
                 
+                if (Boolean.getBoolean("expeditee.demo-mode")) {
+                        title.append( " [DEMO MODE ACTIVE] ");
+                }
+                
+                if (Label.isInSurrogateMode()) {
+                        title.append(" [" + Label.surrogateModeString() + "]");
+                }
+                
                 EcosystemManager.getGraphicsManager().setWindowTitle(title.toString());
         }

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

@@ -3109 +3109 @@
         }
         
-        protected ItemsList getPrimaryBody() {
+        public ItemsList getPrimaryBody() {
                 return _primaryItemsBody;
         }

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

@@ -485 +485 @@
                 
                 if (Label.isInSurrogateMode()) {
-                        List<String> accessibleLabelsNames = Label.getAccessibleLabelsNames(DisplayController.getCurrentFrame().getPrimaryBody());
-                        if (accessibleLabelsNames.size() == 0) {
-                                _surrogateMode = new Text("Surrogate Mode: Unprivileged");
-                        } else {
-                                String list = String.join(",", accessibleLabelsNames);
-                                if (accessibleLabelsNames.size() > 1) { 
-                                        list = "(" + list + ")";
-                                } 
-                                _surrogateMode = new Text("Surrogate Mode: " + list);
-                        }
+                        String surrogateModeString = Label.surrogateModeString();
+                        
+                        _surrogateMode = new Text(surrogateModeString);
                         _surrogateMode.setFont(new Font(Text.MONOSPACED_FONT));
                         _surrogateMode.setY(75);