]> source.dussan.org Git - vaadin-framework.git/commitdiff
Fix issue with hidden component cells in Table and TreeTable #12119
authorJohn Ahlroos <john@vaadin.com>
Wed, 24 Jul 2013 12:28:15 +0000 (15:28 +0300)
committerVaadin Code Review <review@vaadin.com>
Wed, 24 Jul 2013 12:58:25 +0000 (12:58 +0000)
Change-Id: I2f491d04ff177f7f0ce104c96b1c4a84ee7a2bc0

server/src/com/vaadin/ui/Table.java
uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.html [new file with mode: 0644]
uitest/src/com/vaadin/tests/components/table/HiddenComponentCells.java [new file with mode: 0644]

index 5dbf9276582563896c54c856caea172771a0e304..3507e6b0a524ac1016a386c8f38f2bab604142f3 100644 (file)
@@ -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 (file)
index 0000000..22ba16a
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:7171/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.table.HiddenComponentCells?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>hidden-cells</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
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 (file)
index 0000000..3204693
--- /dev/null
@@ -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. <br/> Every other cell in the table should be hidden.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12119;
+    }
+
+}