Changeset 5261

Timestamp:

08/25/08 11:15:55 (3 months ago)

Author:

artur.signell@…

Message:

Fixes #1975 - CustomLayout? template can be specified in java

Location:

trunk

Files:

• WebContent/ITMILL/themes/tests-tickets/layouts (added)
• WebContent/ITMILL/themes/tests-tickets/layouts/Ticket1975.html (added)
• src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java (modified) (4 diffs)
• src/com/itmill/toolkit/tests/tickets/Ticket1975.java (added)
• src/com/itmill/toolkit/ui/CustomLayout.java (modified) (5 diffs)

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/ICustomLayout.java

@@ -43 +43 @@
     private final HashMap widgetToCaptionWrapper = new HashMap();
 
-    /** Currently rendered style */
-    String currentTemplate;
+    /** Name of the currently rendered style */
+    String currentTemplateName;
 
     /** Unexecuted scripts loaded from the template */
@@ -53 +53 @@
 
     private ApplicationConnection client;
+
+    /** Has the template been loaded from contents passed in UIDL **/
+    private boolean hasTemplateContents = false;
 
     public ICustomLayout() {
@@ -172 +175 @@
     private void initializeHTML(UIDL uidl, ApplicationConnection client) {
 
+        final String newTemplateContents = uidl
+                .getStringAttribute("templateContents");
         final String newTemplate = uidl.getStringAttribute("template");
 
-        // Get the HTML-template from client
-        String template = client
-                .getResource("layouts/" + newTemplate + ".html");
-        if (template == null) {
-            template = "<em>Layout file layouts/"
-                    + newTemplate
-                    + ".html is missing. Components will be drawn for debug purposes.</em>";
-        } else {
-            currentTemplate = newTemplate;
+        currentTemplateName = null;
+        hasTemplateContents = false;
+
+        String template = "";
+        if (newTemplate != null) {
+            // Get the HTML-template from client
+            template = client.getResource("layouts/" + newTemplate + ".html");
+            if (template == null) {
+                template = "<em>Layout file layouts/"
+                        + newTemplate
+                        + ".html is missing. Components will be drawn for debug purposes.</em>";
+            } else {
+                currentTemplateName = newTemplate;
+            }
+        } else {
+            hasTemplateContents = true;
+            template = newTemplateContents;
         }
 
@@ -209 +222 @@
 
     private boolean hasTemplate() {
-        if (currentTemplate == null) {
+        if (currentTemplateName == null && !hasTemplateContents) {
             return false;
         } else {

trunk/src/com/itmill/toolkit/ui/CustomLayout.java

@@ -5 +5 @@
 package com.itmill.toolkit.ui;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -40 +43 @@
 public class CustomLayout extends AbstractLayout {
 
+    private static final int BUFFER_SIZE = 10000;
+
     /**
      * Custom layout slots containing the components.
@@ -45 +50 @@
     private final HashMap slots = new HashMap();
 
-    private String templateName;
-
-    /**
-     * Constructor for custom layout with given template name.
+    private String templateContents = null;
+
+    private String templateName = null;
+
+    /**
+     * Constructs a custom layout with the template given in the stream.
+     * 
+     * @param templateStream
+     *                Stream containing template data. Must be using UTF-8
+     *                encoding. To use a String as a template use for instance
+     *                new ByteArrayInputStream("<template>".getBytes()).
+     * @param streamLength
+     *                Length of the templateStream
+     * @throws IOException
+     */
+    public CustomLayout(InputStream templateStream) throws IOException {
+
+        InputStreamReader reader = new InputStreamReader(templateStream);
+        StringBuffer b = new StringBuffer(BUFFER_SIZE);
+
+        char[] cbuf = new char[BUFFER_SIZE];
+        int offset = 0;
+
+        while (true) {
+            int nrRead = reader.read(cbuf, offset, BUFFER_SIZE);
+            b.append(cbuf, 0, nrRead);
+            if (nrRead < BUFFER_SIZE) {
+                break;
+            }
+        }
+
+        templateContents = b.toString();
+    }
+
+    /**
+     * Constructor for custom layout with given template name. Template file is
+     * fetched from "<theme>/layout/<templateName>".
      */
     public CustomLayout(String template) {
@@ -154 +192 @@
         super.paintContent(target);
 
-        target.addAttribute("template", templateName);
+        if (templateName != null) {
+            target.addAttribute("template", templateName);
+        } else {
+            target.addAttribute("templateContents", templateContents);
+        }
         // Adds all items in all the locations
         for (final Iterator i = slots.keySet().iterator(); i.hasNext();) {
@@ -226 +268 @@
     public void setTemplateName(String templateName) {
         this.templateName = templateName;
+        templateContents = null;
         requestRepaint();
     }