From 2dd50a7dbe5ef2385d2086a353920c1fd6466c4c Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Thu, 31 Jan 2013 16:05:37 +0200 Subject: [PATCH] Merge of (#8238) to Vaadin 7. Tabsheet detach handling update. Change-Id: I037d8503a9217918e63e1cc8b6e90abcafe7516f --- .../ui/tabsheet/TabsheetBaseConnector.java | 9 --- .../tabsheet/WrapTabSheetInTabSheet.html | 57 +++++++++++++++++++ .../tabsheet/WrapTabSheetInTabSheet.java | 2 +- 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java index 29d9e29f2c..9944ec5308 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java @@ -89,15 +89,6 @@ public abstract class TabsheetBaseConnector extends } } - // Detach any old tab widget, should be max 1 - for (Iterator iterator = oldWidgets.iterator(); iterator - .hasNext();) { - Widget oldWidget = iterator.next(); - if (oldWidget.isAttached()) { - oldWidget.removeFromParent(); - } - } - } @Override diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html new file mode 100644 index 0000000000..f1a54df714 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.html @@ -0,0 +1,57 @@ + + + + + + +WrapTabSheetInTabSheet + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
WrapTabSheetInTabSheet
open/run/com.vaadin.tests.components.tabsheet.WrapTabSheetInTabSheet?restartApplication
clickvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
verifyElementPresentvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]
clickvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
verifyElementPresentvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]
clickvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
verifyElementPresentvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VLabel[0]
clickvaadin=runcomvaadintestscomponentstabsheetWrapTabSheetInTabSheet::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VTabsheet[0]/VTabsheetPanel[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]
+ + \ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java index 7a676c63fb..1e56aa49a7 100644 --- a/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java +++ b/uitest/src/com/vaadin/tests/components/tabsheet/WrapTabSheetInTabSheet.java @@ -16,7 +16,7 @@ public class WrapTabSheetInTabSheet extends TestBase { addComponent(mainLayout); Button b = new Button("Wrap main layout in a TabSheet"); - b.addListener(new Button.ClickListener() { + b.addClickListener(new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { TabSheet tabsheet = new TabSheet(); -- 2.39.5