diff options
| author | Artur Signell <artur@vaadin.com> | 2015-01-29 07:43:39 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-01-29 07:43:40 +0000 |
| commit | a681bf8f13163b67f55ec2d334f44f976d3eb161 (patch) | |
| tree | 857a4cc6ef8910db66e256da4256c21d778b6496 /server/src/com/vaadin/ui/AbstractJavaScriptComponent.java | |
| parent | 336299a558e74e7366482640c650716880886275 (diff) | |
| parent | e30b3136589799dc95049bcc87d4b7f7e707549e (diff) | |
| download | vaadin-framework-a681bf8f13163b67f55ec2d334f44f976d3eb161.tar.gz vaadin-framework-a681bf8f13163b67f55ec2d334f44f976d3eb161.zip | |
Merge "Merge branch 'origin/grid'"
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> |