From 0649c0780d6ac0459ced2543d8fa3ec6da52325c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marko=20Gr=C3=B6nroos?= <magi@iki.fi>
Date: Tue, 30 Sep 2008 14:32:16 +0000
Subject: [PATCH] Reverted [5565] again. Had committed extra files.

svn changeset:5568/svn branch:trunk
---
 .../demo/featurebrowser/FormExample.java      |  2 +-
 .../toolkit/tests/book/FormExample.java       |  5 +----
 src/com/itmill/toolkit/ui/CustomLayout.java   | 19 +++++++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java b/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
index 0abf56fdf1..465e11f05d 100644
--- a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
+++ b/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
@@ -288,7 +288,7 @@ public class FormExample extends CustomComponent {
         ExpandLayout footer = new ExpandLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
 
         // The Commit button calls form.commit().
-        Button commit = new Button("CCommit", new Button.ClickListener() {
+        Button commit = new Button("Commit", new Button.ClickListener() {
             public void buttonClick(ClickEvent event) {
                 form.commit();
                 display.refresh();
diff --git a/src/com/itmill/toolkit/tests/book/FormExample.java b/src/com/itmill/toolkit/tests/book/FormExample.java
index 9db5466db9..2125888004 100644
--- a/src/com/itmill/toolkit/tests/book/FormExample.java
+++ b/src/com/itmill/toolkit/tests/book/FormExample.java
@@ -109,7 +109,6 @@ public class FormExample extends CustomComponent {
                 return new TextField("Street Address");
             
             if (pid.equals("postalCode")) {
-                // Postal code that must be 5 digits (10000-99999).
                 TextField field = new TextField("Postal Code");
                 field.setColumns(5);
                 Validator postalCodeValidator = new Validator() {
@@ -157,7 +156,7 @@ public class FormExample extends CustomComponent {
         final Form form = new Form();
 
         // Set form caption and description texts.
-        form.setCaption("Contsgsdgact Information");
+        form.setCaption("Contact Information");
         form.setDescription("Please enter valid name and address. Fields marked with * are required.");
 
         // Use custom field factory to create the fields in the form.
@@ -202,8 +201,6 @@ public class FormExample extends CustomComponent {
         // Add Commit and Discard controls to the form.
         ExpandLayout footer = new ExpandLayout(OrderedLayout.ORIENTATION_HORIZONTAL);
 
-        form.setValidationVisibleOnCommit(false);
-        form.setValidationVisible(false);
         // The Commit button calls form.commit().
         Button commit = new Button("Commit", form, "commit");
 
diff --git a/src/com/itmill/toolkit/ui/CustomLayout.java b/src/com/itmill/toolkit/ui/CustomLayout.java
index 82ca404a13..06ef2923ea 100644
--- a/src/com/itmill/toolkit/ui/CustomLayout.java
+++ b/src/com/itmill/toolkit/ui/CustomLayout.java
@@ -15,25 +15,24 @@ import com.itmill.toolkit.terminal.PaintTarget;
 
 /**
  * <p>
- * A container component with freely designed layout and style. The layout
+ * A container component with freely designed layout and style. The container
  * consists of items with textually represented locations. Each item contains
- * one sub-component, which can be any Toolkit component, such as a layout.
- * The adapter and theme are responsible for rendering the
- * layout with a given style by placing the items in the defined
+ * one sub-component. The adapter and theme are responsible for rendering the
+ * layout with given style by placing the items on the screen in defined
  * locations.
  * </p>
  * 
  * <p>
- * The placement of the locations is not fixed - different themes can define the
- * locations in a way that is suitable for them. One typical example would be to
+ * The definition of locations is not fixed - the each style can define its
+ * locations in a way that is suitable for it. One typical example would be to
  * create visual design for a web site as a custom layout: the visual design
- * would define locations for "menu", "body", and "title", for example. The layout
- * would then be implemented as an XHTML template for each theme.
+ * could define locations for "menu", "body" and "title" for example. The layout
+ * would then be implemented as XLS-template with for given style.
  * </p>
  * 
  * <p>
- * The default theme handles the styles that are not defined by drawing the
- * subcomponents just as in OrderedLayout.
+ * The default theme handles the styles that are not defined by just drawing the
+ * subcomponents as in OrderedLayout.
  * </p>
  * 
  * @author IT Mill Ltd.
-- 
2.39.5