cleaning up usages of Sections, using ExpandableComposite.EXPANDED and ExpandableComposite.CLIENT_INDENT where appropriate. Building the sections and their clients locally instead of using Pane to built them.

38 files changed, 493 insertions, 277 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCaching2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCaching2_0Composite.java
index 62cbc7d609..3d1d6de137 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCaching2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCaching2_0Composite.java
@@ -102,7 +102,9 @@ public abstract class EclipseLinkCaching2_0Composite<T extends EclipseLinkCachin
 		new EclipseLinkCacheSizeCombo(this, container, cacheableEnableModel);
 		
 		// Advanced sub-pane
-		final Section advancedSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		final Section advancedSection = this.getWidgetFactory().createSection(container, 
+			ExpandableComposite.TWISTIE |
+			ExpandableComposite.CLIENT_INDENT);
 		gridData = new GridData(GridData.FILL_BOTH);
 		gridData.horizontalIndent = 16;
 		gridData.horizontalSpan = 2;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
index 668ee7704a..c5476a0a67 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java
@@ -107,7 +107,9 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 
 		
 		// Advanced sub-pane
-		final Section advancedSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		final Section advancedSection = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.CLIENT_INDENT);
 		advancedSection.setText(EclipseLinkUiDetailsMessages.EclipseLinkCachingComposite_advanced);
 		gridData = new GridData(GridData.FILL_BOTH);
 		gridData.horizontalIndent = 16;
@@ -128,7 +130,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching>
 	}
 	
 	protected Composite initializeAdvancedPane(Composite container, PropertyValueModel<Boolean> sharedCacheEnableModel) {
-		container = addSubPane(container, 2, 0, 8, 0, 0);
+		container = addSubPane(container, 2, 0, 0, 0, 0);
 
 		EclipseLinkExpiryComposite expiryComposite = new EclipseLinkExpiryComposite(this, container, sharedCacheEnableModel);
 		GridData gridData = new GridData();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
index dc06030cfb..53cb53e19d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkOneToManyJoiningStrategyPane.java
@@ -10,14 +10,17 @@
 package org.eclipse.jpt.jpa.eclipselink.ui.internal.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkOneToManyRelationship;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinTableJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.MappedByJoiningStrategyPane;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class EclipseLinkOneToManyJoiningStrategyPane 
 	extends Pane<EclipseLinkOneToManyRelationship>
@@ -32,10 +35,19 @@ public class EclipseLinkOneToManyJoiningStrategyPane
 	
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
index 032dd69f62..926b19da19 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/JavaEclipseLinkElementCollectionMapping2_0Composite.java
@@ -36,6 +36,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class JavaEclipseLinkElementCollectionMapping2_0Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<JavaElementCollectionMapping2_0>
@@ -56,7 +57,7 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite
 	}
 
 	@Override
-	protected Control initializeElementCollectionSection(Composite container) {
+	protected Control buildElementCollectionSectionClient(Composite container) {
 		container = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Target class widgets
@@ -89,10 +90,9 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite
 		};
 	}
 
-
 	@Override
-	protected void initializeBasicValueTypeSection(Composite container) {
-		super.initializeBasicValueTypeSection(container);
+	protected Composite buildBasicValueTypeSectionClient(Section section) {
+		Composite container = super.buildBasicValueTypeSectionClient(section);
 		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
 
 		// EclipseLink Converter
@@ -110,6 +110,8 @@ public class JavaEclipseLinkElementCollectionMapping2_0Composite
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
 		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+
+		return container;
 	}
 
 	protected PropertyValueModel<Converter> buildConverterHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
index e35febff2e..d9e54c549e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_0Composite.java
@@ -38,6 +38,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkElementCollectionMapping2_0Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
@@ -58,7 +59,7 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite
 	}
 
 	@Override
