From 6a27bd3b0310ebc7b56f18c1cadd33fcda73084d Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 18 May 2009 10:38:49 +0000 Subject: Incomplete - task#2904 Toolkit -> Vaadin renames svn changeset:7850/svn branch:6.0 --- src/com/vaadin/tests/CustomLayoutDemo.java | 10 +++++----- src/com/vaadin/tests/LayoutDemo.java | 2 +- src/com/vaadin/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 ++++---- src/com/vaadin/tests/TreeFilesystemContainer.java | 15 +++++++-------- src/com/vaadin/tests/UsingObjectsInSelect.java | 6 +++--- src/com/vaadin/tests/featurebrowser/IntroWelcome.java | 3 +-- src/com/vaadin/tests/layouts/DeepComponentTrees.java | 4 ++-- src/com/vaadin/tests/tickets/Ticket1362Login.java | 4 ++-- 11 files changed, 35 insertions(+), 38 deletions(-) (limited to 'src/com/vaadin/tests') diff --git a/src/com/vaadin/tests/CustomLayoutDemo.java b/src/com/vaadin/tests/CustomLayoutDemo.java index df99f145a6..ac0507332b 100644 --- a/src/com/vaadin/tests/CustomLayoutDemo.java +++ b/src/com/vaadin/tests/CustomLayoutDemo.java @@ -18,11 +18,11 @@ import com.vaadin.ui.Component.Listener; /** * This example demonstrates custom layout. All components created here are * placed using custom.html file. Custom layouts may be created with any web - * designer tool such as Dreamweaver. To place Toolkit components into html - * page, use divs with location tag as an identifier for Toolkit components, see - * html page (themes/example/layout/custom.html) and source code below. Body - * panel contents are changed when menu items are clicked. Contents are HTML - * pages located at themes/example/layout directory. + * designer tool such as Dreamweaver. To place Vaadin components into html page, + * use divs with location tag as an identifier for Vaadin components, see html + * page (themes/example/layout/custom.html) and source code below. Body panel + * contents are changed when menu items are clicked. Contents are HTML pages + * located at themes/example/layout directory. * * @author IT Mill Ltd. * @since 4.0.0 diff --git a/src/com/vaadin/tests/LayoutDemo.java b/src/com/vaadin/tests/LayoutDemo.java index cbdc7baf45..cdeeebfa37 100644 --- a/src/com/vaadin/tests/LayoutDemo.java +++ b/src/com/vaadin/tests/LayoutDemo.java @@ -16,7 +16,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Window; /** - * This example demonstrates layouts. Layouts are populated with sample Toolkit + * This example demonstrates layouts. Layouts are populated with sample Vaadin * UI components. * * @author IT Mill Ltd. diff --git a/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java index aeec8176d8..cf03074e56 100644 --- a/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -22,7 +22,7 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { private final Label result; - private static final String DESCRIPTION = "Hyphothesis: Toolkit 4 has major architechtural problem when adding " + private static final String DESCRIPTION = "Hypothesis: Toolkit 4 has major architechtural problem when adding " + "small incrementall updates to a container which has either a lot or " + "some very slow components in it. Toolkit 5 has 'subtree caching' and a" + " small amount of logic in containers, so CommunicationManager can assure" diff --git a/src/com/vaadin/tests/QueryContainerDemo.java b/src/com/vaadin/tests/QueryContainerDemo.java index cb35e2c938..abd98016cd 100644 --- a/src/com/vaadin/tests/QueryContainerDemo.java +++ b/src/com/vaadin/tests/QueryContainerDemo.java @@ -17,21 +17,20 @@ import com.vaadin.ui.Window; /** * This example shows how Table, Select and Tree UI components can use - * Containers. QueryContainer is used to bind SQL table rows into Toolkit UI + * Containers. QueryContainer is used to bind SQL table rows into Vaadin UI * components. Table has few example actions added. Also embedding XHTML through * Label components is used. Demonstrates: how to create * com.vaadin.data.Container and set it as datasource to UI * components com.vaadin.ui.Component.Tree, how to receive - * ExpandEvent and implement - * com.vaadin.ui.Tree.ExpandListener, how to use - * com.vaadin.event.Action. + * ExpandEvent and implement com.vaadin.ui.Tree.ExpandListener, how + * to use com.vaadin.event.Action. * * @author IT Mill Ltd. * @since 4.0.0 * */ -public class QueryContainerDemo extends com.vaadin.Application - implements Action.Handler { +public class QueryContainerDemo extends com.vaadin.Application implements + Action.Handler { private static final String ACTION_DESCRIPTION = "Try right mouse button to initiate " + "actions menu.
Note: on Opera you use meta key " @@ -116,7 +115,7 @@ public class QueryContainerDemo extends com.vaadin.Application table.addActionHandler(this); table.setDescription(ACTION_DESCRIPTION); - // populate Toolkit table component with test SQL table rows + // populate Vaadin table component with test SQL table rows try { final QueryContainer qc = new QueryContainer( "SELECT * FROM employee", sampleDatabase.getConnection()); @@ -139,7 +138,7 @@ public class QueryContainerDemo extends com.vaadin.Application select.setCaption("All distinct units from employee table."); select.setItemCaptionPropertyId("UNIT"); - // populate Toolkit select component with test SQL table rows + // populate Vaadin select component with test SQL table rows try { final QueryContainer qc = new QueryContainer( "SELECT DISTINCT UNIT FROM employee", sampleDatabase @@ -167,7 +166,7 @@ public class QueryContainerDemo extends com.vaadin.Application + "actions menu. Note: on Opera you use meta key " + "and left mouse button."); - // Populate Toolkit Tree using select component as data source + // Populate Vaadin Tree using select component as data source tree.setContainerDataSource(select.getContainerDataSource()); } diff --git a/src/com/vaadin/tests/RandomLayoutStress.java b/src/com/vaadin/tests/RandomLayoutStress.java index 5bfff45a3a..a6277a8262 100644 --- a/src/com/vaadin/tests/RandomLayoutStress.java +++ b/src/com/vaadin/tests/RandomLayoutStress.java @@ -23,7 +23,7 @@ import com.vaadin.ui.TextField; import com.vaadin.ui.Window; /** - * This example demonstrates layouts. Layouts are populated with sample Toolkit + * This example demonstrates layouts. Layouts are populated with sample Vaadin * UI components. * * @author IT Mill Ltd. diff --git a/src/com/vaadin/tests/TreeFilesystem.java b/src/com/vaadin/tests/TreeFilesystem.java index 4291498c02..202338cd50 100644 --- a/src/com/vaadin/tests/TreeFilesystem.java +++ b/src/com/vaadin/tests/TreeFilesystem.java @@ -15,10 +15,10 @@ import com.vaadin.ui.Window; import com.vaadin.ui.Tree.ExpandEvent; /** - * Browsable file explorer using Toolkit Tree component. Demonstrates: how to - * add items hierarchially into - * com.vaadin.ui.Component.Tree, how to receive ExpandEvent - * and implement com.vaadin.ui.Tree.ExpandListener. + * Browsable file explorer using Vaadin Tree component. Demonstrates: how to add + * items hierarchically into com.vaadin.ui.Component.Tree, how to + * receive ExpandEvent and implement + * com.vaadin.ui.Tree.ExpandListener. * * @since 4.0.0 * diff --git a/src/com/vaadin/tests/TreeFilesystemContainer.java b/src/com/vaadin/tests/TreeFilesystemContainer.java index dc56f687dc..52154fbe22 100644 --- a/src/com/vaadin/tests/TreeFilesystemContainer.java +++ b/src/com/vaadin/tests/TreeFilesystemContainer.java @@ -19,18 +19,17 @@ import com.vaadin.ui.Component.Event; import com.vaadin.ui.Component.Listener; /** - * Browsable file explorer using Toolkit Tree component. Demonstrates: how to - * use com.vaadin.ui.Component.Tree datasource container, - * how to create com.vaadin.data.util.FilesystemContainer, - * how to read com.vaadin.ui.Component.Event objects, how - * to receive and handle any event by implementing - * com.vaadin.ui.Component.Listener. + * Browsable file explorer using Vaadin Tree component. Demonstrates: how to use + * com.vaadin.ui.Component.Tree datasource container, how to create + * com.vaadin.data.util.FilesystemContainer, how to read + * com.vaadin.ui.Component.Event objects, how to receive and handle + * any event by implementing com.vaadin.ui.Component.Listener. * * @since 4.0.0 * */ -public class TreeFilesystemContainer extends com.vaadin.Application - implements Listener { +public class TreeFilesystemContainer extends com.vaadin.Application implements + Listener { // Filesystem explorer panel and it's components private final Panel explorerPanel = new Panel("Filesystem explorer"); diff --git a/src/com/vaadin/tests/UsingObjectsInSelect.java b/src/com/vaadin/tests/UsingObjectsInSelect.java index 6a608f17f3..2fc0fc5eac 100644 --- a/src/com/vaadin/tests/UsingObjectsInSelect.java +++ b/src/com/vaadin/tests/UsingObjectsInSelect.java @@ -14,8 +14,8 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Select; import com.vaadin.ui.Window; -public class UsingObjectsInSelect extends com.vaadin.Application - implements ValueChangeListener { +public class UsingObjectsInSelect extends com.vaadin.Application implements + ValueChangeListener { private final Select select = new Select(); private final Label selectedTask = new Label("Selected task", @@ -67,7 +67,7 @@ public class UsingObjectsInSelect extends com.vaadin.Application } /** - * Sample class which is bind in Toolkit components + * Sample class which is bound to Vaadin components * */ public class Task { diff --git a/src/com/vaadin/tests/featurebrowser/IntroWelcome.java b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java index cffb4c7994..d9c20b96b2 100644 --- a/src/com/vaadin/tests/featurebrowser/IntroWelcome.java +++ b/src/com/vaadin/tests/featurebrowser/IntroWelcome.java @@ -53,8 +53,7 @@ public class IntroWelcome extends Feature implements URIHandler, // TODO Add browser agent string private final String description = WELCOME_TEXT_LOWER - + "

