Correcting accidental commit, reverting to last version.

8 files changed, 250 insertions, 107 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java
index c965123e52..c21f8e76fc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/SessionCustomizersComposite.java
@@ -3,7 +3,7 @@
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0, which accompanies this distribution
 * and is available at http://www.eclipse.org/legal/epl-v10.html.
-*
+* 
 * Contributors:
 *     Oracle - initial API and implementation
 *******************************************************************************/
@@ -33,7 +33,9 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Customization;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiPlugin;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.eclipse.ui.progress.IProgressService;
@@ -63,7 +65,7 @@ public class SessionCustomizersComposite extends Pane<Customization>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().sessionCustomizerExists(className)) {
-
+				
 				String classRef = this.getSubject().addSessionCustomizer(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -171,7 +173,17 @@ public class SessionCustomizersComposite extends Pane<Customization>
 			buildListHolder(),
 			buildSelectedItemHolder(),
 			buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData   = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
 	}
 
 	private IJavaProject getJavaProject() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java
index 15733c8e12..d7847c4ce3 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_0/persistence/options/ValidationConfigurationComposite.java
@@ -30,14 +30,16 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.jpa.eclipselink.core.context.persistence.Options2_0;
 import org.eclipse.jpt.jpa.eclipselink.ui.JptJpaEclipseLinkUiPlugin;
 import org.eclipse.jpt.jpa.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.JptUiPersistence2_0Messages;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.eclipse.ui.progress.IProgressService;
@@ -79,25 +81,38 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 	}
 
 	// ********** ValidationGroupPrePersists **********
