diff options
75 files changed, 168 insertions, 182 deletions
diff --git a/WebContent/VAADIN/readme.txt b/WebContent/VAADIN/readme.txt index ed7ab74ec4..926bc01a9e 100644 --- a/WebContent/VAADIN/readme.txt +++ b/WebContent/VAADIN/readme.txt @@ -9,7 +9,7 @@ Themes ------ Themes may be edited freely. They contain static images, CSS, -and layouts for Toolkit applications. +and layouts for Vaadin applications. --------------------------- Building Custom Widget Sets @@ -24,13 +24,13 @@ See build-widgetsets.xml, com.vaadin.demo.colorpicker package, and the Reference Manual for more information regarding widget sets. --------------------------- -IT Mill Toolkit Development +Vaadin Development --------------------------- -When developing the IT Mill Toolkit Library itself, change to "build" directory and +When developing the Vaadin Library itself, change to "build" directory and run "ant widgetsets" to compile all widgetsets or "ant widgetset-default", "ant-widgetset-reserver", or "ant widgetset-colorpicker" to compile individual widgetsets. You must have GWT installed under build/gwt, under the proper platform directory. -See http://dev.itmill.com/wiki/DevDocs/StartingDevelopment for instructions for -installing GWT and compiling widgetsets for Toolkit development. +See http://dev.vaadin.com/wiki/DevDocs/StartingDevelopment for instructions for +installing GWT and compiling widgetsets for Vaadin development. diff --git a/WebContent/VAADIN/themes/example/layouts/Contact.html b/WebContent/VAADIN/themes/example/layouts/Contact.html index a37425078c..8197923b81 100644 --- a/WebContent/VAADIN/themes/example/layouts/Contact.html +++ b/WebContent/VAADIN/themes/example/layouts/Contact.html @@ -9,7 +9,7 @@ e-mail. <h3>Report a Bug</h3> <p> -If you have found an issue with IT Mill Toolkit, demo applications or +If you have found an issue with Vaadin, demo applications or documentation, please report it to us. Fill out the following form to send us any relevant information about the issue. Click here diff --git a/WebContent/VAADIN/themes/example/layouts/Developers.html b/WebContent/VAADIN/themes/example/layouts/Developers.html index 50e054a4f4..bc74566c63 100644 --- a/WebContent/VAADIN/themes/example/layouts/Developers.html +++ b/WebContent/VAADIN/themes/example/layouts/Developers.html @@ -2,7 +2,7 @@ <h3>Developers</h3> <p> -This section contains information for developers using IT Mill Toolkit +This section contains information for developers using Vaadin to create Java web applications. </p> diff --git a/WebContent/VAADIN/themes/example/layouts/News.html b/WebContent/VAADIN/themes/example/layouts/News.html index f6ab7c7f7f..0ac582cfbe 100644 --- a/WebContent/VAADIN/themes/example/layouts/News.html +++ b/WebContent/VAADIN/themes/example/layouts/News.html @@ -35,6 +35,7 @@ other software development services and outsourcing services. <p> In late 2006 IT Mill ensured funding of the new generation of -Millstone. IT Mill Toolkit was released in early 2007. +Millstone. IT Mill Toolkit was released in early 2007 and renamed +Vaadin in 2009. </p> diff --git a/WebContent/VAADIN/themes/example/layouts/Products.html b/WebContent/VAADIN/themes/example/layouts/Products.html index 1b9b74c128..839ebf8e0c 100644 --- a/WebContent/VAADIN/themes/example/layouts/Products.html +++ b/WebContent/VAADIN/themes/example/layouts/Products.html @@ -1,5 +1,5 @@ -<h3>Top 5 reasons to choose IT Mill Toolkit</h3> +<h3>Top 5 reasons to choose Vaadin</h3> <p> 1. High compatibility with web browsers and application servers diff --git a/WebContent/VAADIN/themes/example/layouts/Welcome.html b/WebContent/VAADIN/themes/example/layouts/Welcome.html index 964753da5b..05abef5f11 100644 --- a/WebContent/VAADIN/themes/example/layouts/Welcome.html +++ b/WebContent/VAADIN/themes/example/layouts/Welcome.html @@ -5,15 +5,15 @@ IT Mill is a specialist in enterprise web user interface design and technology. We offer a variety of products and services for enterprise application user interface design, -analysis and -implementation. Our -flagship product is IT Mill Toolkit - a server-side component -framework for Java EE. IT Mill Toolkit enables creation of highly -usable browser applications in real Java. +flagship product is Vaadin - a server-side component framework for +Java EE. Vaadin enables creation of highly usable browser applications +in real Java. </p> <p> -IT Mill Toolkit is a web user interface framework for developing -high-quality web applications for enterprise and professional use. By -using standard Java tools and the enterprise environment (Java EE - +Vaadin is a web user interface framework for developing high-quality +web applications for enterprise and professional use. By using +standard Java tools and the enterprise environment (Java EE - formerly J2EE) we have created the most elegant and complete architecture for developing user interfaces for web business applications - for your benefit. diff --git a/WebContent/statictestfiles/ticket2095_popup.html b/WebContent/statictestfiles/ticket2095_popup.html index 863b35ad4f..b95dff7ba7 100644 --- a/WebContent/statictestfiles/ticket2095_popup.html +++ b/WebContent/statictestfiles/ticket2095_popup.html @@ -15,7 +15,7 @@ function setTarget() { </p> <form action="http://www.google.fi/search"> -<input type="text" name="q" value="it mill toolkit" /> +<input type="text" name="q" value="vaadin" /> <input type="submit" value="Google!"/> </form> diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 1c4cdd40d3..3cab4a2054 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -34,29 +34,29 @@ import com.vaadin.ui.Window; /** * <p> - * Base class required for all IT Mill Toolkit applications. This class provides - * all the basic services required by the toolkit. These services allow external - * discovery and manipulation of the user, {@link com.vaadin.ui.Window - * windows} and themes, and starting and stopping the application. + * Base class required for all Vaadin applications. This class provides all the + * basic services required by the toolkit. These services allow external + * discovery and manipulation of the user, {@link com.vaadin.ui.Window windows} + * and themes, and starting and stopping the application. * </p> * * <p> - * As mentioned, all IT Mill Toolkit applications must inherit this class. - * However, this is almost all of what one needs to do to create a fully - * functional application. The only thing a class inheriting the - * <code>Application</code> needs to do is implement the <code>init</code> - * method where it creates the windows it needs to perform its function. Note - * that all applications must have at least one window: the main window. The - * first unnamed window constructed by an application automatically becomes the - * main window which behaves just like other windows with one exception: when - * accessing windows using URLs the main window corresponds to the application - * URL whereas other windows correspond to a URL gotten by catenating the - * window's name to the application URL. + * As mentioned, all Vaadin applications must inherit this class. However, this + * is almost all of what one needs to do to create a fully functional + * application. The only thing a class inheriting the <code>Application</code> + * needs to do is implement the <code>init</code> method where it creates the + * windows it needs to perform its function. Note that all applications must + * have at least one window: the main window. The first unnamed window + * constructed by an application automatically becomes the main window which + * behaves just like other windows with one exception: when accessing windows + * using URLs the main window corresponds to the application URL whereas other + * windows correspond to a URL gotten by catenating the window's name to the + * application URL. * </p> * * <p> - * See the class <code>com.vaadin.demo.HelloWorld</code> for a simple - * example of a fully working application. + * See the class <code>com.vaadin.demo.HelloWorld</code> for a simple example of + * a fully working application. * </p> * * <p> @@ -76,8 +76,8 @@ import com.vaadin.ui.Window; * found out, the window itself is queried for a preferred theme. If the window * does not prefer a specific theme, the application containing the window is * queried. If neither the application prefers a theme, the default theme for - * the {@link com.vaadin.terminal.Terminal terminal} is used. The - * terminal always defines a default theme. + * the {@link com.vaadin.terminal.Terminal terminal} is used. The terminal + * always defines a default theme. * </p> * * @author IT Mill Ltd. diff --git a/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java index 0cd5ea05ec..aabfe41b20 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java @@ -104,21 +104,21 @@ public class ButtonExample extends CustomComponent implements + " server-initiated window opening.");
desc.setContentMode(Label.CONTENT_XHTML);
links.addComponent(desc);
- Link l = new Link("IT Mill home", new ExternalResource(
- "http://www.itmill.com"));
+ Link l = new Link("Vaadin home", new ExternalResource(
+ "http://www.vaadin.com"));
l.setDebugId("Link1");
l.setDescription("Link without target name, opens in this window");
links.addComponent(l);
- l = new Link("IT Mill home (new window)", new ExternalResource(
- "http://www.itmill.com"));
+ l = new Link("Vaadin home (new window)", new ExternalResource(
+ "http://www.vaadin.com"));
l.setDebugId("Link2");
l.setTargetName("_blank");
l.setDescription("Link with target name, opens in new window");
links.addComponent(l);
- l = new Link("IT Mill home (new window, less decor)",
- new ExternalResource("http://www.itmill.com"));
+ l = new Link("Vaadin home (new window, less decor)",
+ new ExternalResource("http://www.vaadin.com"));
l.setDebugId("Link3");
l.setTargetName("_blank");
l.setTargetBorder(Link.TARGET_BORDER_MINIMAL);
@@ -127,8 +127,8 @@ public class ButtonExample extends CustomComponent implements .setDescription("Link with target name and BORDER_MINIMAL, opens in new window with less decor");
links.addComponent(l);
- l = new Link("IT Mill home (new 200x200 window, no decor, icon)",
- new ExternalResource("http://www.itmill.com"), "_blank", 200,
+ l = new Link("Vaadin home (new 200x200 window, no decor, icon)",
+ new ExternalResource("http://www.vaadin.com"), "_blank", 200,
200, Link.TARGET_BORDER_NONE);
l.setDebugId("Link4");
l.setTargetName("_blank");
diff --git a/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java index a62e120f46..2ecf60ecdb 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java @@ -26,16 +26,14 @@ public class EmbeddedBrowserExample extends VerticalLayout implements Select.ValueChangeListener { // Default URL to open. - private static final String DEFAULT_URL = "http://www.itmill.com/index_itmill_toolkit.htm"; + private static final String DEFAULT_URL = "http://www.vaadin.com/"; // The embedded page Embedded emb = new Embedded(); public EmbeddedBrowserExample() { - this(new String[] { DEFAULT_URL, - "http://www.itmill.com/index_developers.htm", - "http://toolkit.itmill.com/demo/doc/api/", - "http://www.itmill.com/manual/index.html" }); + this(new String[] { DEFAULT_URL, "http://www.vaadin.com/learn", + "http://www.vaadin.com/api", "http://www.vaadin.com/book" }); } public EmbeddedBrowserExample(String[] urls) { @@ -81,7 +79,7 @@ public class EmbeddedBrowserExample extends VerticalLayout implements } catch (MalformedURLException e) { getWindow().showNotification("Invalid address", - e.getMessage() + " (example: http://www.itmill.com)", + e.getMessage() + " (example: http://www.vaadin.com)", Notification.TYPE_WARNING_MESSAGE); } diff --git a/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java index bc3983aea2..275d42efb6 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java +++ b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java @@ -109,8 +109,7 @@ public class FeatureBrowser extends com.vaadin.Application implements // Windowing { "Misc", "Windowing", "About windowing", WindowingExample.class }, // JavaScript API - { "Misc", "JavaScript API", - "JavaScript to IT Mill Toolkit communication", + { "Misc", "JavaScript API", "JavaScript to Vaadin communication", JavaScriptAPIExample.class }, // END }; @@ -122,7 +121,7 @@ public class FeatureBrowser extends com.vaadin.Application implements setTheme("example"); // Create new window for the application and give the window a visible. - final Window main = new Window("IT Mill Toolkit 5"); + final Window main = new Window("Vaadin 6"); main.setDebugId("mainWindow"); // set as main window setMainWindow(main); @@ -273,8 +272,8 @@ public class FeatureBrowser extends com.vaadin.Application implements exp.setExpandRatio(ts, 1); final Label status = new Label( - "<a href=\"http://www.itmill.com/developers/\">Developer Area</a>" - + " | <a href=\"http://www.itmill.com/documentation/\">Documentation</a>"); + "<a href=\"http://www.vaadin.com/learn\">30 Seconds to Vaadin</a>" + + " | <a href=\"http://www.vaadin.com/book\">Book of Vaadin</a>"); status.setContentMode(Label.CONTENT_XHTML); exp.addComponent(status); exp.setComponentAlignment(status, Alignment.MIDDLE_RIGHT); diff --git a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java index 5956db9853..21e49ce320 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button.ClickEvent; */
public class JavaScriptAPIExample extends CustomComponent {
- public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:itmill.forceSync();</A>";
+ public static final String txt = "<p>For advanced client side programmers Vaadin offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:vaadin.forceSync();</A>";
private final VerticalLayout main;
private final Label l;
diff --git a/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java index 0fb21b2200..84c16e3a26 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java @@ -21,7 +21,7 @@ public class RichTextExample extends CustomComponent { public static final String txt = "<h1>RichText editor example</h1>"
+ "To edit this text, press the <b>Edit</b> button below."
+ "<br/>"
- + "See the <A href=\"http://www.itmill.com/documentation/itmill-toolkit-5-reference-manual/\">manual</a> "
+ + "See the <A href=\"http://www.vaadin.com/book\">Book of Vaadin</a> "
+ "for more information.";
private final VerticalLayout main;
diff --git a/src/com/vaadin/automatedtests/util/RandomComponents.java b/src/com/vaadin/automatedtests/util/RandomComponents.java index 8ddafaf62b..46446d8f3b 100644 --- a/src/com/vaadin/automatedtests/util/RandomComponents.java +++ b/src/com/vaadin/automatedtests/util/RandomComponents.java @@ -165,7 +165,7 @@ public class RandomComponents implements Serializable { break; case 4: // Link - result = new Link("", new ExternalResource("http://www.itmill.com")); + result = new Link("", new ExternalResource("http://www.vaadin.com")); result.setCaption("Link component " + caption); break; case 5: diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java index 9ce00697a2..617fe93e14 100644 --- a/src/com/vaadin/data/util/IndexedContainer.java +++ b/src/com/vaadin/data/util/IndexedContainer.java @@ -1018,7 +1018,9 @@ public class IndexedContainer implements Container.Indexed, /* * A class implementing the com.vaadin.data.Item interface to be contained - * in the list. @author IT Mill Ltd. + * in the list. + * + * @author IT Mill Ltd. * * @version @VERSION@ * diff --git a/src/com/vaadin/demo/ToolkitTunesLayout.java b/src/com/vaadin/demo/ToolkitTunesLayout.java index 4951eb2105..c3615e934c 100644 --- a/src/com/vaadin/demo/ToolkitTunesLayout.java +++ b/src/com/vaadin/demo/ToolkitTunesLayout.java @@ -46,7 +46,7 @@ public class ToolkitTunesLayout extends Application { root .showNotification( - "This is an example of how you can do layouts in IT Mill Toolkit.<br/>It is not a working sound player.", + "This is an example of how you can do layouts in Vaadin.<br/>It is not a working sound player.", Notification.TYPE_HUMANIZED_MESSAGE); // Our root window contains one VerticalLayout by default, let's make diff --git a/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java b/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java index c9bbedbd66..fc37e6971a 100644 --- a/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java +++ b/src/com/vaadin/demo/colorpicker/gwt/client/ui/GwtColorPicker.java @@ -15,7 +15,7 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.Widget; /** - * A regular GWT component without integration with IT Mill Toolkit. + * A regular GWT component without integration with Vaadin. */ public class GwtColorPicker extends Composite implements ClickListener { diff --git a/src/com/vaadin/demo/colorpicker/gwt/client/ui/VColorPicker.java b/src/com/vaadin/demo/colorpicker/gwt/client/ui/VColorPicker.java index 7b90653c6a..e225dbe268 100644 --- a/src/com/vaadin/demo/colorpicker/gwt/client/ui/VColorPicker.java +++ b/src/com/vaadin/demo/colorpicker/gwt/client/ui/VColorPicker.java @@ -21,7 +21,7 @@ public class VColorPicker extends GwtColorPicker implements Paintable { /** * The constructor should first call super() to initialize the component and - * then handle any initialization relevant to IT Mill Toolkit. + * then handle any initialization relevant to Vaadin. */ public VColorPicker() { // The superclass has a lot of relevant initialization diff --git a/src/com/vaadin/demo/featurebrowser/ButtonExample.java b/src/com/vaadin/demo/featurebrowser/ButtonExample.java index 66a22ad657..d0e40363bf 100644 --- a/src/com/vaadin/demo/featurebrowser/ButtonExample.java +++ b/src/com/vaadin/demo/featurebrowser/ButtonExample.java @@ -96,19 +96,19 @@ public class ButtonExample extends CustomComponent implements + " server-initiated window opening.");
desc.setContentMode(Label.CONTENT_XHTML);
links.addComponent(desc);
- Link l = new Link("IT Mill home", new ExternalResource(
- "http://www.itmill.com"));
+ Link l = new Link("Vaadin home", new ExternalResource(
+ "http://www.vaadin.com"));
l.setDescription("Link without target name, opens in this window");
links.addComponent(l);
- l = new Link("IT Mill home (new window)", new ExternalResource(
- "http://www.itmill.com"));
+ l = new Link("Vaadin home (new window)", new ExternalResource(
+ "http://www.vaadin.com"));
l.setTargetName("_blank");
l.setDescription("Link with target name, opens in new window");
links.addComponent(l);
- l = new Link("IT Mill home (new window, less decor)",
- new ExternalResource("http://www.itmill.com"));
+ l = new Link("Vaadin home (new window, less decor)",
+ new ExternalResource("http://www.vaadin.com"));
l.setTargetName("_blank");
l.setTargetBorder(Link.TARGET_BORDER_MINIMAL);
l.setTargetName("_blank");
@@ -116,8 +116,8 @@ public class ButtonExample extends CustomComponent implements .setDescription("Link with target name and BORDER_MINIMAL, opens in new window with less decor");
links.addComponent(l);
- l = new Link("IT Mill home (new 200x200 window, no decor, icon)",
- new ExternalResource("http://www.itmill.com"), "_blank", 200,
+ l = new Link("Vaadin home (new 200x200 window, no decor, icon)",
+ new ExternalResource("http://www.vaadin.com"), "_blank", 200,
200, Link.TARGET_BORDER_NONE);
l.setTargetName("_blank");
l
diff --git a/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java b/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java index 64800199c7..5093a12d32 100644 --- a/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java +++ b/src/com/vaadin/demo/featurebrowser/EmbeddedBrowserExample.java @@ -25,16 +25,14 @@ public class EmbeddedBrowserExample extends VerticalLayout implements Select.ValueChangeListener { // Default URL to open. - private static final String DEFAULT_URL = "http://www.itmill.com/index_itmill_toolkit.htm"; + private static final String DEFAULT_URL = "http://www.vaadin.com/"; // The embedded page Embedded emb = new Embedded(); public EmbeddedBrowserExample() { - this(new String[] { DEFAULT_URL, - "http://www.itmill.com/index_developers.htm", - "http://toolkit.itmill.com/demo/doc/api/", - "http://www.itmill.com/manual/index.html" }); + this(new String[] { DEFAULT_URL, "http://www.vaadin.com/learn", + "http://www.vaadin.com/api", "http://www.vaadin.com/book" }); } public EmbeddedBrowserExample(String[] urls) { @@ -80,7 +78,7 @@ public class EmbeddedBrowserExample extends VerticalLayout implements } catch (MalformedURLException e) { getWindow().showNotification("Invalid address", - e.getMessage() + " (example: http://www.itmill.com)", + e.getMessage() + " (example: http://www.vaadin.com)", Notification.TYPE_WARNING_MESSAGE); } diff --git a/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java b/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java index 5a583f3724..1b06f43a5d 100644 --- a/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java +++ b/src/com/vaadin/demo/featurebrowser/FeatureBrowser.java @@ -107,8 +107,7 @@ public class FeatureBrowser extends com.vaadin.Application implements // Windowing { "Misc", "Windowing", "About windowing", WindowingExample.class }, // JavaScript API - { "Misc", "JavaScript API", - "JavaScript to IT Mill Toolkit communication", + { "Misc", "JavaScript API", "JavaScript to Vaadin communication", JavaScriptAPIExample.class }, // END }; @@ -120,7 +119,7 @@ public class FeatureBrowser extends com.vaadin.Application implements setTheme("example"); // Create new window for the application and give the window a visible. - final Window main = new Window("IT Mill Toolkit 5"); + final Window main = new Window("Vaadin 6"); // set as main window setMainWindow(main); @@ -268,8 +267,8 @@ public class FeatureBrowser extends com.vaadin.Application implements exp.setExpandRatio(ts, 1); final Label status = new Label( - "<a href=\"http://www.itmill.com/developers/\">Developer Area</a>" - + " | <a href=\"http://www.itmill.com/documentation/\">Documentation</a>"); + "<a href=\"http://www.vaadin.com/learn\">30 Seconds to Vaadin</a>" + + " | <a href=\"http://www.vaadin.com/book\">Book of Vaadin</a>"); status.setContentMode(Label.CONTENT_XHTML); exp.addComponent(status); exp.setComponentAlignment(status, Alignment.MIDDLE_RIGHT); diff --git a/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java index 42f07648d6..06b3815d9a 100644 --- a/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java +++ b/src/com/vaadin/demo/featurebrowser/JavaScriptAPIExample.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button.ClickEvent; */
public class JavaScriptAPIExample extends CustomComponent {
- public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:itmill.forceSync();</A>";
+ public static final String txt = "<p>For advanced client side programmers Vaadin offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:vaadin.forceSync();</A>";
private final VerticalLayout main;
private final Label l;
diff --git a/src/com/vaadin/demo/featurebrowser/RichTextExample.java b/src/com/vaadin/demo/featurebrowser/RichTextExample.java index 475f128e7a..d3f4315830 100644 --- a/src/com/vaadin/demo/featurebrowser/RichTextExample.java +++ b/src/com/vaadin/demo/featurebrowser/RichTextExample.java @@ -21,7 +21,7 @@ public class RichTextExample extends CustomComponent { public static final String txt = "<h1>RichText editor example</h1>"
+ "To edit this text, press the <b>Edit</b> button below."
+ "<br/>"
- + "See the <A href=\"http://www.itmill.com/documentation/itmill-toolkit-5-reference-manual/\">manual</a> "
+ + "See the <A href=\"http://www.vaadin.com/book\">Book of Vaadin</a> "
+ "for more information.";
private final VerticalLayout main;
diff --git a/src/com/vaadin/demo/package.html b/src/com/vaadin/demo/package.html index d9bb6824f7..0a6d902e31 100644 --- a/src/com/vaadin/demo/package.html +++ b/src/com/vaadin/demo/package.html @@ -5,7 +5,7 @@ <body bgcolor="white"> -<p>Provides several fully functional IT Mill Toolkit example applications. These +<p>Provides several fully functional Vaadin example applications. These highlight certain aspects of the toolkit and how it can be used to produce simple, elegant yet powerful user interface driven applications.</p> @@ -15,7 +15,7 @@ applications.</p> text "Hello, World!" on the screen.</li> <li><strong>Calc</strong> implements a calculator application which demonstrates how to build a bit more complicated user interface and how the -application can interact with the usern through that interface.</li> +application can interact with the user through that interface.</li> </ul> </body> diff --git a/src/com/vaadin/demo/reservation/SampleDB.java b/src/com/vaadin/demo/reservation/SampleDB.java index 225d4c767b..0111884f09 100644 --- a/src/com/vaadin/demo/reservation/SampleDB.java +++ b/src/com/vaadin/demo/reservation/SampleDB.java @@ -546,7 +546,7 @@ public class SampleDB { try { final PreparedStatement stmt = connection.prepareStatement(q); stmt.setString(1, "Demo User"); - stmt.setString(2, "demo.user@itmill.com"); + stmt.setString(2, "demo.user@vaadin.com"); stmt.setString(3, "demo"); stmt.execute(); } catch (final SQLException e) { diff --git a/src/com/vaadin/demo/sampler/APIResource.java b/src/com/vaadin/demo/sampler/APIResource.java index 11024a5ebf..4d1bb2514a 100644 --- a/src/com/vaadin/demo/sampler/APIResource.java +++ b/src/com/vaadin/demo/sampler/APIResource.java @@ -8,7 +8,7 @@ package com.vaadin.demo.sampler; */ public class APIResource extends NamedExternalResource { - private static final String VAADIN_BASE = "http://toolkit.itmill.com/demo/doc/api/"; + private static final String VAADIN_BASE = "http://www.vaadin.com/api"; private static final String JAVA_BASE = "http://java.sun.com/javase/6/docs/api/"; private static final String SERVLET_BASE = "http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2"; private static final String PORTLET_BASE = "http://developers.sun.com/docs/jscreator/apis/portlet"; diff --git a/src/com/vaadin/demo/sampler/Feature.java b/src/com/vaadin/demo/sampler/Feature.java index e62951b340..3a517b8b15 100644 --- a/src/com/vaadin/demo/sampler/Feature.java +++ b/src/com/vaadin/demo/sampler/Feature.java @@ -67,7 +67,7 @@ abstract public class Feature implements Serializable { /** * Gets related API resources, i.e links to javadoc of used classes. * <p> - * Good candidates are IT Mill classes being demoed in the example, or other + * Good candidates are Vaadin classes being demoed in the example, or other * classes playing an important role in the example. * </p> * <p> diff --git a/src/com/vaadin/demo/sampler/features/commons/IconsExample.java b/src/com/vaadin/demo/sampler/features/commons/IconsExample.java index 39d31dbfcf..84cb25d8e4 100644 --- a/src/com/vaadin/demo/sampler/features/commons/IconsExample.java +++ b/src/com/vaadin/demo/sampler/features/commons/IconsExample.java @@ -28,20 +28,20 @@ public class IconsExample extends VerticalLayout { Panel p = new Panel("Handy links"); p.setIcon(new ThemeResource("icons/icon_info.gif")); addComponent(p); - Link lnk = new Link("http://www.itmill.com", new ExternalResource( - "http://www.itmill.com")); + Link lnk = new Link("http://www.vaadin.com", new ExternalResource( + "http://www.vaadin.com")); lnk.setIcon(new ThemeResource("icons/icon_world.gif")); p.addComponent(lnk); - lnk = new Link("http://www.itmill.com/developers/", - new ExternalResource("http://www.itmill.com/developers/")); + lnk = new Link("http://www.vaadin.com/learn", new ExternalResource( + "http://www.vaadin.com/learn")); lnk.setIcon(new ThemeResource("icons/icon_world.gif")); p.addComponent(lnk); - lnk = new Link("http://dev.itmill.com/", new ExternalResource( - "http://dev.itmill.com/")); + lnk = new Link("http://dev.vaadin.com/", new ExternalResource( + "http://dev.vaadin.com/")); lnk.setIcon(new ThemeResource("icons/icon_world.gif")); p.addComponent(lnk); - lnk = new Link("http://forum.itmill.com", new ExternalResource( - "http://forum.itmill.com")); + lnk = new Link("http://www.vaadin.com/forum", new ExternalResource( + "http://www.vaadin.com/forum")); lnk.setIcon(new ThemeResource("icons/icon_world.gif")); p.addComponent(lnk); diff --git a/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java index d0dfb262bf..5be844cc7f 100644 --- a/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java +++ b/src/com/vaadin/demo/tutorial/addressbook/data/PersonContainer.java @@ -68,7 +68,7 @@ public class PersonContainer extends BeanItemContainer<Person> implements p.setLastName(lnames[r.nextInt(lnames.length)]); p.setCity(cities[r.nextInt(cities.length)]); p.setEmail(p.getFirstName().toLowerCase() + "." - + p.getLastName().toLowerCase() + "@itmill.com"); + + p.getLastName().toLowerCase() + "@vaadin.com"); p.setPhoneNumber("+358 02 555 " + r.nextInt(10) + r.nextInt(10) + r.nextInt(10) + r.nextInt(10)); int n = r.nextInt(100000); diff --git a/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java index 17a553aadc..cf7d6949bb 100644 --- a/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java +++ b/src/com/vaadin/demo/tutorial/addressbook/ui/HelpWindow.java @@ -6,7 +6,7 @@ import com.vaadin.ui.Window; public class HelpWindow extends Window { private static final String HELP_HTML_SNIPPET = "This is " + "an application built during <strong><a href=\"" - + "http://dev.itmill.com/\">Toolkit</a></strong> " + + "http://dev.vaadin.com/\">Vaadin</a></strong> " + "tutorial. Hopefully it don't need any real help."; public HelpWindow() { diff --git a/src/com/vaadin/event/package.html b/src/com/vaadin/event/package.html index b44626125d..2e7e17b892 100644 --- a/src/com/vaadin/event/package.html +++ b/src/com/vaadin/event/package.html @@ -10,7 +10,7 @@ <p>Provides classes and interfaces for the inheritable event model. The model supports inheritable events and a flexible way of registering and unregistering event listeners. It's a fundamental building -block of the IT Mill Toolkit, and as it is included in +block of Vaadin, and as it is included in {@link com.vaadin.ui.AbstractComponent}, all UI components automatically support it.</p> diff --git a/src/com/vaadin/package.html b/src/com/vaadin/package.html index de2b5233b6..5a2defa80b 100644 --- a/src/com/vaadin/package.html +++ b/src/com/vaadin/package.html @@ -5,14 +5,14 @@ <body bgcolor="white"> -<p>This package is the base of the IT Mill Toolkit. The base package -contains the Application class, the starting point of any aplication that uses IT Mill Toolkit. +<p>This package is the base of Vaadin. The base package +contains the Application class, the starting point of any aplication that uses Vaadin. The sub-packages from this point contain application components and utilities. </p> <h2>Package Specification</h2> - <b>IT Mill Toolkit is composed of the following packages:</b> + <b>Vaadin is composed of the following packages:</b> <dl> <dt>com.vaadin.data</dt> <dd>A library of interfaces for transparently binding UI components to datasources.</dd> diff --git a/src/com/vaadin/service/package.html b/src/com/vaadin/service/package.html index 03857d9cad..ea21139b91 100644 --- a/src/com/vaadin/service/package.html +++ b/src/com/vaadin/service/package.html @@ -7,7 +7,7 @@ <!-- Package summary here --> -<p>Provides some general service classes used throughout a IT Mill Toolkit +<p>Provides some general service classes used throughout Vaadin based applications.</p> <!-- <h2>Package Specification</h2> --> diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml index 1606dea3c3..eeae872b73 100644 --- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml +++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml @@ -1,6 +1,6 @@ <module> <!-- - This GWT module defines the IT Mill Toolkit DefaultWidgetSet. This is + This GWT module defines the Vaadin DefaultWidgetSet. This is the module you want to extend when creating an extended widget set, or when creating a specialized widget set with a subset of the components. diff --git a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java index 0dd4fa6318..9aeea15536 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java @@ -226,7 +226,7 @@ public class VToolkitOverlay extends PopupPanel { String zIndex = null; try { // Odd behaviour with Windows Hosted Mode forces us to use - // this redundant try/catch block (See dev.itmill.com #2011) + // this redundant try/catch block (See dev.vaadin.com #2011) zIndex = DOM.getStyleAttribute(getElement(), "zIndex"); } catch (Exception ignore) { // Ignored, will cause no harm diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java index 077dd5cf02..d037232d18 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java @@ -417,8 +417,8 @@ public class VTree extends FlowPanel implements Paintable { } /** - * Adds/removes IT Mill Toolkit specific style name. This method ought - * to be called only from VTree. + * Adds/removes Vaadin specific style name. This method ought to be + * called only from VTree. * * @param selected */ diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 4413edf172..aba2c1ba66 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -116,7 +116,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { private Properties applicationProperties; - private static final String NOT_PRODUCTION_MODE_INFO = "=================================================================\nIT Mill Toolkit is running in DEBUG MODE.\nAdd productionMode=true to web.xml to disable debug features.\nTo show debug window, add ?debug to your application URL.\n================================================================="; + private static final String NOT_PRODUCTION_MODE_INFO = "=================================================================\nVaadin is running in DEBUG MODE.\nAdd productionMode=true to web.xml to disable debug features.\nTo show debug window, add ?debug to your application URL.\n================================================================="; private boolean productionMode = false; @@ -1097,8 +1097,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet { pathInfo = "/"; } - String title = ((window.getCaption() == null) ? "IT Mill Toolkit 5" - : window.getCaption()); + String title = ((window.getCaption() == null) ? "Vaadin 6" : window + .getCaption()); String widgetset = null; // request widgetset takes precedence (e.g portlet include) @@ -1405,7 +1405,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { * browsers scripting support is disabled. */ protected String getNoScriptMessage() { - return "You have to enable javascript in your browser to use an application built with IT Mill Toolkit."; + return "You have to enable javascript in your browser to use an application built with Vaadin."; } private boolean isGecko17(HttpServletRequest request) { diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java index 25b1c387a2..323941108c 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java @@ -45,7 +45,7 @@ public class ApplicationPortlet implements Portlet, Serializable { public void render(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- // display the IT Mill Toolkit application
+ // display the Vaadin application
writeAjaxWindow(request, response);
}
diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java index 990c84bab0..80f661faea 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java @@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRequest; import com.vaadin.Application; /** - * This servlet connects IT Mill Toolkit Application to Web. + * This servlet connects a Vaadin Application to Web. * * @author IT Mill Ltd. * @version diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java index 26c221d4a3..7f33605c8d 100644 --- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java @@ -91,7 +91,7 @@ public class ComponentSizeValidator implements Serializable { Stack<ComponentInfo> attributes, boolean widthError, PrintStream errorStream) { StringBuffer err = new StringBuffer(); - err.append("IT Mill Toolkit DEBUG\n"); + err.append("Vaadin DEBUG\n"); StringBuilder indent = new StringBuilder(""); ComponentInfo ci; diff --git a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java index 0cc83f21f5..43c6ad2565 100644 --- a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java @@ -25,7 +25,7 @@ import com.vaadin.Application; import com.vaadin.service.ApplicationContext; /** - * Web application context for the IT Mill Toolkit applications. + * Web application context for Vaadin applications. * * @author IT Mill Ltd. * @version diff --git a/src/com/vaadin/tests/RandomLayoutStress.java b/src/com/vaadin/tests/RandomLayoutStress.java index 7294ebf2a4..5bfff45a3a 100644 --- a/src/com/vaadin/tests/RandomLayoutStress.java +++ b/src/com/vaadin/tests/RandomLayoutStress.java @@ -142,7 +142,7 @@ public class RandomLayoutStress extends com.vaadin.Application { break; case 4: // Link - result = new Link("", new ExternalResource("http://www.itmill.com")); + result = new Link("", new ExternalResource("http://www.vaadin.com")); result.setCaption("Link component " + caption); break; case 5: diff --git a/src/com/vaadin/tests/TestCaptionWrapper.java b/src/com/vaadin/tests/TestCaptionWrapper.java index 62aa8659fe..c15270458e 100644 --- a/src/com/vaadin/tests/TestCaptionWrapper.java +++ b/src/com/vaadin/tests/TestCaptionWrapper.java @@ -122,7 +122,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { test(layout, label); final Link link = new Link("Link " + count++, new ExternalResource( - "www.itmill.com")); + "www.vaadin.com")); test(layout, link); final NativeSelect nativeSelect = new NativeSelect("NativeSelect " diff --git a/src/com/vaadin/tests/TestComponentsAndLayouts.java b/src/com/vaadin/tests/TestComponentsAndLayouts.java index 02593c983f..9d3f3901a3 100644 --- a/src/com/vaadin/tests/TestComponentsAndLayouts.java +++ b/src/com/vaadin/tests/TestComponentsAndLayouts.java @@ -289,7 +289,7 @@ public class TestComponentsAndLayouts extends Application implements Listener, test(layout, label); final Link link = new Link("Link " + count++, new ExternalResource( - "www.itmill.com")); + "www.vaadin.com")); test(layout, link); final NativeSelect nativeSelect = new NativeSelect("NativeSelect " diff --git a/src/com/vaadin/tests/TestForChildComponentRendering.java b/src/com/vaadin/tests/TestForChildComponentRendering.java index eb3c894224..9b5d02e945 100644 --- a/src/com/vaadin/tests/TestForChildComponentRendering.java +++ b/src/com/vaadin/tests/TestForChildComponentRendering.java @@ -39,8 +39,8 @@ public class TestForChildComponentRendering extends CustomComponent { main.addComponent(new Label("SDFGFHFHGJGFDSDSSSGFDD")); final Link l = new Link(); - l.setCaption("Siirry ITMILLIIN"); - l.setResource(new ExternalResource("http://www.itmill.com/")); + l.setCaption("Siirry Vaadiniin"); + l.setResource(new ExternalResource("http://www.vaadin.com/")); l.setTargetHeight(200); l.setTargetWidth(500); l.setTargetBorder(Link.TARGET_BORDER_MINIMAL); diff --git a/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java b/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java index 1f77d62144..9ff23e62ca 100644 --- a/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java +++ b/src/com/vaadin/tests/TestForGridLayoutChildComponentRendering.java @@ -38,8 +38,8 @@ public class TestForGridLayoutChildComponentRendering extends CustomComponent { main.addComponent(new Label("SDFGFHFHGJGFDSDSSSGFDD")); final Link l = new Link(); - l.setCaption("Siirry ITMILLIIN"); - l.setResource(new ExternalResource("http://www.itmill.com/")); + l.setCaption("Siirry Vaadiniin"); + l.setResource(new ExternalResource("http://www.vaadin.com/")); l.setTargetHeight(200); l.setTargetWidth(500); l.setTargetBorder(Link.TARGET_BORDER_MINIMAL); diff --git a/src/com/vaadin/tests/TestSizeableIncomponents.java b/src/com/vaadin/tests/TestSizeableIncomponents.java index a50a35c86b..7c9788e640 100644 --- a/src/com/vaadin/tests/TestSizeableIncomponents.java +++ b/src/com/vaadin/tests/TestSizeableIncomponents.java @@ -127,7 +127,7 @@ public class TestSizeableIncomponents extends Application { cont = new IndexedContainer(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); - URL dir = cl.getResource("com/itmill/toolkit/ui"); + URL dir = cl.getResource("com/vaadin/ui"); String[] list2 = (new File(dir.getFile())).list(); for (int i = 0; i < list2.length; i++) { @@ -227,8 +227,7 @@ public class TestSizeableIncomponents extends Application { public String getTestableName() { StringBuffer sb = new StringBuffer(); - sb.append(classToTest.getName().replaceAll( - "com.vaadin.ui.", "")); + sb.append(classToTest.getName().replaceAll("com.vaadin.ui.", "")); sb.append("["); for (Iterator i = configurations.iterator(); i.hasNext();) { sb.append(((Configuration) i.next()).getDescription()); diff --git a/src/com/vaadin/tests/book/BookTestApplication.java b/src/com/vaadin/tests/book/BookTestApplication.java index 816dd0c902..e0a6309f79 100644 --- a/src/com/vaadin/tests/book/BookTestApplication.java +++ b/src/com/vaadin/tests/book/BookTestApplication.java @@ -649,7 +649,7 @@ public class BookTestApplication extends com.vaadin.Application { final Link alink = new Link(); /* Set the resource to be opened in the window. */ - alink.setResource(new ExternalResource("http://www.itmill.com/")); + alink.setResource(new ExternalResource("http://www.vaadin.com/")); main.addComponent(alink); @@ -657,7 +657,7 @@ public class BookTestApplication extends com.vaadin.Application { this); main.addComponent(new Link("The document (pdf)", mydocument)); main.addComponent(new Link("link to a resource", new ExternalResource( - "http://www.itmill.com/"))); + "http://www.vaadin.com/"))); } void example_Button(Window main, String param) { diff --git a/src/com/vaadin/tests/components/link/LinkIcon.java b/src/com/vaadin/tests/components/link/LinkIcon.java index 345dcf93b4..0b10e87f21 100644 --- a/src/com/vaadin/tests/components/link/LinkIcon.java +++ b/src/com/vaadin/tests/components/link/LinkIcon.java @@ -21,7 +21,7 @@ public class LinkIcon extends TestBase { @Override
protected void setup() {
Link l = new Link("www.google.com", new ExternalResource(
- "http://www.itmill.com/"));
+ "http://www.vaadin.com/"));
l.setIcon(new ThemeResource("icons/32/calendar.png"));
addComponent(l);
diff --git a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index 139e9baa35..0d90d9adb1 100644 --- a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -47,7 +47,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { .getItemProperty("Column 3") .setValue( new Label( - "<a href=\"http://www.itmill.com\" target=_blank>Label A</a>", + "<a href=\"http://www.vaadin.com\" target=_blank>Label A</a>", Label.CONTENT_XHTML)); item.getItemProperty("Column 4").setValue( new Embedded("", new ThemeResource("icons/32/cancel.png"))); diff --git a/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java b/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java index f27af4ee9e..2b8668aa94 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java @@ -197,7 +197,7 @@ public class FeatureBrowser extends CustomComponent implements } getWindow() .setCaption( - "IT Mill Toolkit Features / " + "Vaadin Features / " + features.getContainerProperty(id, "name")); } diff --git a/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java b/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java index ac155f2178..48ead2f676 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Select; public class FeatureBuffering extends Feature { private static final String INTRO_TEXT = "" - + "IT Mill Toolkit data model provides interface for implementing " + + "Vaadin data model provides interface for implementing " + "buffering in data components. The basic idea is that a component " + "reading their state from data source can implement " + "Buffered-interface, for storing the value internally. " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureButton.java b/src/com/vaadin/tests/featurebrowser/FeatureButton.java index 425dfff097..a47eda9d35 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureButton.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureButton.java @@ -49,7 +49,7 @@ public class FeatureButton extends Feature { */ @Override protected String getDescriptionXHTML() { - return "In IT Mill Toolkit, boolean input values are represented by buttons. " + return "In Vaadin, boolean input values are represented by buttons. " + "Buttons may function either as a push buttons or switches. (checkboxes)<br/><br/>" + "Button can be directly connected to any method of an object, which " + "is an easy way to trigger events: <code> new Button(\"Play\", myPiano \"playIt\")</code>. " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureContainers.java b/src/com/vaadin/tests/featurebrowser/FeatureContainers.java index b2ee0e21ef..319be0056b 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureContainers.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureContainers.java @@ -15,7 +15,7 @@ public class FeatureContainers extends Feature { private static final String INTRO_TEXT = "" + "Container is the most advanced of the data " - + "model supported by IT Mill Toolkit. It provides a very flexible " + + "model supported by Vaadin. It provides a very flexible " + "way of managing set of items that share common properties. Each " + "item is identified by an item id. " + "Properties can be requested from container with item " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureDateField.java b/src/com/vaadin/tests/featurebrowser/FeatureDateField.java index 1f42356a52..31a3c53438 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureDateField.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureDateField.java @@ -81,7 +81,7 @@ public class FeatureDateField extends Feature { protected String getDescriptionXHTML() { return "Representing Dates and times and providing a way to select " + "or enter some specific date and/or time is an typical need in " - + "data-entry user interfaces (UI). IT Mill Toolkit provides a DateField " + + "data-entry user interfaces (UI). Vaadin provides a DateField " + "component that is intuitive to use and yet controllable through " + "its properties." + "<br /><br />The calendar-style allows point-and-click selection " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureLink.java b/src/com/vaadin/tests/featurebrowser/FeatureLink.java index 2e985c95e3..c20f8fe456 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureLink.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureLink.java @@ -22,7 +22,7 @@ public class FeatureLink extends Feature { final OrderedLayout l = new OrderedLayout(); final Link lnk = new Link("Link caption", new ExternalResource( - "http://www.itmill.com")); + "http://www.vaadin.com")); l.addComponent(lnk); // Properties @@ -43,7 +43,7 @@ public class FeatureLink extends Feature { @Override protected String getExampleSrc() { - return "Link link = new Link(\"Link caption\",new ExternalResource(\"http://www.itmill.com\"));\n"; + return "Link link = new Link(\"Link caption\",new ExternalResource(\"http://www.vaadin.com\"));\n"; } @Override diff --git a/src/com/vaadin/tests/featurebrowser/FeatureProperties.java b/src/com/vaadin/tests/featurebrowser/FeatureProperties.java index 640f4910a9..5c2b07b3e2 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureProperties.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureProperties.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Select; public class FeatureProperties extends Feature { private static final String INTRO_TEXT = "" - + "IT Mill Toolkit data model is one of the core concepts " + + "Vaadin data model is one of the core concepts " + "in the library and Property-interface is the base of that " + "model. Property provides standardized API for a single data object " + "that can be read (get) and written (set). A property is always typed, but can optionally " @@ -25,7 +25,7 @@ public class FeatureProperties extends Feature { + "editor and viewer classes. Typically this is used to connect different " + "data sources to UI components for editing and viewing their contents." + "<br /><br />Properties can be utilized either by implementing the interface " - + "or by using some of the existing property implementations. IT Mill Toolkit " + + "or by using some of the existing property implementations. Vaadin " + "includes Property interface implementations for " + "arbitrary function pairs or Bean-properties as well as simple object " + "properties." diff --git a/src/com/vaadin/tests/featurebrowser/FeatureTextField.java b/src/com/vaadin/tests/featurebrowser/FeatureTextField.java index 585193db74..f2612ec857 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureTextField.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureTextField.java @@ -50,7 +50,7 @@ public class FeatureTextField extends Feature { protected String getDescriptionXHTML() { return "TextField combines the logic of both the single line text-entry field and the multi-line " + "text-area into one component. " - + "As with all Data-components of IT Mill Toolkit, the TextField can also be bound to an " + + "As with all Data-components of Vaadin, the TextField can also be bound to an " + "underlying data source, both directly or in a buffered (asynchronous) " + "mode. In buffered mode its background color will change to indicate " + "that the value has changed but is not committed." diff --git a/src/com/vaadin/tests/featurebrowser/FeatureTree.java b/src/com/vaadin/tests/featurebrowser/FeatureTree.java index ea80330dbf..368b2df0f7 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureTree.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureTree.java @@ -130,7 +130,7 @@ public class FeatureTree extends Feature implements Action.Handler { protected String getDescriptionXHTML() { return "A tree is a natural way to represent datasets that have" + " hierarchical relationships, such as filesystems, message " - + "threads or, as in this example, organization structure. IT Mill Toolkit features a versatile " + + "threads or, as in this example, organization structure. Vaadin features a versatile " + "and powerful Tree component that works much like the tree components " + "of most modern operating systems." + "<br /><br />The most prominent use of the Tree component is to " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureValidators.java b/src/com/vaadin/tests/featurebrowser/FeatureValidators.java index 2f268370bd..5f251929a5 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureValidators.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureValidators.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Select; public class FeatureValidators extends Feature { private static final String INTRO_TEXT = "" - + "IT Mill Toolkit contains simple, yet powerful validation interface, " + + "Vaadin contains simple, yet powerful validation interface, " + "that consists of two parts: Validator and Validatable. Validator is " + "any class that can check validity of an Object. Validatable is " + "a class with configurable validation. " diff --git a/src/com/vaadin/tests/featurebrowser/FeatureWindow.java b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java index e241f09899..b08495f44a 100644 --- a/src/com/vaadin/tests/featurebrowser/FeatureWindow.java +++ b/src/com/vaadin/tests/featurebrowser/FeatureWindow.java @@ -80,7 +80,7 @@ public class FeatureWindow extends Feature implements Window.CloseListener { @Override protected String getDescriptionXHTML() { - return "The window support in IT Mill Toolkit allows for opening and closing windows, " + return "The window support in Vaadin allows for opening and closing windows, " + "refreshing one window from another (for asynchronous terminals), " + "resizing windows and scrolling window content. " + "There are also a number of preset window border styles defined by " diff --git a/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java b/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java index 69a4192fca..2d3ac436ad 100644 --- a/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java +++ b/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java @@ -14,7 +14,7 @@ public class FeaturesApplication extends com.vaadin.Application { FeatureUtil.setStatistics(true); } setUser(new Long(System.currentTimeMillis()).toString()); - final Window main = new Window("IT Mill Toolkit Features Tour"); + final Window main = new Window("Vaadin Features Tour"); setMainWindow(main); main.setLayout(new FeatureBrowser()); @@ -24,8 +24,7 @@ public class FeaturesApplication extends com.vaadin.Application { * ErrorEvents are printed to default error stream and not in GUI. */ @Override - public void terminalError( - com.vaadin.terminal.Terminal.ErrorEvent event) { + public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { final Throwable e = event.getThrowable(); FeatureUtil.debug(getUser().toString(), "terminalError: " + e.toString()); diff --git a/src/com/vaadin/tests/featurebrowser/IntroDataModel.java b/src/com/vaadin/tests/featurebrowser/IntroDataModel.java index ccfd33b9c9..b4fb8f6757 100644 --- a/src/com/vaadin/tests/featurebrowser/IntroDataModel.java +++ b/src/com/vaadin/tests/featurebrowser/IntroDataModel.java @@ -14,7 +14,7 @@ import com.vaadin.ui.Select; public class IntroDataModel extends Feature { private static final String INTRO_TEXT = "" - + "This section introduces main concepts of data model in IT Mill Toolkit." + + "This section introduces main concepts of data model in Vaadin." + " It contains brief introduction to Properties, Items, Containers, Validators and" + " Buffering classes." + "<br /><br />See the API documentation of respective area for more information."; diff --git a/src/com/vaadin/tests/featurebrowser/IntroWelcome.java b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java index b2147cd118..cffb4c7994 100644 --- a/src/com/vaadin/tests/featurebrowser/IntroWelcome.java +++ b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java @@ -27,7 +27,7 @@ public class IntroWelcome extends Feature implements URIHandler, private static final String WELCOME_TEXT_UPPER = "" + "This application lets you view and play with some features of " - + "IT Mill Toolkit. Use menu on the left to select component." + + "Vaadin. Use menu on the left to select component." + "<br /><br />Note the <b>Properties selection</b> on the top " + "right corner. Click it open to access component properties and" + " feel free to edit properties at any time." @@ -38,11 +38,11 @@ public class IntroWelcome extends Feature implements URIHandler, + "<br /><br />You may also change application's theme from below the menu." + " This example application is designed to work best with" + " <em>Demo</em> theme, other themes are for demonstration purposes only." - + "<br /><br />IT Mill Toolkit enables you to construct complex Web" + + "<br /><br />Vaadin enables you to construct complex Web" + " applications using plain Java, no knowledge of other Web technologies" + " such as XML, HTML, DOM, JavaScript or browser differences is required." + "<br /><br />For more information, point your browser to" - + " <a href=\"http://www.itmill.com\" target=\"_new\">www.itmill.com</a>."; + + " <a href=\"http://www.vaadin.com\" target=\"_new\">www.vaadin.com</a>."; private static final String WELCOME_TEXT_LOWER = "" + "This area contains the selected component's description, list of properties, javadoc" @@ -53,7 +53,7 @@ public class IntroWelcome extends Feature implements URIHandler, // TODO Add browser agent string private final String description = WELCOME_TEXT_LOWER - + "<br /><br />IT Mill Toolkit version: " + + "<br /><br />Vaadin Toolkit version: " + ApplicationServlet.VERSION; public IntroWelcome() { @@ -65,7 +65,7 @@ public class IntroWelcome extends Feature implements URIHandler, final OrderedLayout l = new OrderedLayout(); - panel.setCaption("Welcome to the IT Mill Toolkit feature tour!"); + panel.setCaption("Welcome to the Vaadin feature tour!"); l.addComponent(panel); final Label label = new Label(); @@ -93,8 +93,7 @@ public class IntroWelcome extends Feature implements URIHandler, @Override protected String getExampleSrc() { - return "" - + "package com.vaadin.demo;\n" + return "" + "package com.vaadin.demo;\n" + "import com.vaadin.ui.*;\n\n" + "public class HelloWorld extends com.vaadin.Application {\n" + " public void init() {\n" diff --git a/src/com/vaadin/tests/featurebrowser/PropertyPanel.java b/src/com/vaadin/tests/featurebrowser/PropertyPanel.java index b62138e46a..5e105dbf1e 100644 --- a/src/com/vaadin/tests/featurebrowser/PropertyPanel.java +++ b/src/com/vaadin/tests/featurebrowser/PropertyPanel.java @@ -247,7 +247,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener, set .getField("componentError") .setDescription( - "IT Mill Toolkit supports extensive error reporting. One part of the error reporting are component" + "Vaadin supports extensive error reporting. One part of the error reporting are component" + " errors that can be controlled by the programmer. This example only contains couple of " + "sample errors; to get the full picture, read browse ErrorMessage-interface implementors " + "API documentation."); diff --git a/src/com/vaadin/tests/tickets/Ticket1362Login.java b/src/com/vaadin/tests/tickets/Ticket1362Login.java index 1ac4a1d048..e6ed473285 100644 --- a/src/com/vaadin/tests/tickets/Ticket1362Login.java +++ b/src/com/vaadin/tests/tickets/Ticket1362Login.java @@ -118,7 +118,7 @@ public class Ticket1362Login extends Application { } return new DownloadStream( new ByteArrayInputStream( - "<html><body>Login form handeled.<script type='text/javascript'>top.itmill.forceSync();</script></body></html>" + "<html><body>Login form handeled.<script type='text/javascript'>top.vaadin.forceSync();</script></body></html>" .getBytes()), "text/html", "loginSuccesfull.html"); } diff --git a/src/com/vaadin/tests/tickets/Ticket1673.java b/src/com/vaadin/tests/tickets/Ticket1673.java index f4461803de..845e49daed 100644 --- a/src/com/vaadin/tests/tickets/Ticket1673.java +++ b/src/com/vaadin/tests/tickets/Ticket1673.java @@ -19,7 +19,7 @@ public class Ticket1673 extends com.vaadin.Application { public static Application.SystemMessages getSystemMessages() {
Application.CustomizedSystemMessages msgs = new Application.CustomizedSystemMessages();
- msgs.setSessionExpiredURL("http://www.itmill.com/");
+ msgs.setSessionExpiredURL("http://www.vaadin.com/");
msgs.setSessionExpiredCaption("Foo");
msgs.setSessionExpiredMessage("Bar");
diff --git a/src/com/vaadin/tests/tickets/Ticket2043.java b/src/com/vaadin/tests/tickets/Ticket2043.java index c003439c99..aad3cb554a 100644 --- a/src/com/vaadin/tests/tickets/Ticket2043.java +++ b/src/com/vaadin/tests/tickets/Ticket2043.java @@ -19,8 +19,8 @@ public class Ticket2043 extends Application { }
private void createUI(GridLayout layout) {
- Link l = new Link("IT Mill home (new 200x200 window, no decor, icon)",
- new ExternalResource("http://www.itmill.com"), "_blank", 200,
+ Link l = new Link("Vaadin home (new 200x200 window, no decor, icon)",
+ new ExternalResource("http://www.vaadin.com"), "_blank", 200,
200, Link.TARGET_BORDER_NONE);
layout.addComponent(l);
diff --git a/src/com/vaadin/tests/tickets/Ticket2061c.java b/src/com/vaadin/tests/tickets/Ticket2061c.java index abb79621f4..77381dcbfd 100644 --- a/src/com/vaadin/tests/tickets/Ticket2061c.java +++ b/src/com/vaadin/tests/tickets/Ticket2061c.java @@ -26,7 +26,7 @@ public class Ticket2061c extends Application implements @Override public void init() { - mainWindow = new Window("It Mill"); + mainWindow = new Window("Vaadin"); mainWindow.setSizeFull(); mainWindow.getLayout().setSizeFull(); setMainWindow(mainWindow); diff --git a/src/com/vaadin/tests/tickets/Ticket2106.java b/src/com/vaadin/tests/tickets/Ticket2106.java index 953ac84afb..8168e06154 100644 --- a/src/com/vaadin/tests/tickets/Ticket2106.java +++ b/src/com/vaadin/tests/tickets/Ticket2106.java @@ -12,8 +12,8 @@ public class Ticket2106 extends Application { private static CustomizedSystemMessages msgs = new Application.CustomizedSystemMessages(); static { - // We will forward the user to www.itmill.com when the session expires - msgs.setSessionExpiredURL("http://www.itmill.com"); + // We will forward the user to www.vaadin.com when the session expires + msgs.setSessionExpiredURL("http://www.vaadin.com"); msgs.setSessionExpiredMessage(null); msgs.setSessionExpiredCaption(null); } diff --git a/src/com/vaadin/tests/util/RandomComponents.java b/src/com/vaadin/tests/util/RandomComponents.java index 5b98e5dd66..fdfb878e04 100644 --- a/src/com/vaadin/tests/util/RandomComponents.java +++ b/src/com/vaadin/tests/util/RandomComponents.java @@ -159,7 +159,7 @@ public class RandomComponents { break; case 4: // Link - result = new Link("", new ExternalResource("http://www.itmill.com")); + result = new Link("", new ExternalResource("http://www.vaadin.com")); result.setCaption("Link component " + caption); break; case 5: diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java index b26278b016..39a0cf4f83 100644 --- a/src/com/vaadin/ui/AbstractComponent.java +++ b/src/com/vaadin/ui/AbstractComponent.java @@ -28,8 +28,8 @@ import com.vaadin.terminal.gwt.server.ComponentSizeValidator; /** * An abstract class that defines default implementation for the * {@link Component} interface. Basic UI components that are not derived from an - * external component can inherit this class to easily qualify as a IT Mill - * Toolkit component. Most components in the toolkit do just that. + * external component can inherit this class to easily qualify as Vaadin + * components. Most components in Vaadin do just that. * * @author IT Mill Ltd. * @version @@ -172,8 +172,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource /** * Sets and replaces all previous style names of the component. This method - * will trigger a - * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent + * will trigger a {@link com.vaadin.terminal.Paintable.RepaintRequestEvent * RepaintRequestEvent}. * * @param style @@ -347,8 +346,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource /** * Sets the component's immediate mode to the specified status. This method - * will trigger a - * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent + * will trigger a {@link com.vaadin.terminal.Paintable.RepaintRequestEvent * RepaintRequestEvent}. * * @param immediate @@ -817,8 +815,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * * <p> * For more information on the inheritable event mechanism see the - * {@link com.vaadin.event com.vaadin.event package - * documentation}. + * {@link com.vaadin.event com.vaadin.event package documentation}. * </p> * * @param eventType @@ -853,8 +850,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * * <p> * For more information on the inheritable event mechanism see the - * {@link com.vaadin.event com.vaadin.event package - * documentation}. + * {@link com.vaadin.event com.vaadin.event package documentation}. * </p> * * <p> @@ -887,8 +883,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * * <p> * For more information on the inheritable event mechanism see the - * {@link com.vaadin.event com.vaadin.event package - * documentation}. + * {@link com.vaadin.event com.vaadin.event package documentation}. * </p> * * @param eventType @@ -910,8 +905,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * * <p> * For more information on the inheritable event mechanism see the - * {@link com.vaadin.event com.vaadin.event package - * documentation}. + * {@link com.vaadin.event com.vaadin.event package documentation}. * </p> * * @param eventType @@ -945,8 +939,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * * <p> * For more information on the inheritable event mechanism see the - * {@link com.vaadin.event com.vaadin.event package - * documentation}. + * {@link com.vaadin.event com.vaadin.event package documentation}. * </p> * * @param eventType diff --git a/src/com/vaadin/ui/Component.java b/src/com/vaadin/ui/Component.java index 6b5ead80d2..ab7b7bb2ca 100644 --- a/src/com/vaadin/ui/Component.java +++ b/src/com/vaadin/ui/Component.java @@ -19,7 +19,7 @@ import com.vaadin.terminal.VariableOwner; /** * The top-level component interface which must be implemented by all UI - * components that use IT Mill Toolkit. + * components that use Vaadin. * * @author IT Mill Ltd. * @version @@ -38,8 +38,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable, /** * Sets and replaces all previous style names of the component. This method - * will trigger a - * {@link com.vaadin.terminal.Paintable.RepaintRequestEvent + * will trigger a {@link com.vaadin.terminal.Paintable.RepaintRequestEvent * RepaintRequestEvent}. * * @param style diff --git a/src/com/vaadin/ui/LoginForm.java b/src/com/vaadin/ui/LoginForm.java index 6e2c06c24a..f8f00170c5 100644 --- a/src/com/vaadin/ui/LoginForm.java +++ b/src/com/vaadin/ui/LoginForm.java @@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; /** * LoginForm is a Toolkit component to handle common problem among Ajax * applications: browsers password managers don't fill dynamically created forms - * like all those UI elements created by IT Mill Toolkit. + * like all those UI elements created by Vaadin. * <p> * For developer it is easy to use: add component to a desired place in you UI * and add LoginListener to validate form input. Behind the curtain LoginForm diff --git a/src/com/vaadin/ui/package.html b/src/com/vaadin/ui/package.html index 2a26453a1f..6629060a49 100644 --- a/src/com/vaadin/ui/package.html +++ b/src/com/vaadin/ui/package.html @@ -8,7 +8,7 @@ <!-- Package summary here --> -<p>Provides interfaces and classes in the IT Mill Toolkit.</p> +<p>Provides interfaces and classes in Vaadin.</p> <h2>Package Specification</h2> |