diff options
| author | Matti Hosio <mhosio@vaadin.com> | 2014-12-10 17:01:33 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-10 16:06:34 +0000 |
| commit | 775276d4a987844fbbb88730f0eb11e285ae6e09 (patch) | |
| tree | 0e1b26980eb9f2307e480f264b4e1ca62756fb88 /server/src/com/vaadin/ui/declarative | |
| parent | a0e1fe4b61ff2b2bf1e35f983e1926b6fa694020 (diff) | |
| download | vaadin-framework-775276d4a987844fbbb88730f0eb11e285ae6e09.tar.gz vaadin-framework-775276d4a987844fbbb88730f0eb11e285ae6e09.zip | |
Declarative support for AbstractTextField (#7749)
Change-Id: Ice244cd73825bde44fe02cf3d4b53d4eff5a5c35
Diffstat (limited to 'server/src/com/vaadin/ui/declarative')
| -rw-r--r-- | server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java index 1beddf57de..2992771521 100644 --- a/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -403,6 +403,10 @@ public class DesignAttributeHandler implements Serializable { if (targetType == Resource.class) { return parseResource(value); } + if (Enum.class.isAssignableFrom(targetType)) { + return Enum.valueOf((Class<? extends Enum>) targetType, + value.toUpperCase()); + } return null; } @@ -519,8 +523,9 @@ public class DesignAttributeHandler implements Serializable { */ private static boolean isSupported(Class<?> valueType) { return valueType != null - && (valueType.isPrimitive() || supportedClasses - .contains(valueType)); + && (valueType.isPrimitive() + || supportedClasses.contains(valueType) || Enum.class + .isAssignableFrom(valueType)); } /** |