From: Jens Jansson Date: Tue, 3 Jan 2012 10:47:42 +0000 (+0200) Subject: fixed a test which relied on the ColumnHeaderMode, which was worked on in the last... X-Git-Tag: 7.0.0.alpha2~542 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a523ac9af49f70feb8a72af9af03fc84866be5db;p=vaadin-framework.git fixed a test which relied on the ColumnHeaderMode, which was worked on in the last commit --- diff --git a/tests/testbench/com/vaadin/tests/components/table/Tables.java b/tests/testbench/com/vaadin/tests/components/table/Tables.java index 7da5a590a1..7b295ae406 100644 --- a/tests/testbench/com/vaadin/tests/components/table/Tables.java +++ b/tests/testbench/com/vaadin/tests/components/table/Tables.java @@ -16,6 +16,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Table; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; +import com.vaadin.ui.Table.ColumnHeaderMode; import com.vaadin.ui.Table.ColumnResizeEvent; import com.vaadin.ui.Table.ColumnResizeListener; import com.vaadin.ui.Table.FooterClickEvent; @@ -173,9 +174,9 @@ public class Tables extends AbstractSelectTestCase } }; - private Command columnHeaderModeCommand = new Command() { + private Command columnHeaderModeCommand = new Command() { - public void execute(T c, Integer columnHeaderMode, Object data) { + public void execute(T c, ColumnHeaderMode columnHeaderMode, Object data) { c.setColumnHeaderMode(columnHeaderMode); } @@ -476,13 +477,12 @@ public class Tables extends AbstractSelectTestCase } private void createColumnHeaderMode(String category) { - LinkedHashMap columnHeaderModeOptions = new LinkedHashMap(); - columnHeaderModeOptions.put("Hidden", Table.COLUMN_HEADER_MODE_HIDDEN); - columnHeaderModeOptions.put("Id", Table.COLUMN_HEADER_MODE_ID); - columnHeaderModeOptions.put("Explicit", - Table.COLUMN_HEADER_MODE_EXPLICIT); + LinkedHashMap columnHeaderModeOptions = new LinkedHashMap(); + columnHeaderModeOptions.put("Hidden", ColumnHeaderMode.HIDDEN); + columnHeaderModeOptions.put("Id", ColumnHeaderMode.ID); + columnHeaderModeOptions.put("Explicit", ColumnHeaderMode.EXPLICIT); columnHeaderModeOptions.put("Explicit defaults id", - Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); + ColumnHeaderMode.EXPLICIT_DEFAULTS_ID); createSelectAction("Column header mode", category, columnHeaderModeOptions, "Explicit defaults id", @@ -740,17 +740,17 @@ public class Tables extends AbstractSelectTestCase } protected void createHeaderVisibilitySelect(String category) { - LinkedHashMap options = new LinkedHashMap(); - options.put("Explicit", Table.COLUMN_HEADER_MODE_EXPLICIT); + LinkedHashMap options = new LinkedHashMap(); + options.put("Explicit", ColumnHeaderMode.EXPLICIT); options.put("Explicit defaults id", - Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); - options.put("Id", Table.COLUMN_HEADER_MODE_ID); - options.put("Hidden", Table.COLUMN_HEADER_MODE_HIDDEN); + ColumnHeaderMode.EXPLICIT_DEFAULTS_ID); + options.put("Id", ColumnHeaderMode.ID); + options.put("Hidden", ColumnHeaderMode.HIDDEN); createSelectAction("Header mode", category, options, - "Explicit defaults id", new Command() { + "Explicit defaults id", new Command() { - public void execute(T c, Integer value, Object data) { + public void execute(T c, ColumnHeaderMode value, Object data) { c.setColumnHeaderMode(value); }