-	protected Control initializeElementCollectionSection(Composite container) {
+	protected Control buildElementCollectionSectionClient(Composite container) {
 		container = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Target class widgets
@@ -100,8 +101,8 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite
 	}
 
 	@Override
-	protected void initializeBasicValueTypeSection(Composite container) {
-		super.initializeBasicValueTypeSection(container);
+	protected Composite buildBasicValueTypeSectionClient(Section section) {
+		Composite container = super.buildBasicValueTypeSectionClient(section);
 		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
 
 		// EclipseLink Converter
@@ -119,6 +120,8 @@ public class OrmEclipseLinkElementCollectionMapping2_0Composite
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
 		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+
+		return container;
 	}
 
 	protected PropertyValueModel<Converter> buildConverterHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
index 91eaabd763..0abf326ec4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkElementCollectionMapping2_1Composite.java
@@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class OrmEclipseLinkElementCollectionMapping2_1Composite
 	extends EclipseLinkElementCollectionMapping2_0Composite<ElementCollectionMapping2_0>
@@ -61,7 +62,7 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite
 	}
 
 	@Override
-	protected Control initializeElementCollectionSection(Composite container) {
+	protected Control buildElementCollectionSectionClient(Composite container) {
 		container = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Target class widgets
@@ -116,8 +117,8 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite
 	}
 
 	@Override
-	protected void initializeBasicValueTypeSection(Composite container) {
-		super.initializeBasicValueTypeSection(container);
+	protected Composite buildBasicValueTypeSectionClient(Section section) {
+		Composite container = super.buildBasicValueTypeSectionClient(section);
 		PropertyValueModel<Converter> converterHolder = buildConverterHolder();
 
 		// EclipseLink Converter
@@ -135,6 +136,8 @@ public class OrmEclipseLinkElementCollectionMapping2_1Composite
 		gridData.horizontalIndent = 20;
 		convertLabel.setLayoutData(gridData);
 		registerSubPane(new EclipseLinkConvertCombo(convertHolder, convertEnabledModel, container, getWidgetFactory()));
+
+		return container;
 	}
 
 	protected PropertyValueModel<Converter> buildConverterHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/JdbcPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/JdbcPropertiesComposite.java
index 65322ab8dc..91d50fb6a3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/JdbcPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/JdbcPropertiesComposite.java
@@ -14,7 +14,6 @@ import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -26,6 +25,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  *  JdbcPropertiesComposite
@@ -57,54 +58,71 @@ public class JdbcPropertiesComposite<T extends Connection>
 		connectionComposite.getControl().setLayoutData(gridData);
 
 		// Read Connection
-		Composite readConnectionSection = this.addCollapsibleSubSection(
-			container,
-			EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSectionTitle,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE) //expanded
-		);
-		readConnectionSection.getParent().setLayoutData(new GridData()); //change layout so it doesn't fill horizontally
-		readConnectionSection.setLayout(new GridLayout(2, false));
+		Section readConnectionSection = this.addReadConnectionSection(container);
+		gridData = new GridData();
+		gridData.verticalAlignment = SWT.TOP;
+		readConnectionSection.setLayoutData(gridData);
+		
+		// Write Connection
+		Section writeConnectionSection = this.addWriteConnectionSection(container);
+		gridData = new GridData();
+		gridData.horizontalIndent = 15;
+		gridData.verticalAlignment = SWT.TOP;
+		writeConnectionSection.setLayoutData(gridData);
+	}
+
+	protected Section addReadConnectionSection(Composite container) {
+		Section readConnectionSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+		readConnectionSection.setText(EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSectionTitle);
+		
+		Composite readConnectionClient = this.getWidgetFactory().createComposite(readConnectionSection);
+		readConnectionClient.setLayout(new GridLayout(2, false));
+		readConnectionClient.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		// Read Connections Shared
 		TriStateCheckBox sharedCheckBox = this.addTriStateCheckBoxWithDefault(
-			readConnectionSection,
+				readConnectionClient,
 			EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabel,
 			this.buildReadConnectionsSharedHolder(),
 			this.buildReadConnectionsSharedStringHolder(),
 			JpaHelpContextIds.PERSISTENCE_XML_CONNECTION
 		);
-		gridData = new GridData();
+		GridData gridData = new GridData();
 		gridData.horizontalSpan = 2;
 		sharedCheckBox.getCheckBox().setLayoutData(gridData);
 		
 		// Read Connections Minimum
-		this.addLabel(readConnectionSection, EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMinLabel);
-		this.addReadConnectionsMinCombo(readConnectionSection);
+		this.addLabel(readConnectionClient, EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMinLabel);
+		this.addReadConnectionsMinCombo(readConnectionClient);
 
 		// Read Connections Maximum
-		this.addLabel(readConnectionSection, EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMaxLabel);
-		this.addReadConnectionsMaxCombo(readConnectionSection);
+		this.addLabel(readConnectionClient, EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMaxLabel);
+		this.addReadConnectionsMaxCombo(readConnectionClient);
 		
+		readConnectionSection.setClient(readConnectionClient);
+
+		return readConnectionSection;
+	}
+
+	protected Section addWriteConnectionSection(Composite container) {
+		Section writeConnectionSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+		writeConnectionSection.setText(EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsSectionTitle);
 		
-		// Write Connection
-		Composite writeConnectionSection =  this.addCollapsibleSubSection(
-			container,
-			EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsSectionTitle,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE) //expanded
-		);
-		gridData = new GridData();
-		gridData.horizontalIndent = 15;
-		gridData.verticalAlignment = SWT.TOP;
-		writeConnectionSection.getParent().setLayoutData(gridData);
-		writeConnectionSection.setLayout(new GridLayout(2, false));
+		Composite writeConnectionClient = this.getWidgetFactory().createComposite(writeConnectionSection);
+		writeConnectionClient.setLayout(new GridLayout(2, false));
+		writeConnectionClient.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		// Write Connections Minimum
-		this.addLabel(writeConnectionSection, EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMinLabel);
-		this.addWriteConnectionsMinCombo(writeConnectionSection);
+		this.addLabel(writeConnectionClient, EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMinLabel);
+		this.addWriteConnectionsMinCombo(writeConnectionClient);
 
 		// Write Connections Maximum
-		this.addLabel(writeConnectionSection, EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMaxLabel);
-		this.addWriteConnectionsMaxCombo(writeConnectionSection);
+		this.addLabel(writeConnectionClient, EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMaxLabel);
+		this.addWriteConnectionsMaxCombo(writeConnectionClient);
+		
+		writeConnectionSection.setClient(writeConnectionClient);
+
+		return writeConnectionSection;
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildReadConnectionsSharedHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
index 9ccd43343b..b37b56cb97 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_0Composite.java
@@ -15,7 +15,6 @@ import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
@@ -27,6 +26,10 @@ import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.events.ExpansionAdapter;
+import org.eclipse.ui.forms.events.ExpansionEvent;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  *  EclipseLinkLogging2_0Composite
@@ -45,67 +48,78 @@ public class EclipseLinkLogging2_0Composite extends EclipseLinkLoggingComposite<
 	protected void initializeLayout(Composite container) {
 		super.initializeLayout(container);
 
-		Composite loggingLevelComposite = this.addCategoryLoggingLevelComposite(container);
+		Composite loggingLevelComposite = this.addCategoryLoggingLevelSection(container);
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
 		loggingLevelComposite.setLayoutData(gridData);
 	}
 
-	protected Composite addCategoryLoggingLevelComposite(Composite container) {
-		container = this.addCollapsibleSubSection(
-			container,
-			EclipseLinkUiMessages.PersistenceXmlLoggingTab_categoryLoggingLevelSectionTitle,
-			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
-		);
-		GridLayout layout = new GridLayout(2, false);
-		container.setLayout(layout);
+	protected Section addCategoryLoggingLevelSection(Composite container) {
+		final Section loggingSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		loggingSection.setText(EclipseLinkUiMessages.PersistenceXmlLoggingTab_categoryLoggingLevelSectionTitle);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_cacheLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.CACHE_CATEGORY_LOGGING_PROPERTY);
+		loggingSection.addExpansionListener(new ExpansionAdapter() {
+			@Override
+			public void expansionStateChanging(ExpansionEvent e) {
+				if (e.getState() && loggingSection.getClient() == null) {
+					loggingSection.setClient(createCategoryLoggingLevelClient(loggingSection));
+				}
+			}
+		});
+
+		return loggingSection;
+	}
+
+	protected Composite createCategoryLoggingLevelClient(Section loggingSection) {
+		Composite loggingClient = this.getWidgetFactory().createComposite(loggingSection);
+		loggingClient.setLayout(new GridLayout(2, false));
+
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_cacheLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.CACHE_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_connectionLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.CONNECTION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_connectionLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.CONNECTION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_dmsLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.DMS_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_dmsLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.DMS_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejbLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.EJB_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejbLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.EJB_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejb_or_metadataLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejb_or_metadataLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.EJB_OR_METADATA_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_eventLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.EVENT_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_eventLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.EVENT_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_jpa_metamodelLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.JPA_METAMODEL_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_jpa_metamodelLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.JPA_METAMODEL_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propagationLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.PROPAGATION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propagationLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.PROPAGATION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propertiesLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.PROPERTIES_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propertiesLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.PROPERTIES_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_queryLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.QUERY_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_queryLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.QUERY_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sequencingLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SEQUENCING_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sequencingLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SEQUENCING_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_serverLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SERVER_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_serverLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SERVER_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sqlLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SQL_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sqlLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SQL_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_transactionLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.TRANSACTION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_transactionLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.TRANSACTION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_weaverLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.WEAVER_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_weaverLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.WEAVER_CATEGORY_LOGGING_PROPERTY);
 
-		return container.getParent(); //return the Section, instead of its client
+		return loggingClient;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
index e022a940b0..1fabf5575d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/EclipseLinkLogging2_4Composite.java
@@ -13,7 +13,6 @@ import java.util.Collection;
 
 import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Logging2_4;
@@ -21,6 +20,7 @@ import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.LoggingLevel;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  *  EclipseLinkLogging2_4Composite
@@ -36,67 +36,62 @@ public class EclipseLinkLogging2_4Composite extends EclipseLinkLogging2_0Composi
 	}
 
 	@Override
