Renamed "Contents" to "Data source"

svn changeset:15586/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxes2.java
index 45d4728f49925040c2b35b3036c2533f063224b2..c3c3bd896807d97d7cd36275771d5e687a86cc76 100644 (file)
--- 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<ComboBox> {
     @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 b5bb1ddaa72d9ec74da09a89f7a7c6ad85adf4ee..45a8e465535894a6f9414cdd3c45889fc45cdeae 100644 (file)
--- 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<ListSelect> {
         options.put("100", 100);\r
         options.put("1000", 1000);\r
 \r
-        super.createSelectAction("Columns", CATEGORY_CONTENT, options, "-",\r
+        super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-",\r
                 columnsAction);\r
 \r
     }\r
@@ -44,7 +44,7 @@ public class ListSelects extends AbstractSelectTestCase<ListSelect> {
         options.put("100", 100);\r
         options.put("1000", 1000);\r
 \r
-        super.createSelectAction("Rows", CATEGORY_CONTENT, options, "-",\r
+        super.createSelectAction("Rows", CATEGORY_DATA_SOURCE, options, "-",\r
                 rowsAction);\r
 \r
     }\r

diff --git a/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/tests/src/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index 50ed38d85ebf56038ce10d1f8dac296b1bbb2ab8..c5b97d4e870e2d5a3202e6bc42174016a7fa58fa 100644 (file)
--- 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<T extends AbstractSelect> extends\r
         AbstractFieldTestCase<T> implements ItemClickListener {\r
 \r
-    protected static final String CATEGORY_CONTENT = "Contents";\r
+    protected static final String CATEGORY_DATA_SOURCE = "Data source";\r
 \r
     private int items = 0;\r
     private int properties = 0;\r
@@ -23,8 +23,8 @@ public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
     protected void createActions() {\r
         super.createActions();\r
         createNullSelectAllowedCheckbox(CATEGORY_SELECTION);\r
-        createPropertiesInContainerSelect(CATEGORY_CONTENT);\r
-        createItemsInContainerSelect(CATEGORY_CONTENT);\r
+        createPropertiesInContainerSelect(CATEGORY_DATA_SOURCE);\r
+        createItemsInContainerSelect(CATEGORY_DATA_SOURCE);\r
 \r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java
index 15a273377c9f4de947e1927fa701e5d88a38033c..c581091b251b9078956e7ae35e1eddfd2c527dc9 100644 (file)
--- 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<Table> implements
         createHeaderClickListenerCheckbox(CATEGORY_LISTENERS);\r
         createFooterClickListenerCheckbox(CATEGORY_LISTENERS);\r
 \r
-        createRowHeaderModeSelect(CATEGORY_CONTENT);\r
+        createRowHeaderModeSelect(CATEGORY_DATA_SOURCE);\r
 \r
         createHeaderVisibilitySelect(CATEGORY_HEADER);\r
         createHeaderTextCheckbox(CATEGORY_HEADER);\r

diff --git a/tests/src/com/vaadin/tests/components/tree/Trees.java b/tests/src/com/vaadin/tests/components/tree/Trees.java
index da6eb9fe87daa49a66867e22894a6a47606aae59..83457d370899dddafb8a7b1367f7f9ed383972d9 100644 (file)
--- 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<Tree> implements
         super.createActions();\r
 \r
         // Causes container changes so doing this first..\r
-        createRootItemSelectAction(CATEGORY_CONTENT);\r
+        createRootItemSelectAction(CATEGORY_DATA_SOURCE);\r
 \r
         createExpandCollapseActions(CATEGORY_FEATURES);\r
         createSelectionModeSelect(CATEGORY_SELECTION);\r
-        createChildrenAllowedAction(CATEGORY_CONTENT);\r
+        createChildrenAllowedAction(CATEGORY_DATA_SOURCE);\r
 \r
         createListeners(CATEGORY_LISTENERS);\r
         createItemStyleGenerator(CATEGORY_FEATURES);\r

diff --git a/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/tests/src/com/vaadin/tests/components/twincolselect/TwinColSelects.java
index 896cbcc5035e44e6b277f5fb1a1156b3ad83b65f..ebbddc5f6a45045e8d08a2d0fe9dc7d5cec60e76 100644 (file)
--- 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<TwinColSelect> {
         options.put("100", 100);\r
         options.put("1000", 1000);\r
 \r
-        super.createSelectAction("Columns", CATEGORY_CONTENT, options, "-",\r
+        super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-",\r
                 columnsAction);\r
 \r
     }\r
@@ -44,7 +44,7 @@ public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> {
         options.put("100", 100);\r
         options.put("1000", 1000);\r
 \r
-        super.createSelectAction("Rows", CATEGORY_CONTENT, options, "-",\r
+        super.createSelectAction("Rows", CATEGORY_DATA_SOURCE, options, "-",\r
                 rowsAction);\r
 \r
     }\r