From: Matti Tahvonen
Date: Tue, 9 Mar 2010 15:34:26 +0000 (+0000)
Subject: reverting changes committed by accident after epic eclipse/subclicpse fail
X-Git-Tag: 6.7.0.beta1~1971
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a30e24a9441cb955e4b294ec19fb9d2bb2923140;p=vaadin-framework.git
reverting changes committed by accident after epic eclipse/subclicpse fail
svn changeset:11716/svn branch:6.3
---
diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index 0baa0dd468..26495a3715 100644
--- a/src/com/vaadin/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -1,4 +1,4 @@
-/*
+/*
@ITMillApache2LicenseForJavaFiles@
*/
@@ -37,6 +37,8 @@ import com.vaadin.terminal.gwt.client.ui.VCustomLayout;
*
*
* @author IT Mill Ltd.
+ * @author Duy B. Vo (devduy@gmail.com)
* @version
* @VERSION@
* @since 3.0
@@ -56,6 +58,14 @@ public class CustomLayout extends AbstractLayout {
private String templateName = null;
+ /**
+ * Default constructor only used by subclasses because the subclasses are
+ * responsible for setting the appropriate fields.
+ */
+ protected CustomLayout() {
+ setWidth(100, UNITS_PERCENTAGE);
+ }
+
/**
* Constructs a custom layout with the template given in the stream.
*
@@ -68,10 +78,24 @@ public class CustomLayout extends AbstractLayout {
* @throws IOException
*/
public CustomLayout(InputStream templateStream) throws IOException {
+ this();
+ initTemplateContentsFromInputStream(templateStream);
+ }
+
+ /**
+ * Constructor for custom layout with given template name. Template file is
+ * fetched from "/layout/".
+ */
+ public CustomLayout(String template) {
+ this();
+ templateName = template;
+ }
+ protected void initTemplateContentsFromInputStream(
+ InputStream templateStream) throws IOException {
InputStreamReader reader = new InputStreamReader(templateStream,
"UTF-8");
- StringBuffer b = new StringBuffer(BUFFER_SIZE);
+ StringBuilder b = new StringBuilder(BUFFER_SIZE);
char[] cbuf = new char[BUFFER_SIZE];
int offset = 0;
@@ -85,16 +109,6 @@ public class CustomLayout extends AbstractLayout {
}
templateContents = b.toString();
- setWidth(100, UNITS_PERCENTAGE);
- }
-
- /**
- * Constructor for custom layout with given template name. Template file is
- * fetched from "/layout/".
- */
- public CustomLayout(String template) {
- templateName = template;
- setWidth(100, UNITS_PERCENTAGE);
}
/**
@@ -246,7 +260,9 @@ public class CustomLayout extends AbstractLayout {
*
* @param name
* template name
+ * @deprecated Use {@link #setTemplateName(String)} instead
*/
+ @Deprecated
@Override
public void setStyle(String name) {
setTemplateName(name);
@@ -257,6 +273,11 @@ public class CustomLayout extends AbstractLayout {
return templateName;
}
+ /** Get the contents of the template */
+ public String getTemplateContents() {
+ return templateContents;
+ }
+
/**
* Set the name of the template used to draw custom layout.
*
@@ -272,6 +293,17 @@ public class CustomLayout extends AbstractLayout {
requestRepaint();
}
+ /**
+ * Set the contents of the template used to draw the custom layout.
+ *
+ * @param templateContents
+ */
+ public void setTemplateContents(String templateContents) {
+ this.templateContents = templateContents;
+ templateName = null;
+ requestRepaint();
+ }
+
/**
* Although most layouts support margins, CustomLayout does not. The
* behaviour of this layout is determined almost completely by the actual