Changeset 1242 for trunk/src/org/expeditee/settings/folders

Timestamp:

03/15/19 16:48:00 (5 years ago)

Author:

bln4

Message:

Support for new regime in the form of new fields and conditional setting of all paths fields.

Settings are now able to generate their own representation. This allows for the user to explicitly inspect the default values.

When profiles are created, an optional parameter may now be provided. If not null, the new map parameter can contain default values for settings to apply to this profile. This allows for the creation of profiles to that have (for example), their username set to an explicit value. Multiuser mode uses this functionality for usernames and key values among other things.

Frames can now be asked were they are located on the file system. Furthermore, frame indirection is now a thing. Rather than containing data to display, an exp file can contain a line in the format of "REDIRECT:<path>" to go looking for that data. Frames are able to return both their logical (their exp file) and real (the file actually containing the data) paths.

Frames can now store data.

Further fixes to how edits from other users are loaded in.

File:

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

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

@@ -25 +25 @@
 import org.expeditee.setting.ListSetting;
 import org.expeditee.setting.Setting;
-import org.expeditee.settings.UserSettings;
 
 public class FolderSettings {
 
-        public static final ListSetting<String> FrameDirs = new ListSetting<String>("Directories to look in for frames") {
+        public static final ListSetting<String> FrameDirs = new ListSetting<String>("Directories to look in for frames", "FrameDirs") {
                 @Override
                 public boolean setSetting(Text text) {
@@ -36 +35 @@
                 }
         };
-        public static final Setting FramesetDir = new Setting("Adds a directory to look in for frames") {
+        public static final Setting FramesetDir = new Setting("Adds a directory to look in for frames", "FramesetDir") {
                 @Override
                 public boolean setSetting(Text text) {
@@ -52 +51 @@
                 return false;
                 }
+                
+                @Override
+                public Text generateRepresentation(String label, String frameset) {
+                        Text t = new Text(label);
+                        return t;
+                }
         };
 
-        public static ListSetting<String> ImageDirs = new ListSetting<String>("Directories to look in for images") {
+        public static ListSetting<String> ImageDirs = new ListSetting<String>("Directories to look in for images", "ImageDirs") {
                 @Override
                 public boolean setSetting(Text text) {
@@ -61 +66 @@
                 }
         };
-        public static final Setting ImageDir = new Setting("Adds a directory to look in for images") {
+        public static final Setting ImageDir = new Setting("Adds a directory to look in for images", "ImageDir") {
                 @Override
                 public boolean setSetting(Text text) {
@@ -77 +82 @@
                 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") {
+        public static final Setting LogDir = new Setting("Set the directory to save logs", "LogDir") {
                 @Override
                 public boolean setSetting(Text text) {
@@ -91 +102 @@
                 return true;
                 }
+                
+                @Override
+                public Text generateRepresentation(String label, String frameset) {
+                        Text t = new Text(label);
+                        return t;
+                }
         };
 }