Changeset 1467 for trunk/src

Timestamp:

11/29/19 15:42:52 (4 years ago)

Author:

bnemhaus

Message:

UserSettings.ProfileName is now null if not set. This also effects UserSettings.HomeFrame as you can only point to profile frame 1 if it is set.

File:

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

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

@@ -69 +69 @@
                 String profileName = UserSettings.ProfileName.get();
                         if(text.getText().indexOf(':') == -1 || !text.hasLink()) {
-                                if (!profileName.equals(ProfileManager.USER_NAME_FLAG)) {
+                                //if (!profileName.equals(ProfileManager.USER_NAME_FLAG)) {
+                                if (profileName != null) {
                                         text.setLink(profileName + "1");
                                 }
@@ -108 +109 @@
         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); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
-        
-        public static final StringSetting ProfileName = new StringSetting("Profile name", ProfileManager.USER_NAME_FLAG);
+        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);