Changeset 1540 for trunk/src/org/expeditee/gui/management/ProfileManager.java

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.

File:

• trunk/src/org/expeditee/gui/management/ProfileManager.java (modified) (2 diffs)

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