Changeset 1540 for trunk/src/org/expeditee/gui/FrameIO.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/FrameIO.java (modified) (4 diffs)

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