Changeset 50774894 in vaadin

Timestamp:

03/16/12 10:08:14 (14 months ago)

Author:

Artur Signell <artur@…>

Branches:

master, 7.0, f7f1e3ece5206c335487ce25f4e709370024109d

Children:

26c8a739

Parents:

6ff66f4a6

git-author:

Artur Signell <artur@…> (03/16/12 10:08:14)

git-committer:

Artur Signell <artur@…> (03/16/12 10:08:14)

Message:

Panel can have 0 children if its contents is hidden on server side

File:

• src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java (modified) (1 diff)

src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java

@@ -263 +263 @@
     public void connectorHierarchyChanged(ConnectorHierarchyChangedEvent event) {
         super.connectorHierarchyChanged(event);
-        // We always have 1 child, Panel takes care of ensuring content is never
-        // null
-        ComponentConnector newChild = getChildren().get(0);
-        Widget newChildWidget = newChild.getWidget();
+        // We always have 1 child, unless the child is hidden
+        Widget newChildWidget = null;
+        if (getChildren().size() == 1) {
+            ComponentConnector newChild = getChildren().get(0);
+            newChildWidget = newChild.getWidget();
+        }
 
         getWidget().setWidget(newChildWidget);