From e9f3fcc211c0f05f606e75baee969c90bc1a5387 Mon Sep 17 00:00:00 2001 From: John Ahlroos Date: Wed, 24 Jul 2013 15:28:15 +0300 Subject: [PATCH] Fix issue with hidden component cells in Table and TreeTable #12119 Change-Id: I2f491d04ff177f7f0ce104c96b1c4a84ee7a2bc0 --- server/src/com/vaadin/ui/Table.java | 5 +- .../table/HiddenComponentCells.html | 27 ++++++++ .../table/HiddenComponentCells.java | 67 +++++++++++++++++++ 3 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html create mode 100644 uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 5dbf927658..3507e6b0a5 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -54,6 +54,7 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.server.KeyMapper; +import com.vaadin.server.LegacyCommunicationManager; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; @@ -3784,7 +3785,9 @@ public class Table extends AbstractSelect implements Action.Container, + currentColumn][indexInRowbuffer])) { final Component c = (Component) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]; - if (c == null) { + if (c == null + || !LegacyCommunicationManager + .isComponentVisibleToClient(c)) { target.addText(""); } else { LegacyPaint.paint(c, target); diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html new file mode 100644 index 0000000000..22ba16abca --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html @@ -0,0 +1,27 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.table.HiddenComponentCells?restartApplication
screenCapturehidden-cells
+ + diff --git a/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java new file mode 100644 index 0000000000..32046932cc --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java @@ -0,0 +1,67 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * + */ +package com.vaadin.tests.components.table; + +import com.vaadin.data.Item; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; + +/** + * + * @since + * @author Vaadin Ltd + */ +public class HiddenComponentCells extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final Table tbl = new Table(); + tbl.addContainerProperty("col1", Label.class, null); + tbl.addContainerProperty("col2", Label.class, null); + + for (int rows = 0; rows < 20; rows++) { + + Item item = tbl.addItem(rows); + + Label cb = new Label("col1"); + cb.setVisible(rows % 2 == 0); + item.getItemProperty("col1").setValue(cb); + + cb = new Label("col2"); + cb.setVisible((rows + 1) % 2 == 0); + item.getItemProperty("col2").setValue(cb); + } + + addComponent(tbl); + } + + @Override + protected String getTestDescription() { + return "Hiding a component in the Table should not cause exceptions.
Every other cell in the table should be hidden."; + } + + @Override + protected Integer getTicketNumber() { + return 12119; + } + +} -- 2.39.5