1 files changed, 11 insertions, 12 deletions

diff --git a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
index da61614bd..a15ea7380 100644
--- a/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
+++ b/plugins/org.eclipse.eef.ide.ui/src/org/eclipse/eef/ide/ui/internal/widgets/EEFGroupLifecycleManager.java
@@ -15,7 +15,7 @@ import com.google.common.base.Objects;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.eef.EEFContainerDescription;
+import org.eclipse.eef.EEFControlDescription;
 import org.eclipse.eef.EEFGroupDescription;
 import org.eclipse.eef.common.ui.api.EEFWidgetFactory;
 import org.eclipse.eef.common.ui.api.IEEFFormContainer;
@@ -126,24 +126,23 @@ public class EEFGroupLifecycleManager extends AbstractEEFLifecycleManager {
 		GridData sectionLayoutData = new GridData(GridData.FILL_HORIZONTAL);
 		sectionLayoutData.horizontalSpan = 1;
 		this.section.setLayoutData(sectionLayoutData);
+
 		Composite group = widgetFactory.createComposite(this.section);
-		GridLayout groupLayout = new GridLayout();
-		groupLayout.numColumns = 1;
+
+		// Three columns: label, help, widget
+		GridLayout groupLayout = new GridLayout(3, false);
 		group.setLayout(groupLayout);
 		this.section.setClient(group);
 
 		this.controller = new EEFControllersFactory().createGroupController(this.description, this.variableManager, this.interpreter);
 
-		EEFContainerDescription containerDescription = this.description.getContainer();
-		if (containerDescription != null) {
-			EEFContainerLifecycleManager containerLifecycleManager = new EEFContainerLifecycleManager(containerDescription,
-					this.variableManager.createChild(), this.interpreter, this.contextAdapter);
-			containerLifecycleManager.createControl(group, formContainer);
-
-			parent.layout();
-
-			this.lifecycleManagers.add(containerLifecycleManager);
+		EEFControlSwitch eefControlSwitch = new EEFControlSwitch(this.interpreter, this.contextAdapter);
+		List<EEFControlDescription> controls = this.description.getControls();
+		for (EEFControlDescription eefControlDescription : controls) {
+			this.lifecycleManagers.addAll(eefControlSwitch.doCreate(group, formContainer, eefControlDescription, this.variableManager));
 		}
+
+		parent.layout();
 	}
 
 	/**