Change declarative support to use new converters

Change-Id: I3bb2c106a4c4d8556f6f752867da1917e0d3c9a3

1 files changed, 4 insertions, 3 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 f6607c91e4..ba5c279ed1 100644
--- a/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
+++ b/server/src/main/java/com/vaadin/ui/declarative/DesignAttributeHandler.java
@@ -36,10 +36,10 @@ import org.jsoup.nodes.Attributes;
 import org.jsoup.nodes.Element;
 import org.jsoup.nodes.Node;
 
+import com.vaadin.data.util.converter.Converter;
 import com.vaadin.shared.ui.AlignmentInfo;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.Alignment;
-import com.vaadin.v7.data.util.converter.Converter;
 
 /**
  * Default attribute handler implementation used when parsing designs to
@@ -379,10 +379,11 @@ public class DesignAttributeHandler implements Serializable {
             // value is not null. How to represent null value in attributes?
             return "";
         }
-        Converter<String, Object> converter = getFormatter()
+        @SuppressWarnings("unchecked")
+        Converter<String, Object> converter = (Converter<String, Object>) getFormatter()
                 .findConverterFor(sourceType);
         if (converter != null) {
-            return converter.convertToPresentation(value, String.class, null);
+            return converter.convertToPresentation(value, null);
         } else {
             return value.toString();
         }