From: Marko Grönroos <magi@iki.fi>
Date: Tue, 30 Sep 2008 14:18:21 +0000 (+0000)
Subject: Reverted [5566]. Committed unwanted file when reverting [5565].
X-Git-Tag: 6.7.0.beta1~4050
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3724e19222e413aae5b24699323ad66c7bce98f2;p=vaadin-framework.git

Reverted [5566]. Committed unwanted file when reverting [5565].

svn changeset:5567/svn branch:trunk
---

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index d9e628294e..00e14bc487 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -51,16 +51,8 @@
     </init-param>
   </servlet>
   
-  <servlet>
-    <servlet-name>TestFeatureBrowser</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.automatedtests.featurebrowser.FeatureBrowser</param-value>
-    </init-param>
-  </servlet>
   
-  <servlet>
+ <servlet>
     <servlet-name>DemoTestBench</servlet-name>
     <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
     <init-param>
@@ -610,11 +602,6 @@
     <!-- portlet -->
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>TestFeatureBrowser</servlet-name>
-    <url-pattern>/TestFeatureBrowser/*</url-pattern>
-  </servlet-mapping>
-  
   <servlet-mapping>
     <servlet-name>BookTestServlet</servlet-name>
     <url-pattern>/book/*</url-pattern>
@@ -642,20 +629,6 @@
     <url-pattern>/WindowedDemos/*</url-pattern>
   </servlet-mapping>
 
-   <servlet>
-    <servlet-name>Forum434</servlet-name>
-    <servlet-class>com.itmill.toolkit.terminal.gwt.server.ApplicationServlet</servlet-class>
-    <init-param>
-      <param-name>application</param-name>
-      <param-value>com.itmill.toolkit.tests.book.MainClass</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>Forum434</servlet-name>
-    <url-pattern>/forum434/*</url-pattern>
-  </servlet-mapping>
-
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
     <welcome-file>index.html</welcome-file>
diff --git a/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java b/src/com/itmill/toolkit/demo/featurebrowser/FormExample.java
index 465e11f05d..0abf56fdf1 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("Commit", new Button.ClickListener() {
+        Button commit = new Button("CCommit", 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 2125888004..9db5466db9 100644
--- a/src/com/itmill/toolkit/tests/book/FormExample.java
+++ b/src/com/itmill/toolkit/tests/book/FormExample.java
@@ -109,6 +109,7 @@ 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() {
@@ -156,7 +157,7 @@ public class FormExample extends CustomComponent {
         final Form form = new Form();
 
         // Set form caption and description texts.
-        form.setCaption("Contact Information");
+        form.setCaption("Contsgsdgact 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.
@@ -201,6 +202,8 @@ 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 06ef2923ea..82ca404a13 100644
--- a/src/com/itmill/toolkit/ui/CustomLayout.java
+++ b/src/com/itmill/toolkit/ui/CustomLayout.java
@@ -15,24 +15,25 @@ import com.itmill.toolkit.terminal.PaintTarget;
 
 /**
  * <p>
- * A container component with freely designed layout and style. The container
+ * A container component with freely designed layout and style. The layout
  * consists of items with textually represented locations. Each item contains
- * 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
+ * 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
  * locations.
  * </p>
  * 
  * <p>
- * 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
+ * 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
  * create visual design for a web site as a custom layout: the visual design
- * could define locations for "menu", "body" and "title" for example. The layout
- * would then be implemented as XLS-template with for given style.
+ * would define locations for "menu", "body", and "title", for example. The layout
+ * would then be implemented as an XHTML template for each theme.
  * </p>
  * 
  * <p>
- * The default theme handles the styles that are not defined by just drawing the
- * subcomponents as in OrderedLayout.
+ * The default theme handles the styles that are not defined by drawing the
+ * subcomponents just as in OrderedLayout.
  * </p>
  * 
  * @author IT Mill Ltd.