Changeset 1244 for trunk/src/org/expeditee/settings/folders/FolderSettings.java

Timestamp:

03/17/19 22:29:23 (5 years ago)

Author:

davidb

Message:

After change to have resources-public and resources-private, some changes needed to support running Expeditee for a single user; other main change is to allow FrameDirs to specify relative directory paths, to help with when Expeditee is run on the cloud -- similar work still needs to occurr for ImageDir and AudioDir; some other minor changes also made.

File:

• trunk/src/org/expeditee/settings/folders/FolderSettings.java (modified) (3 diffs)

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

@@ -19 +19 @@
 package org.expeditee.settings.folders;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Text;
+import org.expeditee.setting.DirectoryListSetting;
 import org.expeditee.setting.ListSetting;
 import org.expeditee.setting.Setting;
@@ -28 +33 @@
 public class FolderSettings {
 
-        public static final ListSetting<String> FrameDirs = new ListSetting<String>("Directories to look in for frames", "FrameDirs") {
-                @Override
-                public boolean setSetting(Text text) {
-                        _value.addAll(FrameUtils.getDirs(text));
-                        return true;
-                }
-        };
+        public static final DirectoryListSetting FrameDirs = new DirectoryListSetting("Directories to look in for frames", "FrameDirs");
+        
         public static final Setting FramesetDir = new Setting("Adds a directory to look in for frames", "FramesetDir") {
                 @Override
@@ -90 +90 @@
         };
         
+        
+        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 final Setting AudioDir = new Setting("Adds a directory to look in for audio", "AudioDir") {
+                @Override
+                public boolean setSetting(Text text) {
+                if(text.getText().indexOf(':') == -1) {
+                        return false;
+                }
+                AttributeValuePair avp = new AttributeValuePair(text.getText());
+                if(avp.getValue().trim().length() != 0) {
+                        String dir = FrameUtils.getDir(avp.getValue());
+                        if(dir != null) {
+                                FolderSettings.AudioDirs.get().add(0, dir);
+                                return true;
+                        }
+                }
+                return false;
+                }
+                
+                @Override
+                public Text generateRepresentation(String label, String frameset) {
+                        Text t = new Text(label);
+                        return t;
+                }
+        };
+        
+        
         public static final Setting LogDir = new Setting("Set the directory to save logs", "LogDir") {
                 @Override