Vaadin Toolkit version: " - + ApplicationServlet.VERSION; + + "

Vaadin version: " + ApplicationServlet.VERSION; public IntroWelcome() { super(); diff --git a/src/com/vaadin/tests/layouts/DeepComponentTrees.java b/src/com/vaadin/tests/layouts/DeepComponentTrees.java index 7ee89b35db..e13cdf5c3a 100644 --- a/src/com/vaadin/tests/layouts/DeepComponentTrees.java +++ b/src/com/vaadin/tests/layouts/DeepComponentTrees.java @@ -18,7 +18,7 @@ public class DeepComponentTrees extends TestBase { @Override protected String getDescription() { - return "Toolkit should not choke on deep component trees. 15 levels should be minimum to survive."; + return "Vaadin should not choke on deep component trees. 15 levels should be minimum to survive."; } @Override @@ -89,7 +89,7 @@ public class DeepComponentTrees extends TestBase { layout = lo; } layout.addComponent(new Label( - "FF did it! Toolkit, Mozilla and you win! Dare to try again?")); + "FF did it! Vaadin, Mozilla and you win! Dare to try again?")); root.setLayout(r); } diff --git a/src/com/vaadin/tests/tickets/Ticket1362Login.java b/src/com/vaadin/tests/tickets/Ticket1362Login.java index e6ed473285..e876ae4808 100644 --- a/src/com/vaadin/tests/tickets/Ticket1362Login.java +++ b/src/com/vaadin/tests/tickets/Ticket1362Login.java @@ -32,7 +32,7 @@ import com.vaadin.ui.Window.Notification; * * TODO theme * - * TODO refine docs, make LoginBox a standard toolkit component + * TODO refine docs, make LoginBox a standard Vaadin component * * TODO article * @@ -53,7 +53,7 @@ public class Ticket1362Login extends Application { + "" + "Iframe generated by LoginBox. PW managers can autofill form. Form handled by LoginBox " + "that will fire LoginEvents. Will post into another iframe, from where the script " - + "will find toolkit client that will be force synced.
" + + "will find Vaadin client that will be force synced. " + "Username : " + "Password : " + "" + "
" -- cgit v1.2.3