295613 - Persistence.xml > Customization Tab - Add Descriptor Customizer receive Error

2 files changed, 18 insertions, 7 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java
index 785bf557b4..dfbca9ad71 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/caching/EntityListComposite.java
@@ -32,6 +32,7 @@ import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
 import org.eclipse.jpt.ui.internal.util.PaneEnabler;
 import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
 import org.eclipse.jpt.ui.internal.widgets.Pane;
+import org.eclipse.jpt.utility.internal.CollectionTools;
 import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
 import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
 import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
@@ -49,19 +50,26 @@ import org.eclipse.ui.progress.IProgressService;
  */
 public class EntityListComposite<T extends Caching> extends Pane<T>
 {
+	WritablePropertyValueModel<Entity> entityHolder;
+	
 	public EntityListComposite(Pane<T> parentComposite, Composite parent) {
 
 		super(parentComposite, parent);
 	}
 
 	@Override
+	protected void initialize() {
+		super.initialize();
+		this.entityHolder = this.buildEntityHolder();
+	}
+
+	@Override
 	protected void initializeLayout(Composite container) {
 
 		container = this.addTitledGroup(
 			container,
 			EclipseLinkUiMessages.CachingEntityListComposite_groupTitle
 		);
-		WritablePropertyValueModel<Entity> entityHolder = this.buildEntityHolder();
 
 		// Entities add/remove list pane
 		new AddRemoveListPane<Caching>(
@@ -69,7 +77,7 @@ public class EntityListComposite<T extends Caching> extends Pane<T>
 			container,
 			this.buildEntitiesAdapter(),
 			this.buildEntitiesListHolder(),
-			entityHolder,
+			this.entityHolder,
 			this.buildEntityLabelProvider(),
 			EclipseLinkHelpContextIds.PERSISTENCE_CACHING
 		);
@@ -77,10 +85,10 @@ public class EntityListComposite<T extends Caching> extends Pane<T>
 		// Entity Caching property pane
 		EntityCachingPropertyComposite pane = new EntityCachingPropertyComposite(
 			this,
-			entityHolder,
+			this.entityHolder,
 			container
 		);
-		this.installPaneEnabler(entityHolder, pane);
+		this.installPaneEnabler(this.entityHolder, pane);
 	}
 	
 	private AddRemoveListPane.Adapter buildEntitiesAdapter() {
@@ -111,8 +119,10 @@ public class EntityListComposite<T extends Caching> extends Pane<T>
 			
 			if( ! this.getSubject().entityExists(entityName)) {
 				this.getSubject().addEntity(entityName);
-
-				listSelectionModel.setSelectedValue(entityName);
+				int index = CollectionTools.indexOf(this.getSubject().entityNames(), entityName);
+				Entity entity = (Entity) listSelectionModel.getListModel().getElementAt(index);
+				listSelectionModel.setSelectedValue(entity);
+				this.entityHolder.setValue(entity);
 			}
 		}
 	}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java
index b939ced06b..c08bc35d49 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/persistence/customization/EntityListComposite.java
@@ -119,8 +119,9 @@ public class EntityListComposite extends Pane<Customization>
 			
 			if( ! this.getSubject().entityExists(entityName)) {
 				this.getSubject().addEntity(entityName);
-				int index = CollectionTools.indexOf(this.getSubject().entities(), entityName);
+				int index = CollectionTools.indexOf(this.getSubject().entityNames(), entityName);
 				Entity entity = (Entity) listSelectionModel.getListModel().getElementAt(index);
+				listSelectionModel.setSelectedValue(entity);
 				this.entityHolder.setValue(entity);
 			}
 		}