Changeset 1540

Timestamp:

11/02/20 15:47:20 (4 years ago)

Author:

bnemhaus

Message:

Removed reliance of System.getProperty("user.name") by introducing some functions and a variable to Browser to be used instead. All previous occurrences of System.getProperty("user.name") now use these functions.

At the time, introduced new piping into various functions related to the creation and management of profile frames that distinguished between a profile name and a user name. This allows functions to be more specific about what is being used. For example, when modifying the users profile frames (in the profiles directory) that users profile name can be used instead of naming the variable 'username'. This distinction is important because while username's can end with numbers, profile names cannot and therefore get an 'A' on the end.

Location:

trunk

Files:

• null.banks (modified) (4 diffs)
• src/org/expeditee/auth/Actions.java (modified) (2 diffs)
• src/org/expeditee/auth/AuthenticatorBrowser.java (modified) (1 diff)
• src/org/expeditee/auth/account/Authenticate.java (modified) (1 diff)
• src/org/expeditee/auth/account/Create.java (modified) (4 diffs)
• src/org/expeditee/auth/tags/AuthenticationTag.java (modified) (1 diff)
• src/org/expeditee/gio/swing/SwingGraphicsManager.java (modified) (1 diff)
• src/org/expeditee/gui/Browser.java (modified) (4 diffs)
• src/org/expeditee/gui/FrameIO.java (modified) (4 diffs)
• src/org/expeditee/gui/MessageBay.java (modified) (1 diff)
• src/org/expeditee/gui/management/ProfileManager.java (modified) (2 diffs)
• src/org/expeditee/items/Dot.java (modified) (1 diff)

trunk/null.banks

@@ -4 +4 @@
 bnemhausPXOPCQ3.wav൝᳿1.0᳿0
 bnemhausFNSAEQ2.wav൝᳿1.0᳿0
+#$frameplayer#master$वbnemhausSNDGGN1.wav൝᳿1.0᳿0
 bnemhausDGRPEQ1.wav൝᳿1.0᳿0
 bnemhausKKWPJL7.wav൝᳿1.0᳿0
@@ -24 +25 @@
 bnemhausBIKKPW1.wav൝᳿1.0᳿0
 bnemhausEXIBIN2.wav൝᳿1.0᳿0
+bnemhausRPIORU1.wav൝᳿1.0᳿0
 bnemhausGKCCXP2.wav൝᳿1.0᳿0
 bnemhausEXYLOP1.wav൝᳿1.0᳿0
@@ -43 +45 @@
 bnemhausWVAWJO1.wav൝᳿1.0᳿0
 bnemhausHAQABB1.wav൝᳿1.0᳿0
+bnemhausSNDGGN1.wav൝᳿1.0᳿0
 bnemhausHSOCEV2.wav൝᳿1.0᳿0
 bnemhausTJNARP1.wav൝᳿1.0᳿0
@@ -53 +56 @@
 bnemhausGQLOPS1.wav൝᳿1.0᳿0
 bnemhausUJHQEQ1.wav൝᳿1.0᳿0
-#$frameplayer#master$᳿1.0᳿0
+#$frameplayer#master$᳿0.13᳿0
 bryceFYJNMX1.wav൝᳿1.0᳿0
 bnemhausNAMWRO3.wav൝᳿1.0᳿0

trunk/src/org/expeditee/auth/Actions.java

@@ -48 +48 @@
 import org.expeditee.encryption.CryptographyConstants;
 import org.expeditee.gio.gesture.StandardGestureActions;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
@@ -96 +97 @@
                 String backup = UserSettings.UserName.get();
                 System.setProperty("user.name", userbackup);
+                Browser.setExpediteeUserName(userbackup);
                 UserSettings.UserName.set(userbackup);
                 userbackup = backup;

trunk/src/org/expeditee/auth/AuthenticatorBrowser.java

@@ -84 +84 @@
         public static boolean isAuthenticated() {
                 //return isAuthenticationRequired() && !UserSettings.UserName.get().equals(AuthenticatorBrowser.USER_NOBODY);
-                return isAuthenticationRequired() && !System.getProperty("user.name").equals(AuthenticatorBrowser.USER_NOBODY);
+                return isAuthenticationRequired() && !Browser.getExpediteeUserName().equals(AuthenticatorBrowser.USER_NOBODY);
         }
         

