From 5f8478a617d7d145ba94abcc4e197cdd50f76e1f Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 18 May 2009 09:17:56 +0000 Subject: [PATCH] #2904 Toolkit -> Vaadin renames: search for "IT Mill" and "itmill", partial changes including many URLs svn changeset:7842/svn branch:6.0 --- WebContent/VAADIN/readme.txt | 10 ++--- .../themes/example/layouts/Contact.html | 2 +- .../themes/example/layouts/Developers.html | 2 +- .../VAADIN/themes/example/layouts/News.html | 3 +- .../themes/example/layouts/Products.html | 2 +- .../themes/example/layouts/Welcome.html | 12 +++--- .../statictestfiles/ticket2095_popup.html | 2 +- src/com/vaadin/Application.java | 38 +++++++++---------- .../featurebrowser/ButtonExample.java | 16 ++++---- .../EmbeddedBrowserExample.java | 10 ++--- .../featurebrowser/FeatureBrowser.java | 9 ++--- .../featurebrowser/JavaScriptAPIExample.java | 2 +- .../featurebrowser/RichTextExample.java | 2 +- .../automatedtests/util/RandomComponents.java | 2 +- .../vaadin/data/util/IndexedContainer.java | 4 +- src/com/vaadin/demo/ToolkitTunesLayout.java | 2 +- .../gwt/client/ui/GwtColorPicker.java | 2 +- .../gwt/client/ui/VColorPicker.java | 2 +- .../demo/featurebrowser/ButtonExample.java | 16 ++++---- .../EmbeddedBrowserExample.java | 10 ++--- .../demo/featurebrowser/FeatureBrowser.java | 9 ++--- .../featurebrowser/JavaScriptAPIExample.java | 2 +- .../demo/featurebrowser/RichTextExample.java | 2 +- src/com/vaadin/demo/package.html | 4 +- src/com/vaadin/demo/reservation/SampleDB.java | 2 +- src/com/vaadin/demo/sampler/APIResource.java | 2 +- src/com/vaadin/demo/sampler/Feature.java | 2 +- .../features/commons/IconsExample.java | 16 ++++---- .../addressbook/data/PersonContainer.java | 2 +- .../tutorial/addressbook/ui/HelpWindow.java | 2 +- src/com/vaadin/event/package.html | 2 +- src/com/vaadin/package.html | 6 +-- src/com/vaadin/service/package.html | 2 +- .../terminal/gwt/DefaultWidgetSet.gwt.xml | 2 +- .../gwt/client/ui/VToolkitOverlay.java | 2 +- .../vaadin/terminal/gwt/client/ui/VTree.java | 4 +- .../server/AbstractApplicationServlet.java | 8 ++-- .../gwt/server/ApplicationPortlet.java | 2 +- .../gwt/server/ApplicationServlet.java | 2 +- .../gwt/server/ComponentSizeValidator.java | 2 +- .../gwt/server/WebApplicationContext.java | 2 +- src/com/vaadin/tests/RandomLayoutStress.java | 2 +- src/com/vaadin/tests/TestCaptionWrapper.java | 2 +- .../tests/TestComponentsAndLayouts.java | 2 +- .../tests/TestForChildComponentRendering.java | 4 +- ...tForGridLayoutChildComponentRendering.java | 4 +- .../tests/TestSizeableIncomponents.java | 5 +-- .../tests/book/BookTestApplication.java | 4 +- .../tests/components/link/LinkIcon.java | 2 +- .../LabelEmbeddedClickThroughForTable.java | 2 +- .../tests/featurebrowser/FeatureBrowser.java | 2 +- .../featurebrowser/FeatureBuffering.java | 2 +- .../tests/featurebrowser/FeatureButton.java | 2 +- .../featurebrowser/FeatureContainers.java | 2 +- .../featurebrowser/FeatureDateField.java | 2 +- .../tests/featurebrowser/FeatureLink.java | 4 +- .../featurebrowser/FeatureProperties.java | 4 +- .../featurebrowser/FeatureTextField.java | 2 +- .../tests/featurebrowser/FeatureTree.java | 2 +- .../featurebrowser/FeatureValidators.java | 2 +- .../tests/featurebrowser/FeatureWindow.java | 2 +- .../featurebrowser/FeaturesApplication.java | 5 +-- .../tests/featurebrowser/IntroDataModel.java | 2 +- .../tests/featurebrowser/IntroWelcome.java | 13 +++---- .../tests/featurebrowser/PropertyPanel.java | 2 +- .../vaadin/tests/tickets/Ticket1362Login.java | 2 +- src/com/vaadin/tests/tickets/Ticket1673.java | 2 +- src/com/vaadin/tests/tickets/Ticket2043.java | 4 +- src/com/vaadin/tests/tickets/Ticket2061c.java | 2 +- src/com/vaadin/tests/tickets/Ticket2106.java | 4 +- .../vaadin/tests/util/RandomComponents.java | 2 +- src/com/vaadin/ui/AbstractComponent.java | 25 +++++------- src/com/vaadin/ui/Component.java | 5 +-- src/com/vaadin/ui/LoginForm.java | 2 +- src/com/vaadin/ui/package.html | 2 +- 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.

