Changeset 1440 for trunk


Ignore:
Timestamp:
11/06/19 16:17:13 (4 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

Location:
trunk/src/org/expeditee
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/expeditee/auth/AuthenticatorBrowser.java

    r1434 r1440  
    8181       
    8282        private KeyStore keyStore = KeyStore.getInstance(KeystoreType);
    83         public static String USER_NOBODY = "${USER.NAME}";
     83        public static String USER_NOBODY = "${USER_NAME}";
    8484               
    8585        private static final byte[] TRUE = "yes".getBytes();

  • trunk/src/org/expeditee/gui/management/ProfileManager.java

    r1434 r1440  
    2828public class ProfileManager {
    2929
    30         private static final String USER_NAME_PATTERN_INTERNAL = "USER.NAME";
     30        private static final String USER_NAME_PATTERN_INTERNAL = "USER_NAME";
    3131        private static final String DEFAULT = UserSettings.DEFAULT_PROFILE_NAME;
    3232        private static final String[] startPages = { "exploratorysearch", "webbrowser" };
    … …  
    7171                                // 2. Copy item from defaultFrame to the current profile frame being
    7272                                // constructed.
    73                                 // 3. Replace instance of ${USER.NAME} with 'profileFor'
     73                                // 3. Replace instance of ${USER_NAME} with 'profileFor'
    7474                                // 4. Replace settings values of copied items with those specified in
    7575                                // specifiedSettings (if present)
    … …  
    8585                                        if (item instanceof Text) {
    8686                                                String content = item.getText();
    87                                                 item.setText(ResourceUtil.substitute(content, ProfileManager.USER_NAME_PATTERN_INTERNAL, profileFor));
     87                                                item.setText(ResourceUtil.substitute(content, ProfileManager.USER_NAME_PATTERN, profileFor));
    8888                                        }
    8989                                }

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

    r1434 r1440  
    4343import org.expeditee.setting.IntegerSetting;
    4444import org.expeditee.setting.ListSetting;
    45 import org.expeditee.setting.Setting;
    4645import org.expeditee.setting.StringSetting;
    4746import org.expeditee.settings.folders.FolderSettings;
    … …  
    109108        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);
    110109               
    111         public static final StringSetting UserName = new StringSetting("User name", "${USER.NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
    112        
    113         public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER.NAME}");
     110        public static final StringSetting UserName = new StringSetting("User name", "${USER_NAME}"); // FrameIO.ConvertToValidFramesetName(System.getProperty("user.name"))
     111       
     112        public static final StringSetting ProfileName = new StringSetting("Profile name", "${USER_NAME}");
    114113               
    115114        public static final BooleanSetting AntiAlias = new BooleanSetting("Whether anti-aliasing should be enabled", "AntiAlias", false);
    … …  
    243242        }
    244243       
    245         public static void appendDefaultFolders() {
    246                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
    247                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.TRASH_PATH);
    248                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
    249                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.GROUP_PATH);
    250                
     244        public static void appendDefaultFolders() {             
    251245                if (PublicAndPrivateResources) {
     246                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_USERNAME_PRIVATE_PATH);
    252247                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_PATH);
    253                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.HELP_USERNAME_PRIVATE_PATH);
     248                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
     249                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH);
    254250                        FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_PATH);
    255                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.FRAME_USERNAME_PRIVATE_PATH);
    256                         FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MESSAGES_PATH);
     251                       
    257252                        if (AuthenticatorBrowser.isAuthenticated()) {
    258                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);
     253                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
    259254                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.MAIL_PATH);
    260                                 FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
     255                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.SHARED_FRAMESETS_PATH);                         
    261256                        }
    262                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
    263                        
    264                         FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
     257                       
     258                        FolderSettings.ImageDirs.addAbsoluteDir("${CURRENT_FRAMESET}");
    265259                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_USERNAME_PRIVATE_PATH);
    266                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
    267                        
     260                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);           
     261                       
     262                        FolderSettings.AudioDirs.addAbsoluteDir("${CURRENT_FRAMESET}");
    268263                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
    269264                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_USERNAME_PRIVATE_PATH);
     265                       
     266                        FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
     267                        FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
    270268                        FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
    271269                } else {
    … …  
    278276                                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.CONTACTS_PATH);
    279277                        }
    280                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
    281278                       
    282279                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
    283                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
    284280                       
    285281                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
    286                         FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
    287                 }
     282                }
     283               
     284                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PUBLIC_PATH);
     285                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.GROUP_PATH);
     286                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.PROFILE_PATH);
     287                FolderSettings.FrameDirs.addAbsoluteDir(FrameIO.TRASH_PATH);
     288               
     289                FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
     290                FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
     291                FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
    288292        }
    289293
Note: See TracChangeset for help on using the changeset viewer.