#2904 Miscellaneous Toolkit -> Vaadin renames

svn changeset:7854/svn branch:6.0

9 files changed, 24 insertions, 23 deletions

diff --git a/WebContent/WEB-INF/liferay-display.xml b/WebContent/WEB-INF/liferay-display.xml
index b3566e9c91..f5bbc414f2 100644
--- a/WebContent/WEB-INF/liferay-display.xml
+++ b/WebContent/WEB-INF/liferay-display.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE display PUBLIC "-//Liferay//DTD Display 4.0.0//EN" "http://www.liferay.com/dtd/liferay-display_4_0_0.dtd">
 
 <display>
-        <category name="IT Mill Toolkit">
+        <category name="Vaadin">
                 <portlet id="PortletDemoPortlet" />
                 <portlet id="SimpleReserverPortlet" />
                 <portlet id="SelectDemoPortlet" />
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml
index bf763441c7..61d25743da 100644
--- a/WebContent/WEB-INF/portlet.xml
+++ b/WebContent/WEB-INF/portlet.xml
@@ -5,7 +5,7 @@
         xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
         <portlet>
                 <portlet-name>PortletDemoPortlet</portlet-name>
-                <display-name>IT Mill Toolkit PortletDemo</display-name>
+                <display-name>Vaadin PortletDemo</display-name>
                 <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
@@ -39,7 +39,7 @@
         </portlet>
         <portlet>
                 <portlet-name>SimpleReserverPortlet</portlet-name>
-                <display-name>IT Mill Toolkit SimpleReserver</display-name>
+                <display-name>Vaadin SimpleReserver</display-name>
                 <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
@@ -73,7 +73,7 @@
         </portlet>
         <portlet>
                 <portlet-name>FeatureBrowserPortlet</portlet-name>
-                <display-name>IT Mill Toolkit FeatureBrowser</display-name>
+                <display-name>Vaadin FeatureBrowser</display-name>
                 <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
@@ -107,7 +107,7 @@
         </portlet>
         <portlet>
                 <portlet-name>ChatServletPortlet</portlet-name>
-                <display-name>IT Mill Toolkit ChatServlet</display-name>
+                <display-name>Vaadin ChatServlet</display-name>
                 <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
@@ -141,7 +141,7 @@
         </portlet>
         <portlet>
                 <portlet-name>BrowserDemoPortlet</portlet-name>
-                <display-name>IT Mill Toolkit BrowserDemo</display-name>
+                <display-name>Vaadin BrowserDemo</display-name>
                 <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>
                 <init-param>
                         <name>application</name>
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 7a882bfafc..087705c646 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -11,13 +11,13 @@
 

 

 <web-app>

-	<display-name>IT Mill Toolkit</display-name>

-	<description>IT Mill Toolkit examples</description>

+	<display-name>Vaadin</display-name>

+	<description>Vaadin examples</description>

 

 	<context-param>

 		<param-name>productionMode</param-name>

 		<param-value>false</param-value>

-		<description>IT Mill Toolkit production mode</description>

+		<description>Vaadin production mode</description>

 	</context-param>

 	<!-- Permit use of IT Mill Testing Tools for this servlet continer -->
 	<context-param>
@@ -33,7 +33,7 @@
 	</context-param>
 
 	<servlet>
-		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
+		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<servlet-class>com.vaadin.terminal.gwt.server.ApplicationRunnerServlet</servlet-class>
 	</servlet>
 
@@ -344,7 +344,7 @@
 	</servlet>
 
 	<servlet-mapping>
