Changeset 658

Timestamp:

01/07/14 14:14:22 (10 years ago)

Author:

jts21

Message:

Auto-generate settings tree when creating a new profile

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (1 diff)
• gui/FrameUtils.java (modified) (2 diffs)
• settings/Settings.java (modified) (5 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -1534 +1534 @@
         
         public static Text settings() {
-                return Settings.generateSettingsTree();
+                Text t = DisplayIO.getCurrentFrame().createNewText("Settings");
+                Settings.generateSettingsTree(t);
+                return t;
         }
 }

trunk/src/org/expeditee/gui/FrameUtils.java

@@ -1463 +1463 @@
                                 
                                 xPos += 25;
-                                
-                                boolean settingsFound = false;
 
                                 // Start Pages should be the first frame in its own frameset + frameset name should be present in FrameUtils.startPages[].
@@ -1483 +1481 @@
                                                         }
                                                 }
-                                                
-                                                // Populate settings frameset
-                                                if(!settingsFound && framesetName.equals("settings")) {
-                                                        Frame indexFrame = FrameIO.LoadFrame(framesetName + "1");
-                                                        
-                                                        if(indexFrame != null) {
-                                                                settingsFound = true;
-                                                                
-                                                                t = profile.addText(550, 100, "@" + indexFrame.getFramesetName(), null);
-                                                                t.setLink(indexFrame.getName());
-                                                                t.setSize((float) 25.0);
-                                                                t.setFamily("SansSerif");
-                                                                t.setFontStyle("Bold");
-                                                                t.setColor(Color.gray);
-                                                        }
-                                                }
                                         }
                                 }
                         }
                 }
+                
+                FrameIO.SaveFrame(profile);
+                
+                // Populate settings frameset
+                Settings.Init();
+                t = profile.addText(550, 100, "@Settings", null);
+                t.setSize((float) 25.0);
+                t.setFamily("SansSerif");
+                t.setFontStyle("Bold");
+                t.setColor(Color.gray);
+                Settings.generateSettingsTree(t);
                 
                 FrameIO.SaveFrame(profile);

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

@@ -62 +62 @@
         private static HashMap<String, PageDescriptor> _pages = new HashMap<String, PageDescriptor>();
 
+        private static boolean _init = false;
         public static void Init() {
+                if(_init) return;
+                _init = true;
                 try {
                         for(Class<?> clazz : PackageLoader.getClassesNew(SETTINGS_PACKAGE)) {
@@ -146 +149 @@
         }
         
-        public static Text generateSettingsTree() {
-                return generateSettingsTree("settings", DisplayIO.getCurrentFrame().createNewText("Settings"));
+        public static void generateSettingsTree(Text link) {
+                generateSettingsTree("settings", link);
         }
         
@@ -156 +159 @@
          * 
          */
-        private static Text generateSettingsTree(String page, Text text) {
-                Frame frame = FrameIO.CreateNewFrame(text);
+        private static void generateSettingsTree(String page, Text text) {
+                Frame frame = FrameIO.CreateFrame(text.getParentOrCurrentFrame().getFramesetName(), page, null);
                 text.setLink(frame.getName());
                 
@@ -196 +199 @@
                                 String value = "";
                                 if(s instanceof GenericSetting && ((GenericSetting) s).isPrimitive()) {
-                                        System.out.println("VALUE: " + ((GenericSetting) s).get());
                                         if(((GenericSetting) s).get() != null) {
                                                 value = ": " + ((GenericSetting) s).get();
@@ -235 +237 @@
                 
                 FrameIO.SaveFrame(frame);
-                return text;
         }
 }