From 6a27bd3b0310ebc7b56f18c1cadd33fcda73084d Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 18 May 2009 10:38:49 +0000 Subject: [PATCH] Incomplete - task#2904 Toolkit -> Vaadin renames svn changeset:7850/svn branch:6.0 --- src/com/vaadin/Application.java | 8 ++++---- src/com/vaadin/demo/package.html | 2 +- src/com/vaadin/demo/sampler/FeatureSet.java | 2 +- .../gwt/client/ApplicationConfiguration.java | 2 +- .../vaadin/terminal/gwt/client/Focusable.java | 2 +- .../terminal/gwt/client/ui/TreeAction.java | 2 +- .../terminal/gwt/client/ui/VPopupView.java | 2 +- .../terminal/gwt/client/ui/VToolkitOverlay.java | 2 +- .../vaadin/terminal/gwt/client/ui/VView.java | 2 +- .../gwt/server/AbstractApplicationServlet.java | 4 ++-- .../gwt/server/ApplicationRunnerServlet.java | 2 +- src/com/vaadin/tests/CustomLayoutDemo.java | 10 +++++----- src/com/vaadin/tests/LayoutDemo.java | 2 +- .../tests/PerformanceTestSubTreeCaching.java | 2 +- src/com/vaadin/tests/QueryContainerDemo.java | 17 ++++++++--------- src/com/vaadin/tests/RandomLayoutStress.java | 2 +- src/com/vaadin/tests/TreeFilesystem.java | 8 ++++---- .../vaadin/tests/TreeFilesystemContainer.java | 15 +++++++-------- src/com/vaadin/tests/UsingObjectsInSelect.java | 6 +++--- .../tests/featurebrowser/IntroWelcome.java | 3 +-- .../tests/layouts/DeepComponentTrees.java | 4 ++-- .../vaadin/tests/tickets/Ticket1362Login.java | 4 ++-- src/com/vaadin/ui/CustomLayout.java | 2 +- src/com/vaadin/ui/LoginForm.java | 2 +- src/com/vaadin/ui/Window.java | 11 +++++------ 25 files changed, 57 insertions(+), 61 deletions(-) diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 3cab4a2054..da0a373909 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -35,9 +35,9 @@ import com.vaadin.ui.Window; /** *

* 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. + * basic services required by Vaadin. These services allow external discovery + * and manipulation of the user, {@link com.vaadin.ui.Window windows} and + * themes, and starting and stopping the application. *

* *

@@ -799,7 +799,7 @@ public abstract class Application implements URIHandler, /** * Gets the previous user of the application. * - * @return the previous Toolkit user, if user has not changed ever on + * @return the previous Vaadin user, if user has not changed ever on * application it returns null */ public Object getPreviousUser() { diff --git a/src/com/vaadin/demo/package.html b/src/com/vaadin/demo/package.html index 0a6d902e31..38ccd7654a 100644 --- a/src/com/vaadin/demo/package.html +++ b/src/com/vaadin/demo/package.html @@ -6,7 +6,7 @@

Provides several fully functional Vaadin example applications. These -highlight certain aspects of the toolkit and how it can be +highlight certain aspects of the Vaadin and how it can be used to produce simple, elegant yet powerful user interface driven applications.

diff --git a/src/com/vaadin/demo/sampler/FeatureSet.java b/src/com/vaadin/demo/sampler/FeatureSet.java index 80a8e83206..7e60b9a641 100644 --- a/src/com/vaadin/demo/sampler/FeatureSet.java +++ b/src/com/vaadin/demo/sampler/FeatureSet.java @@ -399,7 +399,7 @@ public class FeatureSet extends Feature { super( "Dates", "Dates", - "The DateField component can be used to produce various date and time input fields with different resolutions. The date and time format used with this component is reported to the Toolkit by the browser.", + "The DateField component can be used to produce various date and time input fields with different resolutions. The date and time format used with this component is reported to Vaadin by the browser.", new Feature[] { // new DatePopup(), // diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 0eb505761b..9fa9e19019 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -99,7 +99,7 @@ public class ApplicationConfiguration { } } else { - $wnd.alert("Toolkit app failed to initialize: " + this.id); + $wnd.alert("Vaadin app failed to initialize: " + this.id); } }-*/; diff --git a/src/com/vaadin/terminal/gwt/client/Focusable.java b/src/com/vaadin/terminal/gwt/client/Focusable.java index bf225ad61d..35f9c1ba76 100644 --- a/src/com/vaadin/terminal/gwt/client/Focusable.java +++ b/src/com/vaadin/terminal/gwt/client/Focusable.java @@ -2,7 +2,7 @@ package com.vaadin.terminal.gwt.client; /** * GWT's HasFocus is way too overkill for just receiving focus in simple - * components. Toolkit uses this interface in addition to GWT's HasFocus to pass + * components. Vaadin uses this interface in addition to GWT's HasFocus to pass * focus requests from server to actual ui widgets in browsers. * * So in to make your server side focusable component receive focus on client diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java b/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java index 641b729521..31d2ea749a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java +++ b/src/com/vaadin/terminal/gwt/client/ui/TreeAction.java @@ -24,7 +24,7 @@ public class TreeAction extends Action { /** * Sends message to server that this action has been fired. Messages are - * "standard" Toolkit messages whose value is comma separated pair of + * "standard" Vaadin messages whose value is comma separated pair of * targetKey (row, treeNod ...) and actions id. * * Variablename is always "action". diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java index eb0c432464..ce1fa343f3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java @@ -314,7 +314,7 @@ public class VPopupView extends HTML implements Container { /* * - * We need a hack make popup act as a child of VPopupView in toolkits + * We need a hack make popup act as a child of VPopupView in Vaadin's * component tree, but work in default GWT manner when closing or * opening. * diff --git a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java index 9aeea15536..84b3c78405 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VToolkitOverlay.java @@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.RootPanel; import com.vaadin.terminal.gwt.client.BrowserInfo; /** - * In Toolkit UI this Overlay should always be used for all elements that + * In Vaadin UI this Overlay should always be used for all elements that * temporary float over other components like context menus etc. This is to deal * stacking order correctly with VWindow objects. */ diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java index b3ed3e9347..08e9e3cf56 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java @@ -303,7 +303,7 @@ public class VView extends SimplePanel implements Container, /* * Two types of Widgets can be focused, either implementing - * GWT HasFocus of a thinner Toolkit specific Focusable + * GWT HasFocus of a thinner Vaadin specific Focusable * interface. */ if (toBeFocused instanceof HasFocus) { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index aba2c1ba66..716194e618 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -407,7 +407,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { return; } - // Send initial AJAX page that kickstarts Toolkit application + // Send initial AJAX page that kickstarts a Vaadin application writeAjaxPage(request, response, window, themeName, application); } catch (final SessionExpired e) { @@ -1204,7 +1204,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet { // supported, but the hack is make it possible to use linux and // hosted mode browser for debugging. Note that due this hack, // debugging gwt code in portals with linux will be problematic if - // there are multiple toolkit portlets visible at the same time. + // there are multiple Vaadin portlets visible at the same time. // TODO remove this when hosted mode on linux gets newer gecko page.write("