Context model separation - preparation for Eclipselink orm context model

6 files changed, 31 insertions, 26 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlAndMapHandler.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlAndMapHandler.java
index 60b378464d..e6aa8e379e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlAndMapHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlAndMapHandler.java
@@ -40,7 +40,7 @@ public class AddPersistentAttributeToXmlAndMapHandler extends AbstractHandler
 		
 		// only applies for multiply selected OrmPersistentAttribute objects in a tree
 		for (OrmPersistentAttribute attribute : (Iterable<OrmPersistentAttribute>) CollectionTools.iterable(selection.iterator())) {
-			OrmPersistentType type = attribute.getOrmPersistentType();
+			OrmPersistentType type = attribute.getPersistentType();
 			String attributeName = attribute.getName();
 			
 			AddPersistentAttributeToXmlAndMapDialog dialog = new AddPersistentAttributeToXmlAndMapDialog(window.getShell(), attribute);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlHandler.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlHandler.java
index 710e879c5c..0b9cffa87e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/AddPersistentAttributeToXmlHandler.java
@@ -38,7 +38,7 @@ public class AddPersistentAttributeToXmlHandler extends AbstractHandler
 		
 		// only applies for multiply selected OrmPersistentAttribute objects in a tree
 		for (OrmPersistentAttribute attribute : (Iterable<OrmPersistentAttribute>) CollectionTools.iterable(selection.iterator())) {
-			OrmPersistentType type = attribute.getOrmPersistentType();
+			OrmPersistentType type = attribute.getPersistentType();
 			String attributeName = attribute.getName();
 			attribute.makeSpecified();
 			OrmPersistentAttribute newAttribute = type.getAttributeNamed(attributeName);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentAttributeFromXmlHandler.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentAttributeFromXmlHandler.java
index 9ebd38db41..54c567a2df 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentAttributeFromXmlHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentAttributeFromXmlHandler.java
@@ -38,7 +38,7 @@ public class RemovePersistentAttributeFromXmlHandler extends AbstractHandler
 		
 		// only applies for multiply selected OrmPersistentAttribute objects in a tree
 		for (OrmPersistentAttribute attribute : (Iterable<OrmPersistentAttribute>) CollectionTools.iterable(selection.iterator())) {
-			OrmPersistentType type = attribute.getOrmPersistentType();
+			OrmPersistentType type = attribute.getPersistentType();
 			String attributeName = attribute.getName();
 			attribute.makeVirtual();
 			OrmPersistentAttribute newAttribute = type.getAttributeNamed(attributeName);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentClassHandler.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentClassHandler.java
index 2b60193472..8286d18925 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentClassHandler.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/commands/RemovePersistentClassHandler.java
@@ -15,6 +15,7 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jpt.core.context.orm.EntityMappings;
 import org.eclipse.jpt.core.context.orm.OrmPersistentType;
 import org.eclipse.ui.handlers.HandlerUtil;
 
@@ -28,7 +29,7 @@ public class RemovePersistentClassHandler extends AbstractHandler
 		// only applies for multiply selected OrmPersistentType objects in a tree
 		for (Iterator<OrmPersistentType> stream = selection.iterator(); stream.hasNext(); ) {
 			OrmPersistentType persistentType = stream.next();
-			persistentType.getEntityMappings().removeOrmPersistentType(persistentType);
+			((EntityMappings) persistentType.getMappingFileRoot()).removeOrmPersistentType(persistentType);
 		}
 		
 		return null;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSecondaryTablesComposite.java
index 5f5aafd983..3696240720 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSecondaryTablesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSecondaryTablesComposite.java
@@ -23,8 +23,8 @@ import org.eclipse.jpt.ui.internal.mappings.details.AbstractSecondaryTablesCompo
 import org.eclipse.jpt.ui.internal.mappings.details.PrimaryKeyJoinColumnsInSecondaryTableComposite;
 import org.eclipse.jpt.ui.internal.mappings.details.SecondaryTableDialog;
 import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.FormPane;
 import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
 import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel;
 import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueModelAdapter;
 import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
@@ -170,17 +170,21 @@ public class OrmSecondaryTablesComposite extends AbstractSecondaryTablesComposit
 			container
 		);
 	}
-
+	
 	private void installListPaneEnabler(WritablePropertyValueModel<Boolean> defineInXmlHolder,
 	                                    AddRemoveListPane<Entity> listPane) {
 
 		new PaneEnabler(defineInXmlHolder, listPane);
 	}
-
+	
 	@Override
 	protected SecondaryTableDialog buildSecondaryTableDialogForAdd() {
-		//defaultSchema and defaultCatalog should not be taken from the Table in this case.  The table default schema could be what is the specified schema on the java table.
-		return new SecondaryTableDialog(getControl().getShell(), getSubject().getJpaProject(), getSubject().getEntityMappings().getDefaultCatalog(), getSubject().getEntityMappings().getDefaultSchema());
+		// defaultSchema and defaultCatalog should not be taken from the Table in this case.  
+		// The table default schema could be what is the specified schema on the java table.
+		return new SecondaryTableDialog(
+			getControl().getShell(), getSubject().getJpaProject(), 
+			getSubject().getMappingFileRoot().getCatalog(), 
+			getSubject().getMappingFileRoot().getSchema());
 	}
 
 	private class DefineInXmlHolder extends ListPropertyValueModelAdapter<Boolean>
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java
index 413ee6b4f0..ab978eebae 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.orm.details;
 
 import java.util.Collection;
 import org.eclipse.jpt.core.context.AccessType;
-import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults;
+import org.eclipse.jpt.core.context.orm.OrmPersistenceUnitDefaults;
 import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata;
 import org.eclipse.jpt.db.SchemaContainer;
 import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
@@ -49,7 +49,7 @@ import org.eclipse.swt.widgets.Composite;
  * -----------------------------------------------------------------------------</pre>
  *
  * @see PersistenceUnitMetadata
- * @see PersistenceUnitDefaults
+ * @see OrmPersistenceUnitDefaults
  * @see EntityMappingsDetailsPage - The parent container
  * @see CatalogCombo
  * @see SchemaCombo
@@ -75,14 +75,14 @@ public class PersistenceUnitMetadataComposite extends FormPane<PersistenceUnitMe
 		super(parentPane, subjectHolder, parent);
 	}
 
