Declarative for DateFields (and related) with ISO8601 (#16313)

DesignAttributeHandler supports method names that contains some words in uppercase DesignAttributeHandler and other components now use extensible Formatter with Converters rather than static methods Change-Id: I9f68414bd4821f47ff37a26375091d154cae9a93
vaadin · Feb 3, 2015 · a508ed7 · a508ed7
1 parent 293b62a
commit a508ed7
Show file tree

Hide file tree

Showing 16 changed files with 1,445 additions and 366 deletions.
diff --git a/server/src/com/vaadin/ui/AbsoluteLayout.java b/server/src/com/vaadin/ui/AbsoluteLayout.java
@@ -759,8 +759,8 @@ public void writeDesign(Element design, DesignContext designContext) {
     private void writePositionAttribute(Node node, String key, String symbol,
             Float value) {
         if (value != null) {
-            String valueString = DesignAttributeHandler.formatFloat(value
+            String valueString = DesignAttributeHandler.getFormatter().format(
-                    .floatValue());
+                    value);
             node.attr(key, valueString + symbol);
         }
     }

diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -959,8 +959,8 @@ public void readDesign(Element design, DesignContext designContext) {
         }
         // handle immediate
         if (attr.hasKey("immediate")) {
-            setImmediate(DesignAttributeHandler.parseBoolean(attr
+            setImmediate(DesignAttributeHandler.getFormatter().parse(
-                    .get("immediate")));
+                    attr.get("immediate"), Boolean.class));
         }
 
         // handle locale
@@ -984,8 +984,8 @@ public void readDesign(Element design, DesignContext designContext) {
 
         // handle responsive
         if (attr.hasKey("responsive")) {
-            setResponsive(DesignAttributeHandler.parseBoolean(attr
+            setResponsive(DesignAttributeHandler.getFormatter().parse(
-                    .get("responsive")));
+                    attr.get("responsive"), Boolean.class));
         }
         // check for unsupported attributes
         Set<String> supported = new HashSet<String>();
@@ -1138,9 +1138,8 @@ private void writeSize(Attributes attributes, Component defaultInstance) {
                 } else if (widthAuto) {
                     attributes.put("width-auto", "true");
                 } else {
-                    String widthString = DesignAttributeHandler
+                    String widthString = DesignAttributeHandler.getFormatter()
-                            .formatFloat(getWidth())
+                            .format(getWidth()) + getWidthUnits().getSymbol();
-                            + getWidthUnits().getSymbol();
                     attributes.put("width", widthString);
 
                 }
@@ -1152,9 +1151,8 @@ private void writeSize(Attributes attributes, Component defaultInstance) {
                 } else if (heightAuto) {
                     attributes.put("height-auto", "true");
                 } else {
-                    String heightString = DesignAttributeHandler
+                    String heightString = DesignAttributeHandler.getFormatter()
-                            .formatFloat(getHeight())
+                            .format(getHeight()) + getHeightUnits().getSymbol();
-                            + getHeightUnits().getSymbol();
                     attributes.put("height", heightString);
                 }
             }

diff --git a/server/src/com/vaadin/ui/AbstractOrderedLayout.java b/server/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -563,8 +563,8 @@ public void writeDesign(Element design, DesignContext designContext) {
             if (expandRatio == 1.0f) {
                 childElement.attr(":expand", "");
             } else if (expandRatio > 0) {
-                childElement.attr(":expand",
+                childElement.attr(":expand", DesignAttributeHandler
-                        DesignAttributeHandler.formatFloat(expandRatio));
+                        .getFormatter().format(expandRatio));
             }
         }
     }

diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java
@@ -24,6 +24,9 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+import java.util.logging.Logger;
+
+import org.jsoup.nodes.Element;
 
 import com.vaadin.data.Property;
 import com.vaadin.data.Validator;
@@ -40,6 +43,8 @@
 import com.vaadin.shared.ui.datefield.DateFieldConstants;
 import com.vaadin.shared.ui.datefield.Resolution;
 import com.vaadin.shared.ui.datefield.TextualDateFieldState;
+import com.vaadin.ui.declarative.DesignAttributeHandler;
+import com.vaadin.ui.declarative.DesignContext;
 
 /**
  * <p>
@@ -1061,4 +1066,40 @@ public UnparsableDateString(String message) {
         }
 
     }
+
+    @Override
+    public void readDesign(Element design, DesignContext designContext) {
+        super.readDesign(design, designContext);
+        if (design.hasAttr("value") && !design.attr("value").isEmpty()) {
+            Date date = DesignAttributeHandler.getFormatter().parse(
+                    design.attr("value"), Date.class);
+            // formatting will return null if it cannot parse the string
+            if (date == null) {
+                Logger.getLogger(DateField.class.getName()).info(
+                        "cannot parse " + design.attr("value") + " as date");
+            }
+            this.setValue(date);
+        }
+    }
+
+    @Override
+    public void writeDesign(Element design, DesignContext designContext) {
+        super.writeDesign(design, designContext);
+        if (getValue() != null) {
+            design.attr("value",
+                    DesignAttributeHandler.getFormatter().format(getValue()));
+        }
+    }
+
+    /**
+     * Returns current date-out-of-range error message.
+     * 
+     * @see #setDateOutOfRangeMessage(String)
+     * @since 7.4
+     * @return Current error message for dates out of range.
+     */
+    public String getDateOutOfRangeMessage() {
+        return dateOutOfRangeMessage;
+    }
+
 }