diff options
| author | Leif Åstrand <leif@vaadin.com> | 2015-01-16 15:11:09 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2015-01-16 16:21:16 +0200 |
| commit | 5db3ef4cc1c1b01d27b657ba80c431c07064ab39 (patch) | |
| tree | 05521ba244d1656b82cc331e3777786b1d83b04f /server/src/com/vaadin/ui/AbstractJavaScriptComponent.java | |
| parent | 836a396fcc38752f211fbccad7ddb455d7d24d16 (diff) | |
| parent | 911972c58b14deb847e807b3401ea08039d5b7a2 (diff) | |
| download | vaadin-framework-5db3ef4cc1c1b01d27b657ba80c431c07064ab39.tar.gz vaadin-framework-5db3ef4cc1c1b01d27b657ba80c431c07064ab39.zip | |
Merge remote-tracking branch 'origin/master' into grid
Change-Id: I0babb7cb93e773a9aab82243c1112d45b15bec78
Diffstat (limited to 'server/src/com/vaadin/ui/AbstractJavaScriptComponent.java')
| -rw-r--r-- | server/src/com/vaadin/ui/AbstractJavaScriptComponent.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java index f3cbf47b62..84023555bb 100644 --- a/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java +++ b/server/src/com/vaadin/ui/AbstractJavaScriptComponent.java @@ -119,8 +119,8 @@ import com.vaadin.shared.ui.JavaScriptComponentState; * <li>Java Dates are represented by JavaScript numbers containing the timestamp * </li> * <li>List, Set and all arrays in Java are represented by JavaScript arrays.</li> - * <li>Map<String, ?> in Java is represented by JavaScript object with fields - * corresponding to the map keys.</li> + * <li>Map<String, ?> in Java is represented by JavaScript object with + * fields corresponding to the map keys.</li> * <li>Any other Java Map is represented by a JavaScript array containing two * arrays, the first contains the keys and the second contains the values in the * same order.</li> |