-	protected Composite addCategoryLoggingLevelComposite(Composite container) {
-		container = this.addCollapsibleSubSection(
-			container,
-			EclipseLinkUiMessages.PersistenceXmlLoggingTab_categoryLoggingLevelSectionTitle,
-			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
-		);
-		GridLayout layout = new GridLayout(2, false);
-		container.setLayout(layout);
+	protected Composite createCategoryLoggingLevelClient(Section loggingSection) {
+		Composite loggingClient = this.getWidgetFactory().createComposite(loggingSection);
+		loggingClient.setLayout(new GridLayout(2, false));
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_cacheLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.CACHE_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_cacheLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.CACHE_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_connectionLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.CONNECTION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_connectionLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.CONNECTION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ddlLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_4.DDL_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ddlLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_4.DDL_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_dmsLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.DMS_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_dmsLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.DMS_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejbLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.EJB_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_ejbLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.EJB_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_eventLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.EVENT_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_eventLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.EVENT_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_jpaLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_4.JPA_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_jpaLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_4.JPA_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_metadataLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_4.METADATA_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_metadataLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_4.METADATA_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_metamodelLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_4.METAMODEL_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_metamodelLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_4.METAMODEL_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propagationLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.PROPAGATION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propagationLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.PROPAGATION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propertiesLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.PROPERTIES_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_propertiesLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.PROPERTIES_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_queryLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.QUERY_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_queryLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.QUERY_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sequencingLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SEQUENCING_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sequencingLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SEQUENCING_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_serverLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SERVER_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_serverLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SERVER_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sqlLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.SQL_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_sqlLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.SQL_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_transactionLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.TRANSACTION_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_transactionLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.TRANSACTION_CATEGORY_LOGGING_PROPERTY);
 
-		this.addLabel(container, EclipseLinkUiMessages.PersistenceXmlLoggingTab_weaverLoggingLevelLabel);
-		this.addLoggingLevelCombo(container, Logging2_0.WEAVER_CATEGORY_LOGGING_PROPERTY);
+		this.addLabel(loggingClient, EclipseLinkUiMessages.PersistenceXmlLoggingTab_weaverLoggingLevelLabel);
+		this.addLoggingLevelCombo(loggingClient, Logging2_0.WEAVER_CATEGORY_LOGGING_PROPERTY);
 
-		return container.getParent(); //return the Section, instead of its client
+		return loggingClient;
 	}
 	
 	private static final String DEFAULT_PROPERTY = Logging2_0.CATEGORIES_DEFAULT_LOGGING_PROPERTY;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