trunk/src/org/expeditee/auth/account/Authenticate.java

@@ -53 +53 @@
                 }
                 
-                System.setProperty("user.name", username);
+                Browser.setExpediteeUserName(username);
                 UserSettings.UserName.set(username);
                 if (!username.equals(AuthenticatorBrowser.ADMINACCOUNT)) {

trunk/src/org/expeditee/auth/account/Create.java

@@ -31 +31 @@
 import org.expeditee.core.Colour;
 import org.expeditee.encryption.CryptographyConstants;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
@@ -86 +87 @@
                 // Update in memory settings
                 ProfileManager.ensureDefaultProfile();
-                System.setProperty("user.name", username);
+                Browser.setExpediteeUserName(username);
                 UserSettings.UserName.set(username);
                 //UserSettings.ProfileName.set(username);
-                UserSettings.ProfileName.set(FrameIO.ConvertToValidFramesetName(username));
+                final String profileName = FrameIO.ConvertToValidFramesetName(username);
+                UserSettings.ProfileName.set(profileName);
                 UserSettings.setupDefaultFolders();
                                 
                 Frame profile;
                 try {
-                        profile = createNewProfile(username, email, personalKey, privateKey, publicKey);
+                        profile = createNewProfile(username, profileName, email, personalKey, privateKey, publicKey);
                 } catch (InvalidFramesetNameException | ExistingFramesetException e) {
                         return CreateResult.ErrorNewProfile;
@@ -201 +203 @@
         }
 
-        private static Frame createNewProfile(String username, String email, String personalKey, String privateKey,
+        private static Frame createNewProfile(String username, String profileName, String email, String personalKey, String privateKey,
                         String publicKey) throws InvalidFramesetNameException, ExistingFramesetException {
                 // Establish the initial settings for the created user.
@@ -241 +243 @@
                 
                 // Create users profile
-                Frame profile = FrameIO.CreateNewProfile(username, initialSettings, notifiers);
+                Frame profile = FrameIO.CreateNewProfile(username, profileName, initialSettings, notifiers);
                 int lastNumber = FrameIO.getLastNumber(profile.getFramesetName());
                 for (int i = 1; i <= lastNumber; i++) {

trunk/src/org/expeditee/auth/tags/AuthenticationTag.java

@@ -9 +9 @@
 
 public enum AuthenticationTag {
-        Username ("txtUsername", System.getProperty("user.name")), 
+        Username ("txtUsername", System.getProperty("user.name")), // Should use Browser.getExpediteeUserName()
         Password ("txtPassword", System.getProperty("user.password")), 
         PasswordAgain ("txtPasswordAgain", System.getProperty("user.password.again")), 

trunk/src/org/expeditee/gio/swing/SwingGraphicsManager.java

@@ -197 +197 @@
 
                 if (on) {
+                        if (hasAntialiasing) {
+                                //return;
+                        }
                         surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+                        hasAntialiasing = true;
                 } else {
+                        if (hasAntialiasing) {
+                                //return;
+                        }
                         surface.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
                 }
         }
+        
+        private static boolean hasAntialiasing = false;
 
         @Override

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

@@ -169 +169 @@
         public static void main(String[] args) {
                 if (AuthenticatorBrowser.isAuthenticationRequired()) {
-                        String starting_user_name = System.getProperty("user.name");
+                        String starting_user_name = getExpediteeUserName();
                         System.setProperty("startinguser.name", starting_user_name);
-                        System.setProperty("user.name", AuthenticatorBrowser.USER_NOBODY);
+                        setExpediteeUserName(AuthenticatorBrowser.USER_NOBODY);
                 }
                 
@@ -276 +276 @@
 
                 if (!AuthenticatorBrowser.isAuthenticationRequired() && UserSettings.PublicAndPrivateResources) {
-                        String userName = System.getProperty("user.name"); //UserSettings.ProfileName.get();
+                        String userName = getExpediteeUserName(); //UserSettings.ProfileName.get();
                         if (!FrameIO.personalResourcesExist(userName)) {
                                 FrameIO.setupPersonalResources(userName);
@@ -537 +537 @@
                 });
         }
-
+                
+        private static String expediteeUserName = System.getProperty("user.name");
+        
+        public static String getExpediteeUserName() {
+//              String expediteeUserNameLocal = FrameIO.ConvertToValidFramesetName(expediteeUserName);
+//              return expediteeUserNameLocal;
+                return expediteeUserName;
+        }
+        
+        public static void setExpediteeUserName(String username) {
+                expediteeUserName = username;
+        }
+        
+        public static String getExpediteeUserProfileName() {
+                String expediteeUserNameLocal = FrameIO.ConvertToValidFramesetName(expediteeUserName);
+                return expediteeUserNameLocal;
+        }
+        
         /**
          * @return The user's profile frame.
          */
-        public static Frame loadInitialProfiles()
-        {
+        public static Frame loadInitialProfiles() {
                 String defaultProfileName = UserSettings.DEFAULT_PROFILE_NAME;
-                String userName = System.getProperty("user.name");
-
-                Frame defaultProfile = loadProfile(defaultProfileName);
-                Frame userProfile = loadProfile(userName);
+                String userName = getExpediteeUserName();
+                String userProfileName = getExpediteeUserProfileName();
+
+                Frame defaultProfile = loadProfile(defaultProfileName, defaultProfileName);
+                Frame userProfile = loadProfile(userName, userProfileName);
                 
                 MessageBay.warningMessages(FrameUtils.ParseProfile(defaultProfile));
@@ -571 +588 @@
         }
 
-        protected static Frame loadProfile(String userName)     {
-                Frame profile = FrameIO.LoadProfile(userName);
+        protected static Frame loadProfile(String username, String profileName) {
+                Frame profile = FrameIO.LoadProfile(profileName);
                 
                 if (profile == null) {
                         try {
-                                profile = FrameIO.CreateNewProfile(userName, null, null);
+                                profile = FrameIO.CreateNewProfile(username, profileName, null, null);
                         } catch (Exception e) {
                                 // TODO tell the user that there was a problem creating the

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

@@ -1100 +1100 @@
                 
                 if (toSave == null || !toSave.hasChanged() || toSave.isSaved()) {
+                        System.err.println("FrameIO::SaveFrame::Nothing to save, backing out.");
                         return "";
+                }
+                
+                if (toSave.getName().toLowerCase().equals("abc146a1")) {
+                        System.out.println("here");
                 }
 
@@ -1200 +1205 @@
                         boolean fileModifyConflict = fileLastModify > frameLastModify && !isBayFrameset;
                         boolean versionConflict = savedVersion > toSave.getVersion() && !isBayFrameset;
+                        
+                        System.err.println("FrameIO::SaveFrame::Checking for conflicts for frame:" + toSave.getName());
                         
                         if ((fileModifyConflict || versionConflict) && savedVersion > 0) {
@@ -1405 +1412 @@
         }
 
-        public static Frame LoadProfile(String userName)
+        public static Frame LoadProfile(String profileName)
         {
                 final String profilesLoc = System.getProperty("profiles.loc");
                 if (profilesLoc != null) {
-                        return LoadFrame(userName + "1", profilesLoc);
+                        return LoadFrame(profileName + "1", profilesLoc);
                 } else {
-                        return LoadFrame(userName + "1");
-                }
-        }
-
-        public static Frame CreateNewProfile(String username, Map<String, Setting> initialSettings, Map<String, Consumer<Frame>> toNotifyOnSet) throws InvalidFramesetNameException, ExistingFramesetException {
+                        return LoadFrame(profileName + "1");
+                }
+        }
+
+        public static Frame CreateNewProfile(String userName, String profileName, Map<String, Setting> initialSettings, Map<String, Consumer<Frame>> toNotifyOnSet) throws InvalidFramesetNameException, ExistingFramesetException { //TODO: Investigate these throws, they never seem to be thrown up this far.
 //              Frame profile = CreateFrameset(username, PROFILE_PATH, true);
 //              if (profile != null) {
@@ -1425 +1432 @@
 //              }
 //              return profile;
-                if (username.equals(UserSettings.DEFAULT_PROFILE_NAME)) {
-                        ProfileManager.ensureDefaultProfile();
-                        return FrameIO.LoadFrame(UserSettings.DEFAULT_PROFILE_NAME + "1");
+                if (profileName.equals(UserSettings.DEFAULT_PROFILE_NAME)) {
+                        System.err.println("FrameIO::CreateNewProfile::DEPRECATED::CreateNewProfile should no longer be called to create a default profile.  Use FrameIO::CreateNewDefaultProfile instead.");
+                        return CreateNewDefaultProfile();
                 } else {
-                        return ProfileManager.createProfile(username, initialSettings, toNotifyOnSet);
-                }
+                        return ProfileManager.createProfile(userName, profileName, initialSettings, toNotifyOnSet);
+                }
+        }
+        
+        public static Frame CreateNewDefaultProfile() throws InvalidFramesetNameException, ExistingFramesetException  { //TODO: Investigate these throws, they never seem to be thrown up this far.
+                ProfileManager.ensureDefaultProfile();
+                return FrameIO.LoadFrame(UserSettings.DEFAULT_PROFILE_NAME + "1");
         }
 

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

@@ -481 +481 @@
                 }
                 
-                _authorisedUser = new Text("Username: " + System.getProperty("user.name"));
+                _authorisedUser = new Text("Username: " + Browser.getExpediteeUserName());
                 _authorisedUser.setFont(new Font(Text.MONOSPACED_FONT));
                 _authorisedUser.setY(95);

trunk/src/org/expeditee/gui/management/ProfileManager.java

@@ -31 +31 @@
         private static final String[] startPages = { "exploratorysearch", "webbrowser" };
         public static final String USER_NAME_FLAG = "${" + "USER.NAME" + "}";
-
-        public static Frame createProfile(String profileFor, Map<String, Setting> specifiedSettings,
+        public static final String PROFILE_NAME_FLAG = "${" + "PROFILE.NAME" + "}";
+
+        public static Frame createProfile(String username, String profileName, Map<String, Setting> specifiedSettings,
                         Map<String, Consumer<Frame>> notifyWhenGenerated) {
                 ensureDefaultProfile();
                 Frame profileOne = null;
-                profileFor = FrameIO.ConvertToValidFramesetName(profileFor);
+                //String profileName = FrameIO.ConvertToValidFramesetName(username); // TODO: Delete this line before SVN commit
                 
                 try {
-                        Frame profile = FrameIO.CreateFrameset(profileFor, FrameIO.PROFILE_PATH, true, null);
+                        Frame profile = FrameIO.CreateFrameset(profileName, FrameIO.PROFILE_PATH, true, null);
                         profileOne = profile;
-                        profile.setTitle(profileFor + "'s Profile");
+                        profile.setTitle(username + "'s Profile");
                         Frame defaultFrame = FrameIO.LoadFrame(DEFAULT + "1");
                         MessageBay.suppressMessages(true);
-                        UserSettings.UserName.set(profileFor);
-                        UserSettings.ProfileName.set(FrameIO.ConvertToValidFramesetName(profileFor));
+                        UserSettings.UserName.set(username);
+                        UserSettings.ProfileName.set(profileName);
                         
                         int lastNumber = FrameIO.getLastNumber(defaultFrame.getFramesetName());
@@ -83 +84 @@
                                         if (item instanceof Text) {
                                                 String content = item.getText();
-                                                item.setText(ResourceUtil.substitute(content, ProfileManager.USER_NAME_FLAG, profileFor));
+                                                String contentWithUserSub = ResourceUtil.substitute(content, ProfileManager.USER_NAME_FLAG, username);
+                                                String contentWithUserAndProfileSub = ResourceUtil.substitute(contentWithUserSub, ProfileManager.PROFILE_NAME_FLAG, FrameIO.ConvertToValidFramesetName(profileName));
+                                                item.setText(contentWithUserAndProfileSub);
                                         }
                                 }

trunk/src/org/expeditee/items/Dot.java

@@ -234 +234 @@
                         } else if (_highlightMode == HighlightMode.Connected) {
                                 g.drawRectangle(bounds.getTopLeft(), bounds.getSize(), 0.0f, null, highlightColor, HIGHLIGHT_STROKE, null);
+                                System.err.println("Dot::paint:Painting Dot with colour: " + highlightColor);
                         } else if (_highlightMode == HighlightMode.Normal) {
                                 g.drawOval(bounds.getCentre(), bounds.getSize(), 0.0f, fill, highlightColor, DOT_STROKE);