diff options
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 29 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/featurebrowser/FormExample.java | 2 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/tests/book/FormExample.java | 5 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/ui/CustomLayout.java | 19 |
4 files changed, 39 insertions, 16 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 00e14bc487..d9e628294e 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -51,8 +51,16 @@ </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> @@ -603,6 +611,11 @@ </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> </servlet-mapping> @@ -629,6 +642,20 @@ <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 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. |