Changeset 1539

Timestamp:

11/02/20 15:41:32 (4 years ago)

Author:

bnemhaus

Message:

Moved the HomeFrame settings to be prior to the ProfileName and UserName setting because the HomeFrame setting CAN be dependent on having a profile name already set.

Added code to deal with legacy framesets that will still have HomeFrame setting appearing before ProfileName and UserName.

File:

• trunk/src/org/expeditee/settings/UserSettings.java (modified) (5 diffs)

trunk/src/org/expeditee/settings/UserSettings.java

@@ -31 +31 @@
 import org.expeditee.agents.wordprocessing.JSpellChecker;
 import org.expeditee.auth.AuthenticatorBrowser;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -36 +37 @@
 import org.expeditee.gui.MessageBay;
 import org.expeditee.gui.management.ProfileManager;
+import org.expeditee.gui.management.ResourceUtil;
 import org.expeditee.items.Text;
 import org.expeditee.setting.BooleanSetting;
@@ -59 +61 @@
         public static final IntegerSetting Gravity = new IntegerSetting("Distance the cursor has to be from a text item to select the text item", "Gravity", 3);
         
+        public static final StringSetting UserName = new StringSetting("User name", ProfileManager.USER_NAME_FLAG); 
+        
+        public static final StringSetting ProfileName = new StringSetting("Profile name", ProfileManager.PROFILE_NAME_FLAG);
+
         public static final StringSetting StartFrame = new StringSetting("The frame to go to when Expeditee is started (defaults to the profile frame)", null);
         
@@ -68 +74 @@
                 public boolean setSetting(Text text) {
                 String profileName = UserSettings.ProfileName.get();
+                
+                if (profileName == null) { profileName = Browser.getExpediteeUserProfileName(); }
+                else {
+                        // Legacy case for if the order of the settings frame causes HomeFrame to be parsed before the UserName and ProfileName.
+                        profileName = ResourceUtil.substitute(profileName, ProfileManager.PROFILE_NAME_FLAG, Browser.getExpediteeUserProfileName());
+                }
+                
                         if(text.getText().indexOf(':') == -1 || !text.hasLink()) {
                                 //if (!profileName.equals(ProfileManager.USER_NAME_FLAG)) {
-                                if (profileName != null) {
-                                        text.setLink(profileName + "1");
-                                }
+                                text.setLink(profileName + "1");
                         //text.setLink(FrameIO.LoadProfile(UserSettings.ProfileName.get()).getName());
                 }
@@ -108 +119 @@
         
         public static final IntegerSetting TitlePosition = new IntegerSetting("Position of title item in frame (TODO: find whether this is x-offset or y-offset)", "TitlePosition", 150);
-                
-        public static final StringSetting UserName = new StringSetting("User name", ProfileManager.USER_NAME_FLAG); 
-        
-//      public static final StringSetting ProfileName = new StringSetting("Profile name", ProfileManager.USER_NAME_FLAG); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
-        public static final StringSetting ProfileName = new StringSetting("Profile name", null); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
-                
+                                
         public static final BooleanSetting AntiAlias = new BooleanSetting("Whether anti-aliasing should be enabled", "AntiAlias", false);