@Override
public void onConnectorHierarchyChange(ConnectorHierarchyChangeEvent event) {
- ComponentConnector newChild = null;
+ VCustomComponent customComponent = getWidget();
if (getChildComponents().size() == 1) {
- newChild = getChildComponents().get(0);
+ ComponentConnector newChild = getChildComponents().get(0);
+ customComponent.setWidget(newChild.getWidget());
+ } else {
+ customComponent.setWidget(null);
}
- VCustomComponent customComponent = getWidget();
- customComponent.setWidget(newChild.getWidget());
-
}
}
--- /dev/null
+<?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="" />
+<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.customcomponent.CustomComponentHideContent?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VLabel[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>vaadin=runcomvaadintestscomponentscustomcomponentCustomComponentHideContent::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[0]/VCustomComponent[0]/VLabel[0]</td>
+ <td>This is the content</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
--- /dev/null
+/*
+ * Copyright 2012 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.customcomponent;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.Label;
+
+public class CustomComponentHideContent extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final Label content = new Label("This is the content");
+ CustomComponent customComponent = new CustomComponent(content);
+ addComponent(customComponent);
+
+ addComponent(new Button("Toggle content visibility",
+ new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ content.setVisible(!content.isVisible());
+ }
+ }));
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Hiding the composition root of a CustomComponent should not cause client-side exceptions";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return Integer.valueOf(9895);
+ }
+
+}
projects / vaadin-framework.git / commitdiff