-	private EnumFormComboViewer<PersistenceUnitDefaults, AccessType> addAccessTypeCombo(Composite container) {
+	private EnumFormComboViewer<OrmPersistenceUnitDefaults, AccessType> addAccessTypeCombo(Composite container) {
 
-		return new EnumFormComboViewer<PersistenceUnitDefaults, AccessType>(this, buildPersistenceUnitDefaultsHolder(), container) {
+		return new EnumFormComboViewer<OrmPersistenceUnitDefaults, AccessType>(this, buildPersistenceUnitDefaultsHolder(), container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(PersistenceUnitDefaults.ACCESS_PROPERTY);
+				propertyNames.add(OrmPersistenceUnitDefaults.ACCESS_PROPERTY);
 			}
 
 			@Override
@@ -117,7 +117,7 @@ public class PersistenceUnitMetadataComposite extends FormPane<PersistenceUnitMe
 	}
 
 	private WritablePropertyValueModel<Boolean> buildCascadePersistHolder() {
-		return new PropertyAspectAdapter<PersistenceUnitDefaults, Boolean>(buildPersistenceUnitDefaultsHolder(), PersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY) {
+		return new PropertyAspectAdapter<OrmPersistenceUnitDefaults, Boolean>(buildPersistenceUnitDefaultsHolder(), OrmPersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY) {
 			@Override
 			protected Boolean buildValue_() {
 				return subject.isCascadePersist();
@@ -130,15 +130,15 @@ public class PersistenceUnitMetadataComposite extends FormPane<PersistenceUnitMe
 		};
 	}
 
-	private CatalogCombo<PersistenceUnitDefaults> addCatalogCombo(Composite container) {
+	private CatalogCombo<OrmPersistenceUnitDefaults> addCatalogCombo(Composite container) {
 
-		return new CatalogCombo<PersistenceUnitDefaults>(this, buildPersistenceUnitDefaultsHolder(), container) {
+		return new CatalogCombo<OrmPersistenceUnitDefaults>(this, buildPersistenceUnitDefaultsHolder(), container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(PersistenceUnitDefaults.DEFAULT_CATALOG_PROPERTY);
-				propertyNames.add(PersistenceUnitDefaults.SPECIFIED_CATALOG_PROPERTY);
+				propertyNames.add(OrmPersistenceUnitDefaults.DEFAULT_CATALOG_PROPERTY);
+				propertyNames.add(OrmPersistenceUnitDefaults.SPECIFIED_CATALOG_PROPERTY);
 			}
 
 			@Override
@@ -158,24 +158,24 @@ public class PersistenceUnitMetadataComposite extends FormPane<PersistenceUnitMe
 		};
 	}
 
-	private PropertyValueModel<PersistenceUnitDefaults> buildPersistenceUnitDefaultsHolder() {
-		return new TransformationPropertyValueModel<PersistenceUnitMetadata, PersistenceUnitDefaults>(getSubjectHolder()) {
+	private PropertyValueModel<OrmPersistenceUnitDefaults> buildPersistenceUnitDefaultsHolder() {
+		return new TransformationPropertyValueModel<PersistenceUnitMetadata, OrmPersistenceUnitDefaults>(getSubjectHolder()) {
 			@Override
-			protected PersistenceUnitDefaults transform_(PersistenceUnitMetadata value) {
+			protected OrmPersistenceUnitDefaults transform_(PersistenceUnitMetadata value) {
 				return value.getPersistenceUnitDefaults();
 			}
 		};
 	}
 
-	private SchemaCombo<PersistenceUnitDefaults> addSchemaCombo(Composite container) {
+	private SchemaCombo<OrmPersistenceUnitDefaults> addSchemaCombo(Composite container) {
 
-		return new SchemaCombo<PersistenceUnitDefaults>(this, buildPersistenceUnitDefaultsHolder(), container) {
+		return new SchemaCombo<OrmPersistenceUnitDefaults>(this, buildPersistenceUnitDefaultsHolder(), container) {
 
 			@Override
 			protected void addPropertyNames(Collection<String> propertyNames) {
 				super.addPropertyNames(propertyNames);
-				propertyNames.add(PersistenceUnitDefaults.DEFAULT_SCHEMA_PROPERTY);
-				propertyNames.add(PersistenceUnitDefaults.SPECIFIED_SCHEMA_PROPERTY);
+				propertyNames.add(OrmPersistenceUnitDefaults.DEFAULT_SCHEMA_PROPERTY);
+				propertyNames.add(OrmPersistenceUnitDefaults.SPECIFIED_SCHEMA_PROPERTY);
 			}
 
 			@Override