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

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/settings/Settings.java (modified) (11 diffs)

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

@@ -26 +26 @@
 
 import org.expeditee.gui.AttributeValuePair;
-import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameCreator;
@@ -32 +31 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
-import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.Password;
@@ -56 +54 @@
                         // populate map of settings
                         for(Field f : clazz.getFields()) {
-                                // only allow valid types
-                                if(! Setting.class.isAssignableFrom(f.getType())) {
-                                        continue;
-                                }
+                                // Only allow classes that inherit from Setting
+                                if(!Setting.class.isAssignableFrom(f.getType())) continue;
+                                
                                 try {
                                         Setting s = (Setting) f.get(null);
                         settings.put(f.getName().toLowerCase(), s);
-                        if(s instanceof VariableSetting) {
-                                settingsList.add((VariableSetting) s);
-                        }
+                        if (s instanceof VariableSetting) settingsList.add((VariableSetting) s);
                         orderedEntries.add(f.getName());
                 } catch (Exception e) {
@@ -71 +66 @@
                 }
                         }
+                        
                         Method m = null;
+                        
                         try {
                                 m = clazz.getMethod("onParsed", Text.class);
@@ -77 +74 @@
                                 // System.err.println(clazz.getName() + " has no onParsed(Text t) callback");
                         }
+                        
                         this.onParsed = m;
                 }
         }
+        
         private static HashMap<String, PageDescriptor> _pages = new HashMap<String, PageDescriptor>();
 
         private static boolean _init = false;
-        public static void Init() {
+        
+        public static void Init()
+        {
                 if(_init) return;
+                
                 _init = true;
+                
                 try {
                         for(Class<?> clazz : PackageLoader.getClassesNew(SETTINGS_PACKAGE)) {
                                 // Ignore this class since it's the controller
-                                if(clazz.equals(Settings.class)) {
-                                        continue;
-                                }
-                                String settingsPage = clazz.getPackage().getName().toLowerCase().substring(SETTINGS_PACKAGE_PARENT.length());
+                                if(clazz.equals(Settings.class)) continue;
+                                
+                                String settingsPageName = clazz.getPackage().getName().toLowerCase().substring(SETTINGS_PACKAGE_PARENT.length());
                                 // System.out.println(settingsPage + " : " + clazz.getName());
-                                _pages.put(settingsPage, new PageDescriptor(clazz));
+                                _pages.put(settingsPageName, new PageDescriptor(clazz));
                         }
 
@@ -100 +102 @@
                         e.printStackTrace();
                 }
-                FrameUtils.ParseProfile(FrameIO.LoadProfile(UserSettings.ProfileName.get()));
-        }
-        
-        /**
-         * Parses the settings tree, then resets any settings that were not set
-         */
-        public static void parseSettings(Text text) {
+        }
+        
+        /** Parses the settings tree, then resets any settings that were not set. */
+        public static void parseSettings(Text text)
+        {
                 List<VariableSetting> set = parseSettings(text, "");
                 List<VariableSetting> toDefault = new LinkedList<VariableSetting>();
-                for(PageDescriptor pd : _pages.values()) {
-                        toDefault.addAll(pd.settingsList);
-                }
+                
+                for(PageDescriptor pd : _pages.values()) toDefault.addAll(pd.settingsList);
+                
                 toDefault.removeAll(set);
+                
                 for(VariableSetting s : toDefault) {
                         try {
-                                // System.out.println("Resetting " + s.getTooltip());
                     s.reset();
-                    // System.out.println("Set " + f.getName() + " to default value " + f.get(null));
             } catch (Exception e) {
                     e.printStackTrace();
@@ -135 +134 @@
                 
                 List<VariableSetting> set = new LinkedList<VariableSetting>();
+                
                 Frame child = text.getChild();
-                if(child == null) {
-                        return set;
-                }
+                
+                if(child == null) return set;
+                
                 String settingsPage = prefix + text.getText().trim().toLowerCase().replaceAll("^@", "");
                 PageDescriptor pd = _pages.get(settingsPage);
-                if(pd == null) {
-                        return set;
-                }
+                if(pd == null) return set;
+                
                 try {
                         // set the fields
@@ -160 +159 @@
                                 }
                         }
+                        
                         // parse all the settings items on this page
                         for(Text t : items) {                           
@@ -186 +186 @@
                                                         }
                                                 }
-                                                // System.out.println(s);
-                                                if(s == null) {
-                                                        continue;
-                                                }
+
+                                                if(s == null) continue;
+                                                
                                                 if(validPages.size() > 1) {
                                                         StringBuffer warnMessage = new StringBuffer("Found multiple matching settings in the following settings subpages: ");
@@ -202 +201 @@
                                                 }
                                         }
-                                        if(s.setSetting(t) && s instanceof VariableSetting) {
-                                                set.add((VariableSetting) s);
-                                        }
+                                        
+                                        if(s.setSetting(t) && s instanceof VariableSetting) set.add((VariableSetting) s);
+                                        
                                 } catch (Exception e) {
                                         e.printStackTrace();
                                 }
                         }
+                        
                         // call the onParsed method if one exists
                         if(pd.onParsed != null) {
                                 pd.onParsed.invoke(null, text);
                         }
+                        
         } catch (Exception e) {
             e.printStackTrace();
             return set;
         }
+                
                 // if the page was a settings page, check if it has any subpages
                 for(Text t : child.getTextItems()) {
@@ -224 +226 @@
         }
         
-        public static void generateSettingsTree(Text link) {
+        public static void generateSettingsTree(Text link)
+        {
                 generateSettingsTree("settings", link);
         }
         
-        /**
-         * 
-         * Generates settings tree
-         * 
-         */
-        private static void generateSettingsTree(String page, Text text) {
+        /** 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);