index 2445dd1477..32a8aeb6be 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java
@@ -105,10 +105,12 @@ public abstract class AbstractBasicMappingComposite<T extends BasicMapping>
 	}
 	
 	protected void initializeBasicCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.BasicSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeBasicSection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
index d9dd837b94..71a7a3b8da 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddableComposite.java
@@ -50,10 +50,12 @@ public abstract class AbstractEmbeddableComposite<T extends Embeddable>
 	}
 	
 	protected void initializeEmbeddableCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.EmbeddableSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeEmbeddableSection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
index 71a212efe1..ec4956f2e7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedIdMappingComposite.java
@@ -39,11 +39,13 @@ public abstract class AbstractEmbeddedIdMappingComposite<T extends EmbeddedIdMap
 	}
 
 	protected void initializeEmbeddedIdCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.EmbeddedIdSection_title);
 		section.setClient(this.initializeEmbeddedIdSection(section));
-		section.setExpanded(true);
 	}
 
 	protected abstract Control initializeEmbeddedIdSection(Composite container);
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
index a490743948..d26194a9e1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingComposite.java
@@ -61,11 +61,13 @@ public abstract class AbstractEmbeddedMappingComposite<T extends EmbeddedMapping
 	}
 	
 	protected void initializeEmbeddedCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.EmbeddedSection_title);
 		section.setClient(this.initializeEmbeddedSection(section));
-		section.setExpanded(true);
 	}
 	
 	protected Control initializeEmbeddedSection(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
index d0fa283b25..c51e283f02 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java
@@ -125,10 +125,12 @@ public abstract class AbstractEntityComposite<T extends Entity>
 	}
 	
 	protected void initializeEntityCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.EntitySection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeEntitySection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
index 2e501e8748..240993e649 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java
@@ -52,10 +52,12 @@ public abstract class AbstractIdMappingComposite<T extends IdMapping>
 	}
 	
 	protected void initializeIdCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.IdSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeIdSection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
index e0793051cd..d4cf89ccdb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToManyMappingComposite.java
@@ -95,10 +95,12 @@ public abstract class AbstractManyToManyMappingComposite<T extends ManyToManyMap
 	}
 	
 	protected void initializeManyToManyCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.ManyToManySection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeManyToManySection(section));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
index aeeb47a9fd..c690711618 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractManyToOneMappingComposite.java
@@ -43,10 +43,12 @@ public abstract class AbstractManyToOneMappingComposite<T extends ManyToOneMappi
 	}
 	
 	protected void initializeManyToOneCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.ManyToOneSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeManyToOneSection(section));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
index 1ba595ac4e..5a19369bfd 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java
@@ -42,10 +42,12 @@ public abstract class AbstractMappedSuperclassComposite<T extends MappedSupercla
 	}
 	
 	protected void initializeMappedSuperclassCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.MappedSuperclassSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeMappedSuperclassSection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
index bf68d463e3..e2a8b778cc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToManyMappingComposite.java
@@ -93,10 +93,12 @@ public abstract class AbstractOneToManyMappingComposite<T extends OneToManyMappi
 	}
 	
 	protected void initializeOneToManyCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.OneToManySection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeOneToManySection(section));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
index f506e7a341..f1b41c66a4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOneToOneMappingComposite.java
@@ -43,10 +43,12 @@ public abstract class AbstractOneToOneMappingComposite<T extends OneToOneMapping
 	}
 	
 	protected void initializeOneToOneCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.OneToOneSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeOneToOneSection(section));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
index 62ecf0af7a..391dfdfe4c 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java
@@ -79,10 +79,12 @@ public abstract class AbstractVersionMappingComposite<T extends VersionMapping>
 	}
 	
 	protected void initializeVersionCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.VersionSection_title);
-		section.setExpanded(true);
 		section.setClient(initializeVersionSection(section));
 	}
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
index 7b40aa210a..4e41b07346 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java
@@ -390,7 +390,9 @@ public class ColumnComposite
 
 
 		// Details sub-pane
