From a53d4876f2e1b0edf34444e118c79b881f5549f9 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Tue, 23 Jul 2013 16:12:49 +0300
Subject: Verify the connector hierarchy if assertions are enabled (#12271)

Change-Id: I87632abe9d86927b7ba4254724fedfdb04513205
---
 server/src/com/vaadin/ui/ConnectorTracker.java | 50 ++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'server')

diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java
index c2aeebcd44..0f8ec60104 100644
--- a/server/src/com/vaadin/ui/ConnectorTracker.java
+++ b/server/src/com/vaadin/ui/ConnectorTracker.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
@@ -271,6 +272,12 @@ public class ConnectorTracker implements Serializable {
         }
         unregisteredConnectors.clear();
 
+        // Do this expensive check only with assertions enabled
+        assert isHierarchyComplete() : "The connector hierarchy is corrupted. "
+                + "Check for missing calls to super.setParent(), super.attach() and super.detach() "
+                + "and that all custom component containers call child.setParent(this) when a child is added and child.setParent(null) when the child is no longer used. "
+                + "See previous log messages for details.";
+
         // remove detached components from paintableIdMap so they
         // can be GC'ed
         Iterator<String> iterator = connectorIdToConnector.keySet().iterator();
@@ -313,6 +320,49 @@ public class ConnectorTracker implements Serializable {
         cleanStreamVariables();
     }
 
+    private boolean isHierarchyComplete() {
+        boolean noErrors = true;
+
+        Set<ClientConnector> danglingConnectors = new HashSet<ClientConnector>(
+                connectorIdToConnector.values());
+
+        LinkedList<ClientConnector> stack = new LinkedList<ClientConnector>();
+        stack.add(uI);
+        while (!stack.isEmpty()) {
+            ClientConnector connector = stack.pop();
+            danglingConnectors.remove(connector);
+
+            Iterable<ClientConnector> children = AbstractClientConnector
+                    .getAllChildrenIterable(connector);
+            for (ClientConnector child : children) {
+                stack.add(child);
+
+                if (child.getParent() != connector) {
+                    noErrors = false;
+                    getLogger()
+                            .log(Level.WARNING,
+                                    "{0} claims that {1} is its child, but the child claims {2} is its parent.",
+                                    new Object[] {
+                                            getConnectorString(connector),
+                                            getConnectorString(child),
+                                            getConnectorString(child
+                                                    .getParent()) });
+                }
+            }
+        }
+
+        for (ClientConnector dangling : danglingConnectors) {
+            noErrors = false;
+            getLogger()
+                    .log(Level.WARNING,
+                            "{0} claims that {1} is its parent, but the parent does not acknowledge the parenthood.",
+                            new Object[] { getConnectorString(dangling),
+                                    getConnectorString(dangling.getParent()) });
+        }
+
+        return noErrors;
+    }
+
     /**
      * Finds the uI that the connector is attached to.
      * 
-- 
cgit v1.2.3


From e9f3fcc211c0f05f606e75baee969c90bc1a5387 Mon Sep 17 00:00:00 2001
From: John Ahlroos <john@vaadin.com>
Date: Wed, 24 Jul 2013 15:28:15 +0300
Subject: Fix issue with hidden component cells in Table and TreeTable #12119

Change-Id: I2f491d04ff177f7f0ce104c96b1c4a84ee7a2bc0
---
 server/src/com/vaadin/ui/Table.java                |  5 +-
 .../components/table/HiddenComponentCells.html     | 27 +++++++++
 .../components/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

(limited to 'server')

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 @@
+<?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
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. <br/> Every other cell in the table should be hidden.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12119;
+    }
+
+}
-- 
cgit v1.2.3