-
+	
 	private void addGroupPrePersistListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPrePersistLabel,
 			this.addPrePersistListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<Options2_0> addPrePersistListPane(Composite parent) {
-		return new AddRemoveListPane<Options2_0>(
+
+		// List pane
+		AddRemoveListPane<Options2_0> listPane = new AddRemoveListPane<Options2_0>(
 			this,
 			parent,
 			this.buildPrePersistAdapter(),
 			this.buildPrePersistListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPrePersistAdapter() {
@@ -135,7 +150,7 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPrePersistExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPrePersist(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -143,25 +158,38 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 	}
 
 	// ********** ValidationGroupPreUpdates **********
-
+	
 	private void addGroupPreUpdateListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPreUpdateLabel,
 			this.addPreUpdateListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<Options2_0> addPreUpdateListPane(Composite parent) {
-		return new AddRemoveListPane<Options2_0>(
+
+		// List pane
+		AddRemoveListPane<Options2_0> listPane = new AddRemoveListPane<Options2_0>(
 			this,
 			parent,
 			this.buildPreUpdateAdapter(),
 			this.buildPreUpdateListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPreUpdateAdapter() {
@@ -199,7 +227,7 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPreUpdateExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPreUpdate(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -207,25 +235,38 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 	}
 
 	// ********** ValidationGroupPreRemoves **********
-
+	
 	private void addGroupPreRemoveListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPreRemoveLabel,
 			this.addPreRemoveListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<Options2_0> addPreRemoveListPane(Composite parent) {
-		return new AddRemoveListPane<Options2_0>(
+
+		// List pane
+		AddRemoveListPane<Options2_0> listPane = new AddRemoveListPane<Options2_0>(
 			this,
 			parent,
 			this.buildPreRemoveAdapter(),
 			this.buildPreRemoveListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPreRemoveAdapter() {
@@ -263,7 +304,7 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPreRemoveExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPreRemove(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -329,7 +370,7 @@ public class ValidationConfigurationComposite extends Pane<Options2_0>
 	private ModifiablePropertyValueModel<String> buildSelectedItemHolder() {
 		return new SimplePropertyValueModel<String>();
 	}
-
+	
 	private PropertyValueModel<PersistenceUnit2_0> buildPersistenceUnit2_0Holder() {
 		return new TransformationPropertyValueModel<Options2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
index 727b3fe81e..aff96222b2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueriesComposite.java
@@ -29,8 +29,8 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 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.NamedNativeQuery;
 import org.eclipse.jpt.jpa.core.context.NamedQuery;
 import org.eclipse.jpt.jpa.core.context.Query;
@@ -81,7 +81,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 
 
 	public QueriesComposite(
-		Pane<?> parentPane,
+		Pane<?> parentPane, 
 		PropertyValueModel<? extends QueryContainer> subjectHolder,
 		Composite parent) {
 
@@ -121,7 +121,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 			Query.NAME_PROPERTY
 		);
 	}
-
+	
 	private AddRemoveListPane<QueryContainer> addListPane(Composite container) {
 
 		return new AddRemoveListPane<QueryContainer>(
@@ -203,7 +203,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 			}
 		};
 	}
-
+	
 	private Adapter buildQueriesAdapter() {
 
 		return new AddRemoveListPane.AbstractAdapter() {
@@ -295,7 +295,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 
 		installPaneSwitcher(pageBook);
 	}
-
+	
 	protected Pane<? extends NamedQuery> buildNamedQueryPropertyComposite(PageBook pageBook) {
 		return new NamedQueryPropertyComposite<NamedQuery>(
 			this,
@@ -307,7 +307,7 @@ public class QueriesComposite extends Pane<QueryContainer>
 	private void installPaneSwitcher(PageBook pageBook) {
 		new ControlSwitcher(this.getQueryHolder(), this.buildPaneTransformer(), pageBook);
 	}
-
+	
 	protected ModifiablePropertyValueModel<Query> getQueryHolder() {
 		return queryHolder;
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
index ffa09665c0..34f198a778 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/options/ValidationConfigurationComposite.java
@@ -22,21 +22,23 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
-import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
+import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
 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.swing.ObjectListSelectionModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0;
 import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.JptUiPersistence2_0Messages;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.eclipse.ui.progress.IProgressService;
@@ -81,25 +83,38 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	}
 
 	// ********** ValidationGroupPrePersists **********
-
+	
 	private void addGroupPrePersistListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPrePersistLabel,
 			this.addPrePersistListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<JpaOptions2_0> addPrePersistListPane(Composite parent) {
-		return new AddRemoveListPane<JpaOptions2_0>(
+
+		// List pane
+		AddRemoveListPane<JpaOptions2_0> listPane = new AddRemoveListPane<JpaOptions2_0>(
 			this,
 			parent,
 			this.buildPrePersistAdapter(),
 			this.buildPrePersistListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPrePersistAdapter() {
@@ -137,7 +152,7 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPrePersistExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPrePersist(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -145,25 +160,38 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	}
 
 	// ********** ValidationGroupPreUpdates **********
-
+	
 	private void addGroupPreUpdateListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPreUpdateLabel,
 			this.addPreUpdateListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<JpaOptions2_0> addPreUpdateListPane(Composite parent) {
-		return new AddRemoveListPane<JpaOptions2_0>(
+
+		// List pane
+		AddRemoveListPane<JpaOptions2_0> listPane = new AddRemoveListPane<JpaOptions2_0>(
 			this,
 			parent,
 			this.buildPreUpdateAdapter(),
 			this.buildPreUpdateListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPreUpdateAdapter() {
@@ -201,7 +229,7 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPreUpdateExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPreUpdate(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -209,25 +237,38 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 	}
 
 	// ********** ValidationGroupPreRemoves **********
-
+	
 	private void addGroupPreRemoveListPane(Composite parent) {
 
-		this.addLabeledComposite(parent,
+		this.addLabeledComposite(parent, 
 			JptUiPersistence2_0Messages.ValidationConfigurationComposite_groupPreRemoveLabel,
 			this.addPreRemoveListPane(parent),
 			null	// TODO Help
 			);
 	}
-
+	
 	private AddRemoveListPane<JpaOptions2_0> addPreRemoveListPane(Composite parent) {
-		return new AddRemoveListPane<JpaOptions2_0>(
+
+		// List pane
+		AddRemoveListPane<JpaOptions2_0> listPane = new AddRemoveListPane<JpaOptions2_0>(
 			this,
 			parent,
 			this.buildPreRemoveAdapter(),
 			this.buildPreRemoveListHolder(),
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider()
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData  = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
+		return listPane;
 	}
 
 	private Adapter buildPreRemoveAdapter() {
@@ -265,7 +306,7 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 		if (type != null) {
 			String className = type.getFullyQualifiedName('$');
 			if( ! this.getSubject().validationGroupPreRemoveExists(className)) {
-
+				
 				String classRef = this.getSubject().addValidationGroupPreRemove(className);
 				listSelectionModel.setSelectedValue(classRef);
 			}
@@ -274,7 +315,7 @@ public class ValidationConfigurationComposite extends Pane<JpaOptions2_0>
 
 
 	// ********** Private methods **********
-
+	
 	private PropertyValueModel<PersistenceUnit2_0> buildPersistenceUnit2_0Holder() {
 		return new PropertyAspectAdapter<JpaOptions2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
 			@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitClassesComposite.java
index 616c48af10..d695344662 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitClassesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitClassesComposite.java
@@ -32,8 +32,8 @@ import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueMo
 import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
 import org.eclipse.jpt.common.utility.internal.model.value.swing.ObjectListSelectionModel;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 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.java.JavaPersistentType;
 import org.eclipse.jpt.jpa.core.context.persistence.ClassRef;
 import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit;
@@ -44,7 +44,9 @@ import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.persistence.JptUiPersistenceMessages;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.SelectionDialog;
@@ -102,7 +104,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 			listSelectionModel.setSelectedValue(classRef);
 		}
 	}
-
+	
 	private boolean classRefExists(String className) {
 		for (ClassRef classRef : getSubject().getSpecifiedClassRefs()) {
 			if( classRef.getClassName().equals(className)) {
@@ -179,7 +181,7 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 			}
 		};
 	}
-
+	
 	private PropertyValueModel<Boolean> buildDefaultExcludeUnlistedMappedClassesHolder() {
 		return new PropertyAspectAdapter<PersistenceUnit, Boolean>(
 			getSubjectHolder(),
@@ -328,7 +330,17 @@ public class PersistenceUnitClassesComposite extends Pane<PersistenceUnit>
 			this.buildSelectedItemHolder(),
 			this.buildLabelProvider(),
 			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
-		);
+		)
+		{
+			@Override
+			protected void initializeTable(Table table) {
+				super.initializeTable(table);
+
+				Composite container = table.getParent();
+				GridData gridData   = (GridData) container.getLayoutData();
+				gridData.heightHint = 75;
+			}
+		};
 
 		this.addTriStateCheckBoxWithDefault(
 			container,
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java
index 661473aa73..2bd7a40ee1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java
@@ -14,8 +14,8 @@ import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveListPane;
-import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.ui.internal.widgets.Pane;
+import org.eclipse.jpt.common.ui.internal.widgets.AddRemovePane.Adapter;
 import org.eclipse.jpt.common.utility.internal.iterables.ListIterable;
 import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
 import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
@@ -29,7 +29,9 @@ import org.eclipse.jpt.jpa.ui.JptJpaUiPlugin;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
 import org.eclipse.jpt.jpa.ui.internal.JptUiIcons;
 import org.eclipse.jpt.jpa.ui.internal.persistence.JptUiPersistenceMessages;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
 
@@ -54,10 +56,10 @@ import org.eclipse.ui.dialogs.ElementTreeSelectionDialog;
  * @version 2.0
  * @since 2.0
  */
-public abstract class PersistenceUnitJarFilesComposite
+public abstract class PersistenceUnitJarFilesComposite 
 	extends Pane<PersistenceUnit>
 {
-	private ModifiablePropertyValueModel<JarFileRef> selectedItemHolder;
+	private ModifiablePropertyValueModel<JarFileRef> selectedItemHolder;	
 
 	/**
 	 * Creates a new <code>PersistenceUnitJPAMappingDescriptorsComposite</code>.
@@ -78,14 +80,15 @@ public abstract class PersistenceUnitJarFilesComposite
 		this.selectedItemHolder = buildSelectedItemHolder();
 	}
 
-
-
+	
+	
 	@Override
 	protected void initializeLayout(Composite container) {
 		addJarFilesList(container);
 	}
-
+	
 	protected void addJarFilesList(Composite container) {
+		// List pane
 		new AddRemoveListPane<PersistenceUnit>(
 			this,
 			container,
@@ -94,15 +97,37 @@ public abstract class PersistenceUnitJarFilesComposite
 			this.selectedItemHolder,
 			this.buildLabelProvider(),
 			JpaHelpContextIds.PERSISTENCE_XML_GENERAL
-		);
+		) {
+			@Override
+			protected Composite addContainer(Composite parent) {
+				parent = super.addContainer(parent);
+				updateGridData(parent);
+				return parent;
+			}
+	
+			@Override
+			protected void initializeLayout(Composite container) {
+				super.initializeLayout(container);
+				updateGridData(getContainer());
+			}
+		};
 	}
-
+	
+	private void updateGridData(Composite container) {
+		GridData gridData = new GridData();
+		gridData.grabExcessHorizontalSpace = true;
+		gridData.grabExcessVerticalSpace   = true;
+		gridData.horizontalAlignment       = SWT.FILL;
+		gridData.verticalAlignment         = SWT.FILL;
+		container.setLayoutData(gridData);
+	}
+	
 	private Adapter buildAdapter() {
 		return new AddRemoveListPane.AbstractAdapter() {
 			public void addNewItem(ObjectListSelectionModel listSelectionModel) {
 				addJarFileRef();
 			}
-
+			
 			public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
 				for (Object item : listSelectionModel.selectedValues()) {
 					getSubject().removeJarFileRef((JarFileRef) item);
@@ -110,59 +135,59 @@ public abstract class PersistenceUnitJarFilesComposite
 			}
 		};
 	}
-
+	
 	private ListValueModel<JarFileRef> buildItemListHolder() {
 		return new ItemPropertyListValueModelAdapter<JarFileRef>(
 			buildListHolder(),
 			JarFileRef.FILE_NAME_PROPERTY
 		);
 	}
-
+	
 	private ListValueModel<JarFileRef> buildListHolder() {
 		return new ListAspectAdapter<PersistenceUnit, JarFileRef>(getSubjectHolder(), PersistenceUnit.JAR_FILE_REFS_LIST) {
 			@Override
 			protected ListIterable<JarFileRef> getListIterable() {
 				return this.subject.getJarFileRefs();
 			}
-
+			
 			@Override
 			protected int size_() {
 				return this.subject.getJarFileRefsSize();
 			}
 		};
 	}
-
+	
 	private ModifiablePropertyValueModel<JarFileRef> buildSelectedItemHolder() {
 		return new SimplePropertyValueModel<JarFileRef>();
 	}
-
+	
 	private ILabelProvider buildLabelProvider() {
 		return new LabelProvider() {
 			@Override
 			public Image getImage(Object element) {
 				return JptJpaUiPlugin.getImage(JptUiIcons.JAR_FILE_REF);
 			}
-
+			
 			@Override
 			public String getText(Object element) {
 				JarFileRef jarFileRef = (JarFileRef) element;
 				String name = jarFileRef.getFileName();
-
+				
 				if (name == null) {
 					name = JptUiPersistenceMessages.PersistenceUnitJarFilesComposite_noFileName;
 				}
-
+				
 				return name;
 			}
 		};
 	}
-
+	
 	private void addJarFileRef() {
 		IProject project = getSubject().getJpaProject().getProject();
 
 		ElementTreeSelectionDialog dialog = new ArchiveFileSelectionDialog(
 			getShell(), buildJarFileDeploymentPathCalculator());
-
+		
 		dialog.setHelpAvailable(false);
 		dialog.setTitle(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_jarFileDialog_title);
 		dialog.setMessage(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_jarFileDialog_message);
@@ -170,8 +195,8 @@ public abstract class PersistenceUnitJarFilesComposite
 
 
 		dialog.setBlockOnOpen(true);
-
-		if (dialog.open() == Window.OK) {
+		
+		if (dialog.open() == Window.OK) {		
 			for (Object result : dialog.getResult()) {
 				String filePath = (String) result;
 				if (jarFileRefExists(filePath)) {
@@ -183,11 +208,11 @@ public abstract class PersistenceUnitJarFilesComposite
 			}
 		}
 	}
-
+	
 	protected ArchiveFileSelectionDialog.DeploymentPathCalculator buildJarFileDeploymentPathCalculator() {
 		return new ArchiveFileSelectionDialog.ModuleDeploymentPathCalculator();
 	}
-
+	
 	private boolean jarFileRefExists(String fileName) {
 		for (JarFileRef each : getSubject().getJarFileRefs()) {
 			if (each.getFileName().equals(fileName)) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
index f3417f1ca2..d9e11eb985 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java
@@ -52,11 +52,11 @@ import org.eclipse.ui.views.navigator.ResourceComparator;
 public abstract class PersistenceUnitMappingFilesComposite
 		extends Pane<PersistenceUnit> {
 
-	private ModifiablePropertyValueModel<MappingFileRef> selectedItemHolder;
+	private ModifiablePropertyValueModel<MappingFileRef> selectedItemHolder;	
 
 	public PersistenceUnitMappingFilesComposite(
 			Pane<? extends PersistenceUnit> parentPane, Composite parent) {
-
+		
 		super(parentPane, parent);
 	}
 
@@ -65,8 +65,8 @@ public abstract class PersistenceUnitMappingFilesComposite
 		super.initialize();
 		this.selectedItemHolder = buildSelectedItemHolder();
 	}
-
-
+	
+	
 	protected void addMappingFilesList(Composite container) {
 		// List pane
 		new AddRemoveListPane<PersistenceUnit>(
@@ -76,9 +76,23 @@ public abstract class PersistenceUnitMappingFilesComposite
 				buildItemListHolder(),
 				this.selectedItemHolder,
 				buildLabelProvider(),
-				JpaHelpContextIds.PERSISTENCE_XML_GENERAL);
+				JpaHelpContextIds.PERSISTENCE_XML_GENERAL) {
+			
+			@Override
+			protected Composite addContainer(Composite parent) {
+				parent = super.addContainer(parent);
+				updateGridData(parent);
+				return parent;
+			}
+			
+			@Override
+			protected void initializeLayout(Composite container) {
+				super.initializeLayout(container);
+				updateGridData(getContainer());
+			}
+		};
 	}
-
+	
 	/**
 	 * Prompts a dialog showing a tree structure of the source paths where the
 	 * only files shown are JPA mapping descriptors file. The XML file has to be
@@ -87,12 +101,12 @@ public abstract class PersistenceUnitMappingFilesComposite
 	 * @param listSelectionModel The selection model used to select the new files
 	 */
 	private void addJPAMappingDescriptor() {
-
+		
 		ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog(
 				getShell(),
 				new WorkbenchLabelProvider(),
 				new WorkbenchContentProvider());
-
+		
 		dialog.setHelpAvailable(false);
 		dialog.setValidator(buildValidator());
 		dialog.setTitle(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_mappingFileDialog_title);
@@ -117,13 +131,13 @@ public abstract class PersistenceUnitMappingFilesComposite
 			}
 		}
 	}
-
+	
 	private Adapter buildAdapter() {
 		return new AddRemoveListPane.AbstractAdapter() {
 			public void addNewItem(ObjectListSelectionModel listSelectionModel) {
 				addJPAMappingDescriptor();
 			}
-
+			
 			public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
 				for (Object item : listSelectionModel.selectedValues()) {
 					getSubject().removeSpecifiedMappingFileRef((MappingFileRef) item);
@@ -131,10 +145,10 @@ public abstract class PersistenceUnitMappingFilesComposite
 			}
 		};
 	}
-
+	
 	@Override
 	protected Composite addContainer(Composite parent) {
-
+		
 		GridLayout layout = new GridLayout(1, true);
 		layout.marginHeight = 0;
 		layout.marginWidth  = 0;
@@ -148,54 +162,54 @@ public abstract class PersistenceUnitMappingFilesComposite
 
 		return container;
 	}
-
+	
 	private ListValueModel<MappingFileRef> buildItemListHolder() {
 		return new ItemPropertyListValueModelAdapter<MappingFileRef>(
 				buildListHolder(),
 				MappingFileRef.FILE_NAME_PROPERTY);
 	}
-
+	
 	private ILabelProvider buildLabelProvider() {
 		return new LabelProvider() {
 			@Override
 			public Image getImage(Object element) {
 				return JptJpaUiPlugin.getImage(JptUiIcons.MAPPING_FILE_REF);
 			}
-
+			
 			@Override
 			public String getText(Object element) {
 				MappingFileRef mappingFileRef = (MappingFileRef) element;
 				String name = mappingFileRef.getFileName();
-
+				
 				if (name == null) {
 					name = JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_ormNoName;
 				}
-
+				
 				return name;
 			}
 		};
 	}
-
+	
 	private ListValueModel<MappingFileRef> buildListHolder() {
 		return new ListAspectAdapter<PersistenceUnit, MappingFileRef>(
 				getSubjectHolder(), PersistenceUnit.SPECIFIED_MAPPING_FILE_REFS_LIST) {
-
+			
 			@Override
 			protected ListIterable<MappingFileRef> getListIterable() {
 				return this.subject.getSpecifiedMappingFileRefs();
 			}
-
+			
 			@Override
 			protected int size_() {
 				return this.subject.getSpecifiedMappingFileRefsSize();
 			}
 		};
 	}
-
+	
 	private ModifiablePropertyValueModel<MappingFileRef> buildSelectedItemHolder() {
 		return new SimplePropertyValueModel<MappingFileRef>();
 	}
-
+	
 	private boolean mappingFileRefExists(String fileName) {
 		for (MappingFileRef mappingFileRef : getSubject().getSpecifiedMappingFileRefs()) {
 			if( mappingFileRef.getFileName().equals(fileName)) {
@@ -204,7 +218,7 @@ public abstract class PersistenceUnitMappingFilesComposite
 		}
 		return false;
 	}
-
+	
 	private ISelectionStatusValidator buildValidator() {
 		return new ISelectionStatusValidator() {
 			public IStatus validate(Object[] selection) {
@@ -223,11 +237,10 @@ public abstract class PersistenceUnitMappingFilesComposite
 			}
 		};
 	}
-
+	
 	private void updateGridData(Composite container) {
-
+		
 		GridData gridData = new GridData();
-		gridData.minimumHeight             = 150;
 		gridData.grabExcessHorizontalSpace = true;
 		gridData.grabExcessVerticalSpace   = true;
 		gridData.horizontalAlignment       = SWT.FILL;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java
index 868da66604..b67aa09d65 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java
@@ -31,11 +31,12 @@ import org.eclipse.jpt.common.utility.model.event.ListAddEvent;
 import org.eclipse.jpt.common.utility.model.event.ListChangeEvent;
 import org.eclipse.jpt.common.utility.model.event.ListRemoveEvent;
 import org.eclipse.jpt.common.utility.model.value.ListValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 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.persistence.PersistenceUnit;
 import org.eclipse.jpt.jpa.ui.details.JpaPageComposite;
 import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds;
+import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
 import org.eclipse.jpt.jpa.ui.internal.persistence.JptUiPersistenceMessages;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
@@ -272,9 +273,7 @@ public class PersistenceUnitPropertiesComposite extends Pane<PersistenceUnit>
 		@Override
 		protected Composite addContainer(Composite parent) {
 			Composite container = super.addContainer(parent);
-			GridData gridData = new GridData(GridData.FILL_BOTH);
-			gridData.heightHint = 300;
-			container.setLayoutData(gridData);
+			container.setLayoutData(new GridData(GridData.FILL_BOTH));
 			return container;
 		}