-		final Section detailsSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		final Section detailsSection = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.CLIENT_INDENT);
 		detailsSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		detailsSection.setText(JptUiDetailsMessages.ColumnComposite_details);
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
@@ -408,7 +410,7 @@ public class ColumnComposite
 	}
 
 	protected Composite initializeDetailsSection(Composite container) {
-		Composite detailsClient = this.addSubPane(container, 2, 0, 16, 0, 0);
+		Composite detailsClient = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Insertable tri-state check box
 		TriStateCheckBox insertableCheckBox = addTriStateCheckBoxWithDefault(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
index e3e2495cc1..cf9741cc25 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
@@ -28,7 +28,6 @@ import org.eclipse.jpt.jpa.ui.internal.details.db.ColumnCombo;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.forms.widgets.ExpandableComposite;
 import org.eclipse.ui.forms.widgets.Section;
 
@@ -103,7 +102,9 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> {
 		this.addDiscriminatorTypeCombo(container, discriminatorColumnHolder, enabledModel);
 
 
-		Section detailsSection = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		Section detailsSection = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.CLIENT_INDENT);
 		detailsSection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		detailsSection.setText(JptUiDetailsMessages.InheritanceComposite_detailsGroupBox);
 		detailsSection.setClient(this.initializeDetailsClient(detailsSection, discriminatorColumnHolder, enabledModel));
@@ -117,17 +118,11 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> {
 		detailsSection.setLayoutData(gridData);
 
 		// Length widgets
-		Label lengthLabel = this.addLabel(detailsClient, JptUiDetailsMessages.ColumnComposite_length, enabledModel);
-		gridData = new GridData();
-		gridData.horizontalIndent = 16;
-		lengthLabel.setLayoutData(gridData);
+		this.addLabel(detailsClient, JptUiDetailsMessages.ColumnComposite_length, enabledModel);
 		this.addLengthCombo(detailsClient, discriminatorColumnHolder, enabledModel);
 
 		// Column Definition widgets
-		Label columnDefinitionLabel = this.addLabel(detailsClient, JptUiDetailsMessages.ColumnComposite_columnDefinition, enabledModel);
-		gridData = new GridData();
-		gridData.horizontalIndent = 16;
-		columnDefinitionLabel.setLayoutData(gridData);
+		this.addLabel(detailsClient, JptUiDetailsMessages.ColumnComposite_columnDefinition, enabledModel);
 		this.addText(detailsClient, this.buildColumnDefinitionHolder(discriminatorColumnHolder), null, enabledModel);
 
 		return detailsClient;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java
index 243832e1a9..657d1557de 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.jpt.jpa.ui.internal.details;
 
+import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
@@ -20,9 +21,12 @@ import org.eclipse.jpt.jpa.core.context.TableGenerator;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.details.GeneratorComposite.GeneratorBuilder;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here the layout of this pane:
@@ -89,23 +93,27 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 
 	@Override
 	protected void initializeLayout(Composite container) {
-
-		this.initializeTableGeneratorPane(container);
-		this.initializeSequenceGeneratorPane(container);
+		this.initializeTableGeneratorCollapsibleSection(container);
+		this.initializeSequenceGeneratorCollapsibleSection(container);
 	}
 
-	private void initializeSequenceGeneratorPane(Composite container) {
+	protected void initializeSequenceGeneratorCollapsibleSection(Composite container) {
+		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.GeneratorsComposite_sequenceGeneratorSection);
+		SWTTools.controlExpandedState(this.sequenceGeneratorExpansionStateHolder, section);
 
-		// Sequence Generator sub-section
-		container = this.addCollapsibleSubSection(
-			container,
-			JptUiDetailsMessages.GeneratorsComposite_sequenceGeneratorSection,
-			this.sequenceGeneratorExpansionStateHolder
-		);
+		section.setClient(GenerationComposite.this.initializeSequenceGeneratorPane(section));
+	}
+
+	private Composite initializeSequenceGeneratorPane(Composite container) {
+		Composite client = this.getWidgetFactory().createComposite(container);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		// Sequence Generator check box
 		Button sequenceGeneratorCheckBox = addCheckBox(
-			container,
+				client,
 			JptUiDetailsMessages.GeneratorsComposite_sequenceGeneratorCheckBox,
 			this.buildSequenceGeneratorBooleanHolder(),
 			JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR
@@ -115,10 +123,12 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		sequenceGeneratorCheckBox.setLayoutData(gridData);
 
 		// Sequence Generator pane
-		Control sequenceGeneratorComposite = this.addSequenceGeneratorComposite(container);
+		Control sequenceGeneratorComposite = this.addSequenceGeneratorComposite(client);
 		gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalIndent = sequenceGeneratorCheckBox.getBorderWidth() + 16;
 		sequenceGeneratorComposite.setLayoutData(gridData);
+
+		return client;
 	}
 	
 	protected Control addSequenceGeneratorComposite(Composite container) {
@@ -167,17 +177,22 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		};
 	}
 
- 	private void initializeTableGeneratorPane(Composite container) {
+	protected void initializeTableGeneratorCollapsibleSection(Composite container) {
+		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.GeneratorsComposite_tableGeneratorSection);
+		SWTTools.controlExpandedState(this.tableGeneratorExpansionStateHolder, section);
 
-		// Table Generator sub-section
-		container = addCollapsibleSubSection(
-			container,
-			JptUiDetailsMessages.GeneratorsComposite_tableGeneratorSection,
-			this.tableGeneratorExpansionStateHolder
-		);
+		section.setClient(GenerationComposite.this.initializeTableGeneratorPane(section));
+	}
+
+	private Composite initializeTableGeneratorPane(Composite container) {
+		Composite client = this.getWidgetFactory().createComposite(container);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		Button tableGeneratorCheckBox = addCheckBox(
-			container,
+				client,
 			JptUiDetailsMessages.GeneratorsComposite_tableGeneratorCheckBox,
 			this.buildTableGeneratorBooleanHolder(),
 			JpaHelpContextIds.MAPPING_TABLE_GENERATOR
@@ -191,12 +206,14 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		Control tableGeneratorComposite = new TableGeneratorComposite(
 			this,
 			this.buildTableGeneratorHolder(),
-			container,
+			client,
 			this.buildTableGeneratorBuilder()
 		).getControl();
 		gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalIndent = tableGeneratorCheckBox.getBorderWidth() + 16;
 		tableGeneratorComposite.setLayoutData(gridData);
+
+		return client;
 	}
 
 	private PropertyValueModel<TableGenerator> buildTableGeneratorHolder() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
index 43ec71d6fc..7be39d585a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
@@ -10,6 +10,8 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import java.util.Collection;
+
+import org.eclipse.jpt.common.ui.internal.utility.swt.SWTTools;
 import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.StringTools;
@@ -38,6 +40,7 @@ import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.details.GeneratorComposite.GeneratorBuilder;
 import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
@@ -128,10 +131,12 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.IdMappingComposite_primaryKeyGenerationSection);
-		section.setExpanded(true);
 
 		Composite subPane = this.addSubPane(section, 2, 0, 0, 0, 0);
 		section.setClient(subPane);
@@ -173,13 +178,13 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 
 		PropertyValueModel<GeneratorContainer> generatorHolder = buildGeneratorContainer();
 		// Table Generator pane
-		Composite tableGeneratorComposite = initializeTableGeneratorPane(container, generatorHolder);
+		Composite tableGeneratorComposite = initializeTableGeneratorCollapsibleSection(container, generatorHolder);
 		gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
 		tableGeneratorComposite.setLayoutData(gridData);
 
 		// Sequence Generator pane
-		Composite sequenceGeneratorComposite = initializeSequenceGeneratorPane(container, generatorHolder);
+		Composite sequenceGeneratorComposite = initializeSequenceGeneratorCollapsibleSection(container, generatorHolder);
 		gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
 		sequenceGeneratorComposite.setLayoutData(gridData);
@@ -214,18 +219,24 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 		};
 	}
 
-	private Composite initializeSequenceGeneratorPane(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
+	protected Section initializeSequenceGeneratorCollapsibleSection(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
+		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		section.setText(JptUiDetailsMessages.IdMappingComposite_sequenceGeneratorSection);
+		SWTTools.controlExpandedState(this.sequenceGeneratorExpansionStateHolder, section);
 
-		// Sequence Generator sub-section
-		container = addCollapsibleSubSection(
-			container,
-			JptUiDetailsMessages.IdMappingComposite_sequenceGeneratorSection,
-			this.sequenceGeneratorExpansionStateHolder
-		);
+		section.setClient(this.initializeSequenceGeneratorPane(section, generatorHolder));
+
+		return section;
+	}
+
+	private Composite initializeSequenceGeneratorPane(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
+		Composite client = this.getWidgetFactory().createComposite(container);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		// Sequence Generator check box
 		Button sequenceGeneratorCheckBox = addCheckBox(
-			container,
+				client,
 			JptUiDetailsMessages.IdMappingComposite_sequenceGeneratorCheckBox,
 			buildSequenceGeneratorBooleanHolder(generatorHolder),
 			JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR
@@ -233,7 +244,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 
 		// Sequence Generator pane
 		SequenceGeneratorComposite sequenceGeneratorComposite = this.buildSequenceGeneratorComposite(
-			container, 
+				client, 
 			buildSequenceGeneratorHolder(generatorHolder),
 			buildSequenceGeneratorBuilder(generatorHolder));
 			
@@ -241,7 +252,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 		gridData.horizontalIndent = sequenceGeneratorCheckBox.getBorderWidth() + 16;
 		sequenceGeneratorComposite.getControl().setLayoutData(gridData);
 
-		return container.getParent();//return the Section
+		return client;
 	}
 
 	private ModifiablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder(PropertyValueModel<GeneratorContainer> generatorHolder) {
@@ -300,18 +311,24 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 			}
 		};
 	}
-	
-	private Composite initializeTableGeneratorPane(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
 
-		// Table Generator sub-section
-		container = addCollapsibleSubSection(
-			container,
-			JptUiDetailsMessages.IdMappingComposite_tableGeneratorSection,
-			this.tableGeneratorExpansionStateHolder
-		);
+	protected Section initializeTableGeneratorCollapsibleSection(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
+		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		section.setText(JptUiDetailsMessages.IdMappingComposite_tableGeneratorSection);
+		SWTTools.controlExpandedState(this.tableGeneratorExpansionStateHolder, section);
+
+		section.setClient(this.initializeTableGeneratorPane(section, generatorHolder));
+
+		return section;
+	}
+
+	private Composite initializeTableGeneratorPane(Composite container, PropertyValueModel<GeneratorContainer> generatorHolder) {
+		Composite client = this.getWidgetFactory().createComposite(container);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
 
 		Button tableGeneratorCheckBox = addCheckBox(
-			container,
+				client,
 			JptUiDetailsMessages.IdMappingComposite_tableGeneratorCheckBox,
 			buildTableGeneratorBooleanHolder(generatorHolder),
 			JpaHelpContextIds.MAPPING_TABLE_GENERATOR
@@ -319,7 +336,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 
 		// Table Generator pane
 		TableGeneratorComposite tableGeneratorComposite = this.buildTableGeneratorComposite(
-			container, 
+				client, 
 			buildTableGeneratorHolder(generatorHolder),
 			buildTableGeneratorBuilder(generatorHolder));
 
@@ -327,7 +344,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping>
 		gridData.horizontalIndent = tableGeneratorCheckBox.getBorderWidth() + 16;
 		tableGeneratorComposite.getControl().setLayoutData(gridData);
 		
-		return container.getParent();//return the Section
+		return client;
 	}	
 	
 	protected TableGeneratorComposite buildTableGeneratorComposite(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java
index 903669694b..7233cdc6fb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java
@@ -11,7 +11,6 @@ package org.eclipse.jpt.jpa.ui.internal.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.JoinTableRelationship;
@@ -19,7 +18,11 @@ import org.eclipse.jpt.jpa.core.context.ManyToManyMapping;
 import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship;
 import org.eclipse.jpt.jpa.core.context.MappedByRelationship;
 import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationship;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -60,10 +63,19 @@ public class ManyToManyJoiningStrategyPane
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneJoiningStrategyPane.java
index 55c30b0f42..a486c5538f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToOneJoiningStrategyPane.java
@@ -10,10 +10,13 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -48,10 +51,19 @@ public class ManyToOneJoiningStrategyPane extends Pane<ManyToOneRelationship>
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyJoiningStrategyPane.java
index e0f8784272..62930d4162 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToManyJoiningStrategyPane.java
@@ -10,10 +10,13 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToManyRelationship;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -54,10 +57,19 @@ public class OneToManyJoiningStrategyPane
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java
index 70295f3642..50dd919610 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OneToOneJoiningStrategyPane.java
@@ -10,10 +10,13 @@
 package org.eclipse.jpt.jpa.ui.internal.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToOneRelationship;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -59,10 +62,19 @@ public class OneToOneJoiningStrategyPane
 	
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java
index 66eb8bc3fb..07c71d2860 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPage.java
@@ -108,10 +108,12 @@ public abstract class AbstractEntityMappingsDetailsPage extends AbstractJpaDetai
 	}
 	
 	protected void initializeEntityMappingsCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsOrmMessages.EntityMappingsSection_title);
-		section.setExpanded(true);
 		section.setClient(this.initializeEntityMappingsSection(section));
 	}
 	
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
index 5f0eef37f6..581fed6ef5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMapping2_0Composite.java
@@ -13,7 +13,6 @@ import org.eclipse.jpt.common.ui.WidgetFactory;
 import org.eclipse.jpt.common.ui.internal.util.ControlSwitcher;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
 import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -127,14 +126,16 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 	}
 	
 	protected void initializeElementCollectionCollapsibleSection(Composite container) {
-		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		final Section section = this.getWidgetFactory().createSection(container,
+				ExpandableComposite.TITLE_BAR |
+				ExpandableComposite.TWISTIE |
+				ExpandableComposite.EXPANDED);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages2_0.ElementCollectionSection_title);
-		section.setExpanded(true);
-		section.setClient(this.initializeElementCollectionSection(section));
+		section.setClient(this.buildElementCollectionSectionClient(section));
 	}
 
