Changeset 640

Timestamp:

12/18/13 12:09:33 (11 years ago)

Author:

jts21

Message:

Move check for field type up to the code that populates the map of fields, since there's no point in storing invalid fields. This also means the 'invalid field type' error message will never be reached, but there's no harm in leaving that in, if only as documentation

File:

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

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

@@ -50 +50 @@
                         // populate map of settings with fields
                         for(Field f : clazz.getFields()) {
+                                Class<?> type = f.getType();
+                                // only allow valid types
+                                if(type != String.class &&
+                                                type != Boolean.class && type != boolean.class &&
+                                                type != Integer.class && type != int.class &&
+                                                type != Double.class && type != double.class &&
+                                                type != Float.class && type != float.class) {
+                                        continue;
+                                }
                                 FieldSet fs = settings.get(f.getName().toLowerCase());
                                 if(fs == null) {
@@ -231 +240 @@
                                 Object value = "";
                                 if(fs.method == null && fs.field != null) {
-                                        Class<?> type = fs.field.getType();
-                                // only allow valid types
-                                if(type != String.class &&
-                                                type != Boolean.class && type != boolean.class &&
-                                                type != Integer.class && type != int.class &&
-                                                type != Double.class && type != double.class &&
-                                                type != Float.class && type != float.class) {
-                                        continue;
-                                }
                                 try {
                                         if(pd.hasDefault.contains(fs.field)) {