Changeset 1242 for trunk/src/org/expeditee/settings/Settings.java

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/Settings.java (modified) (4 diffs)

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

@@ -22 +22 @@
 import java.lang.reflect.Method;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -32 +33 @@
 import org.expeditee.items.widgets.Password;
 import org.expeditee.reflection.PackageLoader;
-import org.expeditee.setting.GenericSetting;
 import org.expeditee.setting.Setting;
 import org.expeditee.setting.VariableSetting;
@@ -229 +229 @@
         }
         
-        /** Generates settings tree */
-        private static void generateSettingsTree(String page, Text text)
-        {
-                FrameCreator frames = new FrameCreator(text.getParentOrCurrentFrame().getFramesetName(), text.getParentOrCurrentFrame().getPath(), page, false, false);
-                // Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null);
+        private static void generateSettingsTree(String page, Text text) {
+                Frame parent = text.getParentOrCurrentFrame();
+                FrameCreator frames = new FrameCreator(parent.getFramesetName(), parent.getPath(), page, false, false);
                 text.setLink(frames.getName());
                 
-                // add subpages of the current page
-                for(String k : _pages.keySet()) {
-                        if(k.startsWith(page.toLowerCase()) && !k.equals(page)) {
+                // Add subpages of the current page by recursing
+                for (String k: _pages.keySet()) {
+                        if (k.startsWith(page.toLowerCase()) && !k.equals(page)) {
                                 String name = k.substring(page.length() + 1);
-                                if(name.indexOf('.') != -1) {
+                                if (name.indexOf('.') != -1) {
                                         continue;
                                 }
@@ -248 +246 @@
                 }
                 
+                // Start building current page
                 frames.setLastY(frames.getLastY() + 20);
-                
-                // add settings of the current page
+                //      Add Settings of the current page
                 PageDescriptor pd = _pages.get(page);
-                if(pd != null) {
-                        for(String str : pd.orderedEntries) {
-                                String key = str.toLowerCase();
-                                Setting s = pd.settings.get(key);
-                                if(s == null) {
+                if (pd == null) {
+                        frames.save();
+                        return;
+                }
+                
+                
+                Iterator<String> keys = pd.orderedEntries.stream().map(t -> t.toLowerCase()).iterator();
+                while(keys.hasNext()) {
+                        String key = keys.next();
+                        Setting setting = pd.settings.get(key);
+                        if (setting == null) {
+                                continue;
+                        }
+                        
+                        // Keep track of were we are placing items on Frames.
+                        int x = 0, y = 0;
+                        
+                        if (key.equals("pass")) {
+                                // Special case for Password widgets
+                                Text passwordWidgetText = frames.addText("iw: org.expeditee.items.widgets.Passwsord", null, null, null, false);
+                                Password pw = new Password(passwordWidgetText, null);
+                                pw.setPassword("");
+                                frames.getCurrentFrame().removeItem(passwordWidgetText);
+                                frames.getCurrentFrame().addAllItems(pw.getItems());
+                                x = passwordWidgetText.getX() + passwordWidgetText.getBoundsWidth();
+                                y = passwordWidgetText.getY();
+                        } else {
+                                // Determine the content for a setting label.
+                                String name = key.substring(0, 1).toUpperCase() + key.substring(1);
+                                
+                                // Construct and add text representation for setting.  
+                                // If a setting has no initialised value then it is not included.
+                                Text settingRepresentation = setting.generateRepresentation(name, frames.getCurrentFrame().getFramesetName()).copy();
+                                if (settingRepresentation.getBounds() == null) {
                                         continue;
                                 }
-                                String name = str.substring(0, 1).toUpperCase() + str.substring(1);
-                                String value = "";
-                                if(s instanceof GenericSetting && ((GenericSetting<?>) s).isPrimitive()) {
-                                        if(((GenericSetting<?>) s).get() != null) {
-                                                value = ": " + ((GenericSetting<?>) s).get();
-                                        } else {
-                                                value = ": ";
-                                        }
-                                }
-                                int x = 0, y = 0;
-                                Text t;
-                                if(key.equals("pass")) {
-                                        t = frames.addText("iw: org.expeditee.items.widgets.Password", null, null, null, false);
-                                        Password pw = new Password(t, null);
-                                        pw.setPassword((String) value);
-                                        frames.getCurrentFrame().removeItem(t);
-                                        frames.getCurrentFrame().addAllItems(pw.getItems());
-                                        x = pw.getX() + pw.getWidth();
-                                        y = pw.getY();
-                                } else {
-                                        if(s instanceof GenericSetting && ((GenericSetting<?>) s).getType().equals(Text.class)) {
-                                        t = (Text) ((GenericSetting<?>)s).get();
-                                        if(t == null) {
-                                                System.err.println("Failed to get Text setting \"" + str + "\"");
-                                                continue;
-                                        }
-                                        t = t.copy();
-                                        t.setID(frames.getCurrentFrame().getNextItemID());
-                                        t.setText(name);
-                                        frames.addItem(t, false);
-                                } else {
-                                        t = frames.addText(name + value, null, null, null, false);
-                                }
-                                        x = t.getX() + t.getBoundsWidth();
-                                        y = t.getY();
-                                }
-                                x = Math.max(250, x + 20);
-                                Text tt = frames.getCurrentFrame().addText(x, y, "// " + s.getTooltip(), null);
-                                // rebuild to get the correct height since setWidth() doesn't immediately rebuild
-                                tt.rebuild(true);
-                                if(tt.getY() + tt.getBoundsHeight() > frames.getLastY()) {
-                                        frames.setLastY(tt.getY() + tt.getBoundsHeight());
-                                }
+                                settingRepresentation.setID(frames.getCurrentFrame().getNextItemID());
+                                frames.addItem(settingRepresentation, false);                           
+                                x = settingRepresentation.getX() + settingRepresentation.getBoundsWidth();
+                                y = settingRepresentation.getY();
+                        }
+                        
+                        x = Math.max(250, x + 20);
+                        // Add tooltip for setting
+                        Text tooltip = frames.getCurrentFrame().addText(x, y, "// " + setting.getTooltip(), null);
+                        tooltip.rebuild(true);
+                        if (tooltip.getY() + tooltip.getBoundsHeight() > frames.getLastY()) {
+                                frames.setLastY(tooltip.getY() + tooltip.getBoundsHeight());
                         }
                 }
                 
                 frames.save();
-                //FrameIO.SaveFrame(frame);
         }
 }