Add support for layout

Change-Id: I7a65de5a7e23d61347d64db0e1dc59cbb6ac5b94
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>

20 files changed, 59 insertions, 113 deletions

diff --git a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
index 63e2ec39b..e5ca143f5 100644
--- a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Export-Package: org.eclipse.eef.tests.internal;version="1.6.0";x-internal:=true,
 Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)",
  org.eclipse.eef;bundle-version="[1.6.0,2.0.0)",
  org.eclipse.eef.core;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.transaction;bundle-version="[1.8.0,2.0.0)",
  org.eclipse.sirius.common.interpreter;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)",
  org.eclipse.acceleo.query;bundle-version="[5.0.0,6.0.0)",
diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi
index 306641952..99325c920 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-ButtonLabel.xmi
@@ -6,12 +6,10 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFButtonDescription"
-          labelExpression=""
-          buttonLabelExpression="aql:'OK'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFButtonDescription"
+        labelExpression=""
+        buttonLabelExpression="aql:'OK'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi
index 86936be28..82d1d002f 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Help.xmi
@@ -6,12 +6,10 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFButtonDescription"
-          labelExpression=""
-          helpExpression="aql:'Click on the button'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFButtonDescription"
+        labelExpression=""
+        helpExpression="aql:'Click on the button'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi
index ca0312626..5d47be7ac 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/button/EEFButtonControllerTests-Label.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFButtonDescription"
-          labelExpression="aql:'Click:'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFButtonDescription"
+        labelExpression="aql:'Click:'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi
index 979608fe0..b664ebf5a 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Help.xmi
@@ -6,12 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFCheckboxDescription"
-          labelExpression=""
-          helpExpression="aql:'Abstract Help'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFCheckboxDescription"
+        helpExpression="aql:'Abstract Help'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi
index 91b4d939f..f47c3b986 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Label.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFCheckboxDescription"
-          labelExpression="aql:'Abstract:'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFCheckboxDescription"
+        labelExpression="aql:'Abstract:'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi
index 60077d60e..8a9dbd408 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/checkbox/EEFCheckboxControllerTests-Value.xmi
@@ -6,13 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFCheckboxDescription"
-          labelExpression=""
-          helpExpression=""
-          valueExpression="aql:true"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFCheckboxDescription"
+        valueExpression="aql:true"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi
index 9d194df32..dc57ec1a0 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Body.xmi
@@ -6,14 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFLabelDescription"
-          identifier=""
-          labelExpression=""
-          helpExpression=""
-          bodyExpression="aql:'This is the documentation of the project'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFLabelDescription"
+        bodyExpression="aql:'This is the documentation of the project'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi
index 0ea5d6c68..a73b24943 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Help.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFLabelDescription"
-          helpExpression="aql:'Documentation Help'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFLabelDescription"
+        helpExpression="aql:'Documentation Help'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi
index e9728cdc3..f9a93b5a1 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/label/EEFLabelControllerTests-Label.xmi
@@ -6,13 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFLabelDescription"
-          identifier=""
-          labelExpression="aql:'Documentation:'"
-          helpExpression=""/>
-    </container>
+    <controls
+        xsi:type="eef:EEFLabelDescription"
+        labelExpression="aql:'Documentation:'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi
index fa6549192..ecaef9dbd 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Help.xmi
@@ -6,13 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFRadioDescription"
-          labelExpression=""
-          helpExpression="aql:'Visibility Help'"
-          editExpression=""/>
-    </container>
+    <controls
+        xsi:type="eef:EEFRadioDescription"
+        helpExpression="aql:'Visibility Help'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi
index 1796c5e4f..fa33b720f 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Label.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFRadioDescription"
-          labelExpression="aql:'Visibility:'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFRadioDescription"
+        labelExpression="aql:'Visibility:'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi
index a45003da3..555335357 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/radio/EEFRadioControllerTests-Value.xmi
@@ -6,12 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFRadioDescription"
-          labelExpression=""
-          valueExpression="aql:'public'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFRadioDescription"
+        valueExpression="aql:'public'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi
index 55e938547..511f1e7ff 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Help.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFSelectDescription"
-          helpExpression="aql:'Visibility Help'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFSelectDescription"
+        helpExpression="aql:'Visibility Help'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi
index fbf6b4f38..959dcfab7 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Label.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFSelectDescription"
-          labelExpression="aql:'Visibility:'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFSelectDescription"
+        labelExpression="aql:'Visibility:'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi
index 755d59692..99824acb7 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/select/EEFSelectControllerTests-Value.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFSelectDescription"
-          valueExpression="aql:'public'"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFSelectDescription"
+        valueExpression="aql:'public'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi
index e47bbdadb..505a77b91 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Help.xmi
@@ -6,13 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFTextDescription"
-          labelExpression=""
-          helpExpression="aql:'Project Help'"
-          valueExpression=""/>
-    </container>
+    <controls
+        xsi:type="eef:EEFTextDescription"
+        helpExpression="aql:'Project Help'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi
index c1cb5b7be..266374fd7 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Label.xmi
@@ -6,12 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFTextDescription"
-          labelExpression="aql:self.name.toUpperFirst() + ':'"
-          valueExpression=""/>
-    </container>
+    <controls
+        xsi:type="eef:EEFTextDescription"
+        labelExpression="aql:self.name.toUpperFirst() + ':'"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi
index 5fb060d8a..b62ecf094 100644
--- a/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi
+++ b/tests/org.eclipse.eef.tests/data/controllers/text/EEFTextControllerTests-Value.xmi
@@ -6,11 +6,9 @@
     xmlns:eef="http://www.eclipse.org/eef"
     xsi:schemaLocation="http://www.eclipse.org/eef ../../../../org.eclipse.eef/model/eef.ecore">
   <groups>
