From c73acbc50b7a6298fde7a8ab5a316059f14c3f0a Mon Sep 17 00:00:00 2001
From: Henri Sara
Date: Mon, 18 May 2009 11:31:16 +0000
Subject: [PATCH] #2904 Miscellaneous Toolkit -> Vaadin renames
svn changeset:7854/svn branch:6.0
---
WebContent/WEB-INF/liferay-display.xml | 2 +-
WebContent/WEB-INF/portlet.xml | 10 +++++-----
WebContent/WEB-INF/web.xml | 10 +++++-----
WebContent/multiapp.html | 2 +-
src/com/vaadin/data/util/QueryContainer.java | 2 +-
.../vaadin/terminal/gwt/client/VDebugConsole.java | 2 +-
.../tests/TestForPreconfiguredComponents.java | 2 +-
src/com/vaadin/tests/tickets/Ticket1362Login.java | 3 ++-
src/com/vaadin/ui/DateField.java | 14 +++++++-------
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 @@
-
+
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">
PortletDemoPortlet
- IT Mill Toolkit PortletDemo
+ Vaadin PortletDemo
com.vaadin.terminal.gwt.server.ApplicationPortlet
application
@@ -39,7 +39,7 @@
SimpleReserverPortlet
- IT Mill Toolkit SimpleReserver
+ Vaadin SimpleReserver
com.vaadin.terminal.gwt.server.ApplicationPortlet
application
@@ -73,7 +73,7 @@
FeatureBrowserPortlet
- IT Mill Toolkit FeatureBrowser
+ Vaadin FeatureBrowser
com.vaadin.terminal.gwt.server.ApplicationPortlet
application
@@ -107,7 +107,7 @@
ChatServletPortlet
- IT Mill Toolkit ChatServlet
+ Vaadin ChatServlet
com.vaadin.terminal.gwt.server.ApplicationPortlet
application
@@ -141,7 +141,7 @@
BrowserDemoPortlet
- IT Mill Toolkit BrowserDemo
+ Vaadin BrowserDemo
com.vaadin.terminal.gwt.server.ApplicationPortlet
application
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 @@
- IT Mill Toolkit
- IT Mill Toolkit examples
+ Vaadin
+ Vaadin examples
productionMode
false
- IT Mill Toolkit production mode
+ Vaadin production mode
@@ -33,7 +33,7 @@
- ITMillToolkitApplicationRunner
+ VaadinApplicationRunner
com.vaadin.terminal.gwt.server.ApplicationRunnerServlet
@@ -344,7 +344,7 @@
- ITMillToolkitApplicationRunner
+ VaadinApplicationRunner
/run/*
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 @@
- Multiple toolkits per html file test page
+ Multiple Vaadin applications per html file test page
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;
*
* The QueryContainer
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.
*
*
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;
*
*
* Since DateField
extends AbstractField
it implements
- * the {@link com.vaadin.data.Buffered}interface. A
- * DateField
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 DateField
is in
+ * write-through mode by default, so
+ * {@link com.vaadin.ui.AbstractField#setWriteThrough(boolean)}must be called to
+ * enable buffering.
*
*
* @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
--
2.39.5