Changeset 1245 for trunk/src/org/expeditee/settings

Timestamp:

03/18/19 09:43:05 (5 years ago)

Author:

davidb

Message:

ImageDirs and AudioDirs changed over to new DirectcoryListSetting; further work done on title/framename position to help startup/init code

Location:

trunk/src/org/expeditee/settings

Files:

• UserSettings.java (modified) (2 diffs)
• folders/FolderSettings.java (modified) (2 diffs)

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

@@ -263 +263 @@
                         // 1. resources-<username>\images       Generated on user account creation and must be refreshed on user switching.
                         // 2. IMAGES_PATH                                       <expeditee-home>\resources-public\images
-                        FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PRIVATE_PATH);
-                        FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);
+                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PRIVATE_PATH);
+                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
                         
-                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PRIVATE_PATH);
-                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PATH);
+                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PRIVATE_PATH);
+                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
                         FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
                         
@@ -279 +279 @@
                         FolderSettings.FrameDirs.setDefault(FolderSettings.FrameDirs.get());
 
-                        FolderSettings.ImageDirs.get().add(FrameIO.IMAGES_PATH);
+                        FolderSettings.ImageDirs.addAbsoluteDir(FrameIO.IMAGES_PATH);
                         FolderSettings.ImageDirs.setDefault(FolderSettings.ImageDirs.get());
                         
-                        FolderSettings.AudioDirs.get().add(FrameIO.AUDIO_PATH);
+                        FolderSettings.AudioDirs.addAbsoluteDir(FrameIO.AUDIO_PATH);
                         FolderSettings.AudioDirs.setDefault(FolderSettings.AudioDirs.get());
                 }

trunk/src/org/expeditee/settings/folders/FolderSettings.java

@@ -59 +59 @@
         };
 
-        public static ListSetting<String> ImageDirs = new ListSetting<String>("Directories to look in for images", "ImageDirs") {
-                @Override
-                public boolean setSetting(Text text) {
-                        _value.addAll(FrameUtils.getDirs(text));
-                        return true;
-                }
-        };
+        public static DirectoryListSetting ImageDirs = new DirectoryListSetting("Directories to look in for images", "ImageDirs");
+                        
         public static final Setting ImageDir = new Setting("Adds a directory to look in for images", "ImageDir") {
                 @Override
@@ -91 +86 @@
         
         
-        public static ListSetting<String> AudioDirs = new ListSetting<String>("Directories to look in for audio", "AudioDirs") {
-                @Override
-                public boolean setSetting(Text text) {
-                        _value.addAll(FrameUtils.getDirs(text));
-                        return true;
-                }
-        };
+        public static DirectoryListSetting AudioDirs = new DirectoryListSetting("Directories to look in for audio", "AudioDirs");
+        
         public static final Setting AudioDir = new Setting("Adds a directory to look in for audio", "AudioDir") {
                 @Override