Changeset 1303 for trunk/src/org/expeditee/gui

Timestamp:

04/11/19 15:42:27 (5 years ago)

Author:

bln4

Message:

Moved the static field USER_NOBODY to AuthenticatorBrowser from Browser as it makes more sense there.
Added functionality to log out, equiv to closing Expeditee and starting it again.

Location:

trunk/src/org/expeditee/gui

Files:

• Browser.java (modified) (2 diffs)
• FrameIO.java (modified) (1 diff)
• MessageBay.java (modified) (4 diffs)

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

@@ -149 +149 @@
         public static boolean _hasExited = false;
 
-        public static String USER_NOBODY = "nobody";
-        
         /** A flag which is set once the application is exiting. */
         protected boolean _isExiting = false;
@@ -168 +166 @@
                         String starting_user_name = System.getProperty("user.name");
                         System.setProperty("startinguser.name", starting_user_name);
-                        System.setProperty("user.name", USER_NOBODY);
+                        System.setProperty("user.name", AuthenticatorBrowser.USER_NOBODY);
                 }
                 

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

@@ -168 +168 @@
                 if (!UserSettings.PublicAndPrivateResources || !AuthenticatorBrowser.isAuthenticated()) {
                         
-                        if (UserSettings.UserName.get().equals(Browser.USER_NOBODY)) {
-                                System.err.println("**** FrameIO::changeParentAndSubFolders(): Not setting subfolders for user '"+Browser.USER_NOBODY+"'");
+                        if (UserSettings.UserName.get().equals(AuthenticatorBrowser.USER_NOBODY)) {
+                                System.err.println("**** FrameIO::changeParentAndSubFolders(): Not setting subfolders for user '"+AuthenticatorBrowser.USER_NOBODY+"'");
                         }
                         

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

@@ -224 +224 @@
                 return displayMessage(message, link, actions, color, displayAlways);
         }
+        
+        public static void updateFramesetLocation() {
+                if (_forUser != UserSettings.UserName.get()) {
+                        _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
+                                        false);
+                        _forUser = UserSettings.UserName.get();
+                }
+        }
 
         /** TODO: Comment. cts16 */
@@ -240 +248 @@
                 return t;
         }
-
+        
         /** TODO: Comment. cts16 */
         private synchronized static Text displayMessage(String message, String link, List<String> actions, Colour color,
@@ -268 +276 @@
                 _lastMessage = message;
 
-                if (_creator == null || _forUser == null || !_forUser.equals(UserSettings.UserName.get())) {
+                if (_creator == null) {
                         _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, FrameIO.MESSAGES_PATH, MESSAGES_FRAMESET_NAME, FrameCreator.ExistingFramesetOptions.OverrideExistingFrames,
                                         false);
@@ -562 +570 @@
                 return _status;
         }
-
 }