diff options
| author | Artur <artur@vaadin.com> | 2017-02-22 12:29:03 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-02-22 12:29:03 +0200 |
| commit | 1718666cd6a0aac7273e12d5bad459dea9fe997c (patch) | |
| tree | 661c00ff327c055f89e05fc98f5bc92ccf60346b /server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java | |
| parent | 04a20bf66646bc10f219966ad18af8b7bd995c77 (diff) | |
| download | vaadin-framework-1718666cd6a0aac7273e12d5bad459dea9fe997c.tar.gz vaadin-framework-1718666cd6a0aac7273e12d5bad459dea9fe997c.zip | |
Make it possible to use an extended ComboBox in declarative files (#8651)
Diffstat (limited to 'server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java index 57bfde47fb..f40ef59028 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java @@ -176,8 +176,9 @@ public class DesignAttributeHandler implements Serializable { .getPropertyDescriptors()) { Method getter = descriptor.getReadMethod(); Method setter = descriptor.getWriteMethod(); - if (getter != null && setter != null && getFormatter() - .canConvert(descriptor.getPropertyType())) { + Class<?> propertyType = descriptor.getPropertyType(); + if (getter != null && setter != null && propertyType != null + && getFormatter().canConvert(propertyType)) { String attribute = toAttributeName(descriptor.getName()); entry.addAttribute(attribute, getter, setter); } |