Changeset 641 for trunk/src/org/expeditee/settings/UserSettings.java

Timestamp:

12/18/13 14:22:48 (11 years ago)

Author:

jts21

Message:

Generated settings frames now use capitalised setting names, and settings are generated/displayed in the order they were declared in code.
Settings with no value no longer have a ':' after their name (good for some things, however maybe we should be showing somehow that some settings can have a value set after a colon, and others use a frame linked from the setting item, and others just use the properties of the setting item?).
Password setting(s) now use the password widget.
Fixed some problems with settings that try to work without having a value set (SpellChecker, ColorWheels, HomeFrame).

File:

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

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

@@ -90 +90 @@
         public static String HomeFrame = null;
         public static void setHomeFrame(Text t) {
+                if(t.getText().indexOf(':') == -1 || !t.hasLink()) {
+                        t.setLink(FrameIO.LoadProfile(UserSettings.ProfileName).getName());
+                }
                 String first = FrameUtils.getLink(t, UserSettings.HomeFrame);
                 // do not use non-existant frames as the first frame
@@ -111 +114 @@
         }
         public static void setFramesetDir(Text t) {
+                if(t.getText().indexOf(':') == -1) {
+                        return;
+                }
                 String dir = null;
                 AttributeValuePair avp = new AttributeValuePair(t.getText());
@@ -126 +132 @@
         }
         public static void setImageDir(Text t) {
+                if(t.getText().indexOf(':') == -1) {
+                        return;
+                }
                 String dir = null;
                 AttributeValuePair avp = new AttributeValuePair(t.getText());
@@ -137 +146 @@
         
         public static void setLogDir(Text t) {
+                if(t.getText().indexOf(':') == -1) {
+                        return;
+                }
                 AttributeValuePair avp = new AttributeValuePair(t.getText());
                 if(avp.getValue().trim().length() != 0) {
@@ -177 +189 @@
          */
         public static void setColorWheel(Text t) {
-                Item.COLOR_WHEEL = FrameUtils.getColorWheel(t);
+                if(t.getChild() != null) Item.COLOR_WHEEL = FrameUtils.getColorWheel(t);
         }
         
         public static void setFillColorWheel(Text t) {
-                Item.FILL_COLOR_WHEEL = FrameUtils.getColorWheel(t);
+                if(t.getChild() != null) Item.FILL_COLOR_WHEEL = FrameUtils.getColorWheel(t);
         }
         
         public static void setBackgroundColorWheel(Text t) {
-                Frame.COLOR_WHEEL = FrameUtils.getColorWheel(t);
+                if(t.getChild() != null) Frame.COLOR_WHEEL = FrameUtils.getColorWheel(t);
         }
         
@@ -218 +230 @@
         
         public static void setSpellChecker(Text t) {
-                try {
-                        JSpellChecker.create();
-                } catch (FileNotFoundException e) {
-                        MessageBay.errorMessage("Could not find dictionary: "
-                                        + e.getMessage());
-                } catch (IOException e) {
-                        e.printStackTrace();
+                AttributeValuePair avp = new AttributeValuePair(t.getText());
+                if(avp.getBooleanValue()) {
+                try {
+                        JSpellChecker.create();
+                } catch (FileNotFoundException e) {
+                        MessageBay.errorMessage("Could not find dictionary: "
+                                        + e.getMessage());
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
                 }
         }
         public static void setSpelling(Text t) {
-                try {
-                JSpellChecker.create(t.getChild());
-        } catch (Exception e) {
-                e.printStackTrace();
-        }
+                if(t.hasLink()) {
+                try {
+                JSpellChecker.create(t.getChild());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+                }
         }