Report a Bug

-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 @@

Developers

-This section contains information for developers using IT Mill Toolkit +This section contains information for developers using Vaadin to create Java web applications.

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.

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.

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 @@ -

Top 5 reasons to choose IT Mill Toolkit

+

Top 5 reasons to choose Vaadin

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.

-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() {

- +
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; /** *

- * 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. *

* *

- * 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 - * Application needs to do is implement the init - * 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 Application + * needs to do is implement the init 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. *

* *

- * See the class com.vaadin.demo.HelloWorld for a simple - * example of a fully working application. + * See the class com.vaadin.demo.HelloWorld for a simple example of + * a fully working application. *

* *

@@ -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. *

* * @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( - "Developer Area" - + " | Documentation"); + "30 Seconds to Vaadin" + + " | Book of Vaadin"); 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 = "

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.

(more examples will be added here as the APIs are made public)

javascript:itmill.forceSync();"; + public static final String txt = "

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.

(more examples will be added here as the APIs are made public)

javascript:vaadin.forceSync();"; 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 = "

RichText editor example

" + "To edit this text, press the Edit button below." + "
" - + "See the manual " + + "See the Book of Vaadin " + "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.
It is not a working sound player.", + "This is an example of how you can do layouts in Vaadin.
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( - "Developer Area" - + " | Documentation"); + "30 Seconds to Vaadin" + + " | Book of Vaadin"); 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 = "

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.

(more examples will be added here as the APIs are made public)

javascript:itmill.forceSync();"; + public static final String txt = "

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.

(more examples will be added here as the APIs are made public)

javascript:vaadin.forceSync();"; 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 = "

RichText editor example

" + "To edit this text, press the Edit button below." + "
" - + "See the manual " + + "See the Book of Vaadin " + "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 @@ -

Provides several fully functional IT Mill Toolkit example applications. These +

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.

@@ -15,7 +15,7 @@ applications.

text "Hello, World!" on the screen.
  • Calc 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.
    • +application can interact with the user through that interface. 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. *

    - * 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. *

    *

    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 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 Toolkit " + + "http://dev.vaadin.com/\">Vaadin " + "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 @@

    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.

    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 @@ -

    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. +

    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.

    Package Specification

    - IT Mill Toolkit is composed of the following packages: + Vaadin is composed of the following packages:
    com.vaadin.data
    A library of interfaces for transparently binding UI components to datasources.
    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 @@ -

    Provides some general service classes used throughout a IT Mill Toolkit +

    Provides some general service classes used throughout Vaadin based applications.

    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 @@ -

    Provides interfaces and classes in the IT Mill Toolkit.

    +

    Provides interfaces and classes in Vaadin.

    Package Specification

    -- 2.39.5