-	protected Control initializeElementCollectionSection(Composite container) {
+	protected Control buildElementCollectionSectionClient(Composite container) {
 		container = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Target class widgets
@@ -158,7 +159,6 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages.OrderingComposite_orderingGroup);
-		section.setClient(initializeOrderingSection(section));
 		section.addExpansionListener(new ExpansionAdapter() {
 			@Override
 			public void expansionStateChanging(ExpansionEvent e) {
@@ -177,7 +177,14 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 		final Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		section.setText(JptUiDetailsMessages2_0.AbstractElementCollectionMapping2_0_Composite_valueSectionTitle);
-		section.setClient(initializeValueSection(section));
+		section.addExpansionListener(new ExpansionAdapter() {
+			@Override
+			public void expansionStateChanging(ExpansionEvent e) {
+				if (e.getState() && section.getClient() == null) {
+					section.setClient(AbstractElementCollectionMapping2_0Composite.this.initializeValueSection(section));
+				}
+			}
+		});
 	}
 	
 	protected void initializeKeyCollapsibleSection(Composite container) {
@@ -205,20 +212,29 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 		Composite basicComposite = addSubPane(container);
 
 		new ColumnComposite(this, buildValueColumnHolder(), basicComposite);
-		// type section
-		Composite converterSection = addCollapsibleSubSection(
-			basicComposite,
-			JptUiDetailsMessages.TypeSection_type,
-			new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
-		);
 
-		this.initializeBasicValueTypeSection(converterSection);
+		// type section
+		final Section section = this.getWidgetFactory().createSection(basicComposite, ExpandableComposite.TWISTIE);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.TypeSection_type);
+		section.addExpansionListener(new ExpansionAdapter() {
+			@Override
+			public void expansionStateChanging(ExpansionEvent e) {
+				if (e.getState() && section.getClient() == null) {
+					Composite converterClient = buildBasicValueTypeSectionClient(section);
+					converterClient.setLayoutData(new GridData(GridData.FILL_BOTH));
+					section.setClient(converterClient);
+				}
+			}
+		});
 
 		return basicComposite;
 	}
 
-	protected void initializeBasicValueTypeSection(Composite container) {
-		((GridLayout) container.getLayout()).numColumns = 2;
+	protected Composite buildBasicValueTypeSectionClient(Section section) {
+		Composite container = this.getWidgetFactory().createComposite(section);
+		GridLayout layout = new GridLayout(2, false);
+		container.setLayout(layout);
 		// No converter
 		Button noConverterButton = addRadioButton(
 			container, 
@@ -253,6 +269,8 @@ public abstract class AbstractElementCollectionMapping2_0Composite<T extends Ele
 			buildEnumeratedBooleanHolder(), 
 			null);
 		registerSubPane(new EnumTypeComboViewer(buildEnumeratedConverterHolder(converterHolder), getEnabledModel(), container, getWidgetFactory()));
+
+		return container;
 	}
 
 	protected Control getEmbeddableValueComposite(Composite container) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentity2_0Pane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentity2_0Pane.java
index ddf35c64dd..7b6f8ce3a4 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentity2_0Pane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentity2_0Pane.java
@@ -22,6 +22,8 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 public class DerivedIdentity2_0Pane
 	extends Pane<DerivedIdentity2_0>
@@ -36,16 +38,20 @@ public class DerivedIdentity2_0Pane
 	
 	@Override
 	protected Composite addComposite(Composite container) {
-		Composite composite = addCollapsibleSection(
-			container,
-			JptUiDetailsMessages2_0.DerivedIdentity_title);
-		return composite;
+		Section section = getWidgetFactory().createSection(container, ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages2_0.DerivedIdentity_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(2, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
 	protected void initializeLayout(Composite container) {
-		((GridLayout) container.getLayout()).numColumns = 2;
-
 		//null derived identity
 		Button nullDerivedIdentityButton = this.addRadioButton(
 			container,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ManyToOneJoiningStrategy2_0Pane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ManyToOneJoiningStrategy2_0Pane.java
index 913a4838b8..d94bef3f9b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ManyToOneJoiningStrategy2_0Pane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ManyToOneJoiningStrategy2_0Pane.java
@@ -10,14 +10,17 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship;
 import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinTableJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -56,10 +59,19 @@ public class ManyToOneJoiningStrategy2_0Pane extends Pane<ManyToOneRelationship2
 	
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToManyJoiningStrategy2_0Pane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToManyJoiningStrategy2_0Pane.java
index 2b2b7be0b7..31479aeb31 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToManyJoiningStrategy2_0Pane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToManyJoiningStrategy2_0Pane.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToManyRelationship;
 import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0;
@@ -18,7 +17,11 @@ import org.eclipse.jpt.jpa.ui.internal.details.JoinColumnJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JoinTableJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.MappedByJoiningStrategyPane;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -59,10 +62,19 @@ public class OneToManyJoiningStrategy2_0Pane
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategy2_0Pane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategy2_0Pane.java
index 6df868f747..63cdf10b33 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategy2_0Pane.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OneToOneJoiningStrategy2_0Pane.java
@@ -10,7 +10,6 @@
 package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
 
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
-import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 import org.eclipse.jpt.jpa.core.context.OneToOneMapping;
 import org.eclipse.jpt.jpa.core.context.OneToOneRelationship;
@@ -21,7 +20,11 @@ import org.eclipse.jpt.jpa.ui.internal.details.JptUiDetailsMessages;
 import org.eclipse.jpt.jpa.ui.internal.details.MappedByJoiningStrategyPane;
 import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingComposite;
 import org.eclipse.jpt.jpa.ui.internal.details.PrimaryKeyJoinColumnJoiningStrategyPane;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import org.eclipse.ui.forms.widgets.Section;
 
 /**
  * Here is the layout of this pane:  
@@ -71,10 +74,19 @@ public class OneToOneJoiningStrategy2_0Pane
 
 	@Override
 	protected Composite addComposite(Composite container) {
-		return addCollapsibleSection(
-			container,
-			JptUiDetailsMessages.Joining_title,
-			new SimplePropertyValueModel<Boolean>(Boolean.TRUE));
+		Section section = getWidgetFactory().createSection(container, 
+				ExpandableComposite.TITLE_BAR | 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.EXPANDED);
+		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+		section.setText(JptUiDetailsMessages.Joining_title);
+
+		Composite client = this.getWidgetFactory().createComposite(section);
+		client.setLayout(new GridLayout(1, false));
+		client.setLayoutData(new GridData(GridData.FILL_BOTH));
+		section.setClient(client);
+
+		return client;
 	}
 
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
index 595d794252..2c0a2b482a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
@@ -295,10 +295,11 @@ public class OrderColumnComposite extends Pane<OrderColumn2_0> {
 		this.addColumnCombo(container);
 
 		// Details sub-pane
-		Section section = this.getWidgetFactory().createSection(container, ExpandableComposite.TWISTIE);
+		Section section = this.getWidgetFactory().createSection(container, 
+				ExpandableComposite.TWISTIE | 
+				ExpandableComposite.CLIENT_INDENT);
 		GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
 		gridData.horizontalSpan = 2;
-		gridData.horizontalIndent = 16;
 		section.setLayoutData(gridData);
 		section.setText(JptUiDetailsMessages.ColumnComposite_details);
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
index 0f18a75d06..193a162524 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmElementCollectionMapping2_0Composite.java
@@ -48,7 +48,7 @@ public class OrmElementCollectionMapping2_0Composite
 	}
 
 	@Override
-	protected Control initializeElementCollectionSection(Composite container) {
+	protected Control buildElementCollectionSectionClient(Composite container) {
 		container = this.addSubPane(container, 2, 0, 0, 0, 0);
 
 		// Target class widgets
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/prefs/JpaProblemSeveritiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/prefs/JpaProblemSeveritiesPage.java
index 816a1e157d..1363398f92 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/prefs/JpaProblemSeveritiesPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/prefs/JpaProblemSeveritiesPage.java
@@ -615,7 +615,6 @@ public class JpaProblemSeveritiesPage extends PropertyAndPreferencePage {
 		);
 
 		expandablePane.setText(text);
-		expandablePane.setExpanded(false);
 		expandablePane.setFont(JFaceResources.getFontRegistry().getBold(JFaceResources.DIALOG_FONT));
 		expandablePane.setLayoutData(gridData);
 		expandablePane.addExpansionListener(buildExpansionListener());