Changeset 790

Timestamp:

01/30/14 12:01:46 (10 years ago)

Author:

ngw8

Message:

Added support for setting (via the UI) color attributes from a hex or octal string (e.g. #FF00A3)

File:

• trunk/src/org/expeditee/io/Conversion.java (modified) (1 diff)

trunk/src/org/expeditee/io/Conversion.java

@@ -349 +349 @@
 
                         try {
-                                // Find the field and value of colorName
-                                Field[] fields = java.awt.Color.class.getFields();
-                                Field field = null;
-                                for (int i = 0; i < fields.length; i++) {
-                                        if (fields[i].getName().equalsIgnoreCase(value)) {
-                                                field = fields[i];
-                                                break;
+                                // Try to decode the string as a hex or octal color code
+                                return Color.decode(value);
+                        } catch (NumberFormatException nfe) {
+                                try {
+                                        // Try to find the field in the Color class with the same name as the given string
+                                        Field[] fields = java.awt.Color.class.getFields();
+                                        Field field = null;
+                                        for (int i = 0; i < fields.length; i++) {
+                                                if (fields[i].getName().equalsIgnoreCase(value)) {
+                                                        field = fields[i];
+                                                        break;
+                                                }
                                         }
+                                        return (Color) field.get(null);
+                                } catch (Exception e) {
+                                        return getColor(value, (Color) orig);
                                 }
-                                return (Color) field.get(null);
-                        } catch (Exception e) {
-                                return getColor(value, (Color) orig);
                         }
                 }