diff options
author | Henri Sara <hesara@vaadin.com> | 2016-07-14 15:14:18 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2016-08-11 10:01:04 +0000 |
commit | fd3617bba2d758ad78689116cfe444d6bfbc1664 (patch) | |
tree | 4c7e7c0e7e7f3b8ac2d2f532896e862ff418f50e /uitest | |
parent | 5e75657b387a99993ec17b03ab97bc32884fef80 (diff) | |
download | vaadin-framework-fd3617bba2d758ad78689116cfe444d6bfbc1664.tar.gz vaadin-framework-fd3617bba2d758ad78689116cfe444d6bfbc1664.zip |
Remove deprecated column based width support from selects
Change-Id: I233f205d3d0d7c0cf59e55531de09b7807d73548
Diffstat (limited to 'uitest')
4 files changed, 0 insertions, 74 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java index 8998fd3a3d..fcd38dfc9c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelects.java @@ -14,13 +14,6 @@ public class ListSelects extends AbstractSelectTestCase<ListSelect> { } }; - private Command<ListSelect, Integer> colsCommand = new Command<ListSelect, Integer>() { - @Override - public void execute(ListSelect c, Integer value, Object data) { - c.setColumns(value); - } - }; - @Override protected Class<ListSelect> getTestClass() { return ListSelect.class; @@ -30,7 +23,6 @@ public class ListSelects extends AbstractSelectTestCase<ListSelect> { protected void createActions() { super.createActions(); createRowsAction(CATEGORY_FEATURES); - createColsAction(CATEGORY_FEATURES); } private void createRowsAction(String category) { @@ -38,9 +30,4 @@ public class ListSelects extends AbstractSelectTestCase<ListSelect> { createSelectAction("Rows", category, options, "0", rowsCommand); } - private void createColsAction(String category) { - LinkedHashMap<String, Integer> options = createIntegerOptions(20); - createSelectAction("Columns", category, options, "0", colsCommand); - } - } diff --git a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java index 80b088f03a..5a78010d9b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java +++ b/uitest/src/main/java/com/vaadin/tests/components/nativeselect/NativeSelects.java @@ -1,7 +1,5 @@ package com.vaadin.tests.components.nativeselect; -import java.util.LinkedHashMap; - import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.NativeSelect; @@ -15,29 +13,6 @@ public class NativeSelects extends AbstractSelectTestCase<NativeSelect> { @Override protected void createActions() { super.createActions(); - createColumnSelectAction(); - } - - private void createColumnSelectAction() { - LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>(); - options.put("-", 0); - for (int i = 1; i <= 10; i++) { - options.put(String.valueOf(i), i); - } - options.put("50", 50); - options.put("100", 100); - options.put("1000", 1000); - - super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-", - columnsAction); - } - private Command<NativeSelect, Integer> columnsAction = new Command<NativeSelect, Integer>() { - - @Override - public void execute(NativeSelect c, Integer value, Object data) { - c.setColumns(value); - } - }; } diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java index b27dfa0ec8..de92ba9e81 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/select/TwinColSelectTest.java @@ -13,13 +13,6 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { } }; - private Command<TwinColSelect, Integer> colsCommand = new Command<TwinColSelect, Integer>() { - @Override - public void execute(TwinColSelect c, Integer value, Object data) { - c.setColumns(value); - } - }; - private Command<TwinColSelect, String> leftColumnCaptionCommand = new Command<TwinColSelect, String>() { @Override @@ -45,7 +38,6 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { protected void createActions() { super.createActions(); createRowsAction(CATEGORY_FEATURES); - createColsAction(CATEGORY_FEATURES); createCaptionActions(CATEGORY_FEATURES); } @@ -54,11 +46,6 @@ public class TwinColSelectTest extends AbstractSelectTestCase<TwinColSelect> { createSelectAction("Rows", category, options, "0", rowsCommand); } - private void createColsAction(String category) { - LinkedHashMap<String, Integer> options = createIntegerOptions(20); - createSelectAction("Columns", category, options, "0", colsCommand); - } - private void createCaptionActions(String category) { createSelectAction("Left column caption", category, createCaptionOptions(), "-", leftColumnCaptionCommand); diff --git a/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java index fc1b11bb94..25c2bed741 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java +++ b/uitest/src/main/java/com/vaadin/tests/components/twincolselect/TwinColSelects.java @@ -15,25 +15,9 @@ public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> { @Override protected void createActions() { super.createActions(); - createColumnSelectAction(); createRowSelectAction(); } - private void createColumnSelectAction() { - LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>(); - options.put("-", 0); - for (int i = 1; i <= 10; i++) { - options.put(String.valueOf(i), i); - } - options.put("50", 50); - options.put("100", 100); - options.put("1000", 1000); - - super.createSelectAction("Columns", CATEGORY_DATA_SOURCE, options, "-", - columnsAction); - - } - private void createRowSelectAction() { LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>(); options.put("-", 0); @@ -49,13 +33,6 @@ public class TwinColSelects extends AbstractSelectTestCase<TwinColSelect> { } - private Command<TwinColSelect, Integer> columnsAction = new Command<TwinColSelect, Integer>() { - - @Override - public void execute(TwinColSelect c, Integer value, Object data) { - c.setColumns(value); - } - }; private Command<TwinColSelect, Integer> rowsAction = new Command<TwinColSelect, Integer>() { @Override |