merge master

1 files changed, 41 insertions, 0 deletions

diff --git a/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
new file mode 100644
index 0000000000..4399e0ece1
--- /dev/null
+++ b/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java
@@ -0,0 +1,41 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.shared.ui.customlayout;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.vaadin.shared.Connector;
+import com.vaadin.shared.ui.AbstractLayoutState;
+
+public class CustomLayoutState extends AbstractLayoutState {
+    Map<Connector, String> childLocations = new HashMap<Connector, String>();
+    private String templateContents;
+    private String templateName;
+
+    public String getTemplateContents() {
+        return templateContents;
+    }
+
+    public void setTemplateContents(String templateContents) {
+        this.templateContents = templateContents;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Map<Connector, String> getChildLocations() {
+        return childLocations;
+    }
+
+    public void setChildLocations(Map<Connector, String> childLocations) {
+        this.childLocations = childLocations;
+    }
+
+}
\ No newline at end of file