#2904 Miscellaneous Toolkit -> Vaadin renames

svn changeset:7854/svn branch:6.0

5 files changed, 12 insertions, 11 deletions

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