From 980daf7ab78e15c1e8917b964d8847c8f64ae596 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Sun, 17 Oct 2010 18:13:58 +0000 Subject: [PATCH] Renamed "Contents" to "Data source" svn changeset:15586/svn branch:6.4 --- .../com/vaadin/tests/components/combobox/ComboBoxes2.java | 2 +- .../com/vaadin/tests/components/listselect/ListSelects.java | 4 ++-- .../tests/components/select/AbstractSelectTestCase.java | 6 +++--- tests/src/com/vaadin/tests/components/table/Tables.java | 2 +- tests/src/com/vaadin/tests/components/tree/Trees.java | 4 ++-- .../tests/components/twincolselect/TwinColSelects.java | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java index 45d4728f49..c3c3bd8968 100644 --- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java @@ -16,7 +16,7 @@ public class ComboBoxes2 extends AbstractSelectTestCase { @Override protected void createActions() { super.createActions(); - createItemIconSelect(CATEGORY_CONTENT); + createItemIconSelect(CATEGORY_DATA_SOURCE); } private void createItemIconSelect(String category) { diff --git a/tests/src/com/vaadin/tests/components/listselect/ListSelects.java b/tests/src/com/vaadin/tests/components/listselect/ListSelects.java index b5bb1ddaa7..45a8e46553 100644 --- a/tests/src/com/vaadin/tests/components/listselect/ListSelects.java +++ b/tests/src/com/vaadin/tests/components/listselect/ListSelects.java @@ -29,7 +29,7 @@ public class ListSelects extends AbstractSelectTestCase { options.put("100", 100); options.put("1000", 1000); - super.createSelectAction("Columns", CATEGORY_CONTENT, options, "-", + super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-", columnsAction); } @@ -44,7 +44,7 @@ public class ListSelects extends AbstractSelectTestCase { options.put("100", 100); options.put("1000", 1000); - super.createSelectAction("Rows", CATEGORY_CONTENT, options, "-", + super.createSelectAction("Rows", CATEGORY_DATA_SOURCE, options, "-", rowsAction); } diff --git a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java index 50ed38d85e..c5b97d4e87 100644 --- a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java +++ b/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java @@ -14,7 +14,7 @@ import com.vaadin.ui.AbstractSelect; public abstract class AbstractSelectTestCase extends AbstractFieldTestCase implements ItemClickListener { - protected static final String CATEGORY_CONTENT = "Contents"; + protected static final String CATEGORY_DATA_SOURCE = "Data source"; private int items = 0; private int properties = 0; @@ -23,8 +23,8 @@ public abstract class AbstractSelectTestCase extends protected void createActions() { super.createActions(); createNullSelectAllowedCheckbox(CATEGORY_SELECTION); - createPropertiesInContainerSelect(CATEGORY_CONTENT); - createItemsInContainerSelect(CATEGORY_CONTENT); + createPropertiesInContainerSelect(CATEGORY_DATA_SOURCE); + createItemsInContainerSelect(CATEGORY_DATA_SOURCE); } diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java index 15a273377c..c581091b25 100644 --- a/tests/src/com/vaadin/tests/components/table/Tables.java +++ b/tests/src/com/vaadin/tests/components/table/Tables.java @@ -133,7 +133,7 @@ public class Tables extends AbstractSelectTestCase implements createHeaderClickListenerCheckbox(CATEGORY_LISTENERS); createFooterClickListenerCheckbox(CATEGORY_LISTENERS); - createRowHeaderModeSelect(CATEGORY_CONTENT); + createRowHeaderModeSelect(CATEGORY_DATA_SOURCE); createHeaderVisibilitySelect(CATEGORY_HEADER); createHeaderTextCheckbox(CATEGORY_HEADER); diff --git a/tests/src/com/vaadin/tests/components/tree/Trees.java b/tests/src/com/vaadin/tests/components/tree/Trees.java index da6eb9fe87..83457d3708 100644 --- a/tests/src/com/vaadin/tests/components/tree/Trees.java +++ b/tests/src/com/vaadin/tests/components/tree/Trees.java @@ -86,11 +86,11 @@ public class Trees extends AbstractSelectTestCase implements super.createActions(); // Causes container changes so doing this first.. - createRootItemSelectAction(CATEGORY_CONTENT); + createRootItemSelectAction(CATEGORY_DATA_SOURCE); createExpandCollapseActions(CATEGORY_FEATURES); createSelectionModeSelect(CATEGORY_SELECTION); - createChildrenAllowedAction(CATEGORY_CONTENT); + createChildrenAllowedAction(CATEGORY_DATA_SOURCE); createListeners(CATEGORY_LISTENERS); createItemStyleGenerator(CATEGORY_FEATURES); diff --git a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java index 896cbcc503..ebbddc5f6a 100644 --- a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java +++ b/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java @@ -29,7 +29,7 @@ public class TwinColSelects extends AbstractSelectTestCase { options.put("100", 100); options.put("1000", 1000); - super.createSelectAction("Columns", CATEGORY_CONTENT, options, "-", + super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-", columnsAction); } @@ -44,7 +44,7 @@ public class TwinColSelects extends AbstractSelectTestCase { options.put("100", 100); options.put("1000", 1000); - super.createSelectAction("Rows", CATEGORY_CONTENT, options, "-", + super.createSelectAction("Rows", CATEGORY_DATA_SOURCE, options, "-", rowsAction); } -- 2.39.5