From: John Ahlroos Date: Tue, 4 Sep 2012 12:18:26 +0000 (+0300) Subject: Fixed test DOM path resolution X-Git-Tag: 7.0.0.beta1~198 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5ce22479bc99f39821497f726ee3b0c1a85bbbd;p=vaadin-framework.git Fixed test DOM path resolution --- diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java index 5c52c4ebcc..694c57ed5c 100644 --- a/client/src/com/vaadin/client/ComponentLocator.java +++ b/client/src/com/vaadin/client/ComponentLocator.java @@ -28,6 +28,7 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.SubPartAware; import com.vaadin.client.ui.UI.VUI; import com.vaadin.client.ui.gridlayout.VGridLayout; +import com.vaadin.client.ui.orderedlayout.VBoxLayout; import com.vaadin.client.ui.orderedlayout.VMeasuringOrderedLayout; import com.vaadin.client.ui.tabsheet.VTabsheetPanel; import com.vaadin.client.ui.window.VWindow; @@ -499,6 +500,11 @@ public class ComponentLocator { widgetClassName = "VBoxLayout"; } + if (w instanceof VBoxLayout + && "ChildComponentContainer".equals(widgetClassName)) { + widgetClassName = "VBoxLayout$Slot"; + } + if (w instanceof VTabsheetPanel && widgetPosition != 0) { // TabSheetPanel now only contains 1 connector => the index // is always 0 which indicates the widget in the active tab