Changeset 1440 for trunk/src/org/expeditee/settings/UserSettings.java

Timestamp:

11/06/19 16:17:13 (5 years ago)

Author:

bnemhaus

Message:

Reordered the default FrameDirs, ImageDirs and AudioDirs to what I think is a logical order.
Also renamed the CURRENT.USER flag to CURRENT_USER to be inline with other flags like CURRENT_FRAMESET

File:

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

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

@@ -43 +43 @@
 import org.expeditee.setting.IntegerSetting;
 import org.expeditee.setting.ListSetting;
-import org.expeditee.setting.Setting;
 import org.expeditee.setting.StringSetting;
 import org.expeditee.settings.folders.FolderSettings;
@@ -109 +108 @@
         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", "${USER.NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
-        
-        public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER.NAME}");
+        public static final StringSetting UserName = new StringSetting("User name", "${USER_NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
+        
+        public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER_NAME}");
                 
         public static final BooleanSetting AntiAlias = new BooleanSetting("Whether anti-aliasing should be enabled", "AntiAlias", false);
@@ -243 +242 @@
         }
         
-        public static void appendDefaultFolders() {
-                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
-                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.TRASH_PATH);
-                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
-                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.GROUP_PATH);
-                
+        public static void appendDefaultFolders() {             
                 if (PublicAndPrivateResources) {
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_USERNAME_PRIVATE_PATH);
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
-                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_USERNAME_PRIVATE_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
+                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH);
                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
-                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH);
-                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
+                        
                         if (AuthenticatorBrowser.isAuthenticated()) {
-                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
+                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
-                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
+                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);                         
                         }
-                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
-                        
-                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
+                        
+                        FolderSettings.ImageDirs.addAbsoluteDir("${CURRENT_FRAMESET}");
                         FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_USERNAME_PRIVATE_PATH);
-                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
-                        
+                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);           
+                        
+                        FolderSettings.AudioDirs.addAbsoluteDir("${CURRENT_FRAMESET}");
                         FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
                         FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_USERNAME_PRIVATE_PATH);
+                        
+                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
+                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
                         FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
                 } else {
@@ -278 +276 @@
                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
                         }
-                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
                         
                         FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
-                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
                         
                         FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
-                        FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
-                }
+                }
+                
+                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
+                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.GROUP_PATH);
+                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
+                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.TRASH_PATH);
+                
+                FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
+                FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
+                FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
         }