-		<servlet-name>ITMillToolkitApplicationRunner</servlet-name>
+		<servlet-name>VaadinApplicationRunner</servlet-name>
 		<url-pattern>/run/*</url-pattern>
 	</servlet-mapping>

 

diff --git a/WebContent/multiapp.html b/WebContent/multiapp.html
index 4731ec1ccf..0bee11e5bb 100644
--- a/WebContent/multiapp.html
+++ b/WebContent/multiapp.html
@@ -33,7 +33,7 @@
 <body>
 	<iframe id="__gwt_historyFrame" style="width:0;height:0;border:0;overflow:hidden" src="javascript:false"></iframe>
 	
-	<p>Multiple toolkits per html file test page</p>
+	<p>Multiple Vaadin applications per html file test page</p>
 	
 	<div id="fb" style="height:400px;border:2px solid red;margin:0"></div>
 	<div id="calc" style="border:2px solid green;margin:0"></div>
diff --git a/src/com/vaadin/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java
index 3716a7dce7..1598d28ed8 100644
--- a/src/com/vaadin/data/util/QueryContainer.java
+++ b/src/com/vaadin/data/util/QueryContainer.java
@@ -22,7 +22,7 @@ import com.vaadin.data.Property;
  * <p>
  * The <code>QueryContainer</code> is the specialized form of Container which is
  * Ordered and Indexed. This is used to represent the contents of relational
- * database tables accessed through the JDBC Connection in the Toolkit Table.
+ * database tables accessed through the JDBC Connection in the Vaadin Table.
  * This creates Items based on the queryStatement provided to the container.
  * </p>
  * 
diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
index a377dfce99..38ba032995 100755
--- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
+++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java
@@ -173,7 +173,7 @@ public final class VDebugConsole extends VToolkitOverlay implements Console {
 
         }
 
-        log("Toolkit application servlet version: " + cnf.getServletVersion());
+        log("Vaadin application servlet version: " + cnf.getServletVersion());
         log("Widget set is built on version: " + VERSION);
         log("Application version: " + cnf.getApplicationVersion());
 
diff --git a/src/com/vaadin/tests/TestForPreconfiguredComponents.java b/src/com/vaadin/tests/TestForPreconfiguredComponents.java
index 9e39d21f52..fa153fcda7 100644
--- a/src/com/vaadin/tests/TestForPreconfiguredComponents.java
+++ b/src/com/vaadin/tests/TestForPreconfiguredComponents.java
@@ -53,7 +53,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements
         main.removeAllComponents();
         main
                 .addComponent(new Label(
-                        "In Toolkit 5 we introduce new componens. Previously we"
+                        "In Toolkit 5 we introduce new components. Previously we"
                                 + " usually used setStyle or some other methods on possibly "
                                 + "multiple steps to configure component for ones needs. These new "
                                 + "server side components are mostly just classes that in constructor "
diff --git a/src/com/vaadin/tests/tickets/Ticket1362Login.java b/src/com/vaadin/tests/tickets/Ticket1362Login.java
index e876ae4808..8640b06bc0 100644
--- a/src/com/vaadin/tests/tickets/Ticket1362Login.java
+++ b/src/com/vaadin/tests/tickets/Ticket1362Login.java
@@ -26,7 +26,8 @@ import com.vaadin.ui.Window.Notification;
  * Proof of concept how to create a decent login screen that works with browsers
  * PW managers. (Browsers don't autofill generated login forms)
  * 
- * TODO generalize js to work inside iframes (if toolkit is inside iframe)
+ * TODO generalize js to work inside iframes (if a Vaadin application is inside
+ * iframe)
  * 
  * TODO extract login form to a external template.
  * 
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index d782efbb13..e048434361 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -22,10 +22,10 @@ import com.vaadin.terminal.PaintTarget;
  * </p>
  * <p>
  * Since <code>DateField</code> extends <code>AbstractField</code> it implements
- * the {@link com.vaadin.data.Buffered}interface. A
- * <code>DateField</code> is in write-through mode by default, so
- * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)}must be
- * called to enable buffering.
+ * the {@link com.vaadin.data.Buffered}interface. A <code>DateField</code> is in
+ * write-through mode by default, so
+ * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)}must be called to
+ * enable buffering.
  * </p>
  * 
  * @author IT Mill Ltd.
@@ -360,8 +360,8 @@ public class DateField extends AbstractField {
      * This can be overridden to handle conversions or to throw an exception, or
      * to fire an event.
      * 
-     * The default behavior is likely to change in the next major version of the
-     * toolkit - a Property.ConversionException will be thrown.
+     * The default behavior is likely to change in the next major version of
+     * Vaadin - a Property.ConversionException will be thrown.
      * 
      * @param dateString
      * @return parsed Date
@@ -503,7 +503,7 @@ public class DateField extends AbstractField {
      * 
      * By default it is encouraged to used default formatting defined by Locale,
      * but due some JVM bugs it is sometimes necessary to use this method to
-     * override formatting. See Toolkit issue #2200.
+     * override formatting. See Vaadin issue #2200.
      * 
      * @param dateFormat
      *            the dateFormat to set