-    <container>
-      <widgets
-          xsi:type="eef:EEFTextDescription"
-          valueExpression="aql:self.name"/>
-    </container>
+    <controls
+        xsi:type="eef:EEFTextDescription"
+        valueExpression="aql:self.name"/>
   </groups>
   <pages groups="//@groups.0"/>
 </eef:EEFViewDescription>
diff --git a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
index 8ce854aa7..75982dc20 100644
--- a/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
+++ b/tests/org.eclipse.eef.tests/src/org/eclipse/eef/tests/internal/controllers/AbstractEEFControllerTests.java
@@ -24,7 +24,6 @@ import org.eclipse.eef.core.api.EditingContextAdapter;
 import org.eclipse.eef.core.api.controllers.IEEFWidgetController;
 import org.eclipse.eef.tests.internal.AQLInterpreter;
 import org.eclipse.eef.tests.internal.EEFDataTests;
-import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
@@ -32,7 +31,6 @@ import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.sirius.common.interpreter.api.IInterpreter;
 import org.eclipse.sirius.common.interpreter.api.IVariableManager;
 import org.eclipse.sirius.common.interpreter.api.VariableManagerFactory;
@@ -41,6 +39,7 @@ import org.junit.Before;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
+
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -76,8 +75,6 @@ public abstract class AbstractEEFControllerTests {
 		this.resourceSet.getPackageRegistry().put(EefPackage.eNS_URI, EefPackage.eINSTANCE);
 		this.resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("xmi", new XMIResourceFactoryImpl()); //$NON-NLS-1$
 		this.resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore", new EcoreResourceFactoryImpl()); //$NON-NLS-1$
-
-		AdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
 		this.interpreter = new AQLInterpreter();
 	}
 
@@ -101,8 +98,8 @@ public abstract class AbstractEEFControllerTests {
 	}
 
 	protected <T extends EEFWidgetDescription> T widget(EEFGroupDescription eefGroupDescription, Class<T> clazz, int widgetIndex) {
-		List<T> list = eefGroupDescription.getContainer().getWidgets().stream().filter(w -> clazz.isAssignableFrom(w.getClass()))
-				.map(w -> clazz.cast(w)).collect(Collectors.toList());
+		List<T> list = eefGroupDescription.getControls().stream().filter(w -> clazz.isAssignableFrom(w.getClass())).map(w -> clazz.cast(w))
+				.collect(Collectors.toList());
 		return list.get(widgetIndex);
 	}