258538 - [JPA 2.0] Persistence Unit properties

7 files changed, 94 insertions, 23 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/GenericOrmGeneratorContainer2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/GenericOrmGeneratorContainer2_0.java
index 52edb38044..67b97d2aef 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/GenericOrmGeneratorContainer2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/GenericOrmGeneratorContainer2_0.java
@@ -10,6 +10,7 @@
 package org.eclipse.jpt.core.internal.jpa2.context;
 
 import org.eclipse.jpt.core.context.XmlContextNode;
+import org.eclipse.jpt.core.context.orm.OrmSequenceGenerator;
 import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmGeneratorContainer;
 import org.eclipse.jpt.core.jpa2.JpaFactory2_0;
 import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
@@ -25,21 +26,26 @@ public class GenericOrmGeneratorContainer2_0 extends GenericOrmGeneratorContaine
 	public GenericOrmGeneratorContainer2_0(XmlContextNode parent, XmlGeneratorContainer resourceGeneratorContainer) {
 		super(parent, resourceGeneratorContainer);
 	}
-	
+
 	@Override
 	protected JpaFactory2_0 getJpaFactory() {
 		return (JpaFactory2_0) super.getJpaFactory();
 	}
-	
+
 	@Override
 	protected XmlSequenceGenerator buildResourceSequenceGenerator() {
 		return Orm2_0Factory.eINSTANCE.createXmlSequenceGenerator();
 	}
-	
+
 	@Override
 	protected XmlTableGenerator buildResourceTableGenerator() {
 		return Orm2_0Factory.eINSTANCE.createXmlTableGenerator();
 	}
 
+	@Override
+	protected OrmSequenceGenerator buildSequenceGenerator(org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator resourceSequenceGenerator) {
+		return this.getJpaFactory().buildOrmSequenceGenerator2_0(this, (XmlSequenceGenerator) resourceSequenceGenerator);
+	}
+
 }
 	
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmIdMapping2_0Provider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmIdMapping2_0Provider.java
index 6c1a6f91e1..e99fd2d5b9 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmIdMapping2_0Provider.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmIdMapping2_0Provider.java
@@ -21,6 +21,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
 import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
 import org.eclipse.jpt.core.jpa2.JpaFactory2_0;
 import org.eclipse.jpt.core.jpa2.resource.orm.Orm2_0Factory;
+import org.eclipse.jpt.core.jpa2.resource.orm.XmlId;
 import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping;
 
 public class GenericOrmIdMapping2_0Provider
@@ -56,7 +57,7 @@ public class GenericOrmIdMapping2_0Provider
 	}
 
 	public OrmAttributeMapping buildMapping(OrmPersistentAttribute parent, XmlAttributeMapping resourceMapping, JpaFactory factory) {
-		return ((JpaFactory2_0) factory).buildOrmIdMapping(parent, (org.eclipse.jpt.core.resource.orm.XmlId) resourceMapping);
+		return ((JpaFactory2_0) factory).buildOrmIdMapping2_0(parent, (XmlId) resourceMapping);
 	}
 
 	public XmlAttributeMapping buildVirtualResourceMapping(OrmTypeMapping ormTypeMapping, JavaAttributeMapping javaAttributeMapping, JpaFactory factory) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java
index 26754d70d8..7c721d7219 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/Generic2_0JpaUiFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.jpt.core.context.java.JavaEmbeddable;
 import org.eclipse.jpt.core.context.java.JavaEntity;
 import org.eclipse.jpt.core.context.java.JavaIdMapping;
 import org.eclipse.jpt.core.context.java.JavaMappedSuperclass;
+import org.eclipse.jpt.core.context.orm.OrmEntity;
 import org.eclipse.jpt.core.context.persistence.PersistenceUnit;
 import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
 import org.eclipse.jpt.core.jpa2.context.persistence.connection.JpaConnection2_0;
@@ -28,6 +29,7 @@ import org.eclipse.jpt.ui.internal.jpa2.java.details.JavaEmbeddable2_0Composite;
 import org.eclipse.jpt.ui.internal.jpa2.java.details.JavaEntity2_0Composite;
 import org.eclipse.jpt.ui.internal.jpa2.java.details.JavaIdMapping2_0Composite;
 import org.eclipse.jpt.ui.internal.jpa2.java.details.JavaMappedSuperclass2_0Composite;
+import org.eclipse.jpt.ui.internal.jpa2.orm.details.OrmEntity2_0Composite;
 import org.eclipse.jpt.ui.internal.jpa2.persistence.connection.GenericPersistenceUnit2_0ConnectionTab;
 import org.eclipse.jpt.ui.internal.jpa2.persistence.options.GenericPersistenceUnit2_0OptionsTab;
 import org.eclipse.jpt.ui.internal.persistence.details.GenericPersistenceUnitGeneralComposite;
@@ -76,6 +78,14 @@ public class Generic2_0JpaUiFactory extends GenericJpaUiFactory
 			WidgetFactory widgetFactory) {
 		return new JavaIdMapping2_0Composite(subjectHolder, parent, widgetFactory);
 	}
+	
+	@Override
+	public JpaComposite createOrmEntityComposite(
+			PropertyValueModel<OrmEntity> subjectHolder,
+			Composite parent,
+			WidgetFactory widgetFactory) {
+		return new OrmEntity2_0Composite(subjectHolder, parent, widgetFactory);
+	}
 
 	// **************** persistence unit composites ****************************
 	@Override
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/mappings/details/Generation2_0Composite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/mappings/details/Generation2_0Composite.java
new file mode 100644
index 0000000000..7da8d12db9
--- /dev/null
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/mappings/details/Generation2_0Composite.java
@@ -0,0 +1,42 @@
+/*******************************************************************************
+* Copyright (c) 2009 Oracle. All rights reserved.
+* 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
+*******************************************************************************/
+package org.eclipse.jpt.ui.internal.jpa2.mappings.details;
+
+import org.eclipse.jpt.core.context.GeneratorContainer;
+import org.eclipse.jpt.ui.internal.mappings.details.GenerationComposite;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
+import org.eclipse.jpt.utility.model.value.PropertyValueModel;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ *  Generation2_0Composite
+ */
+public class Generation2_0Composite extends GenerationComposite
+{
+	
+	public Generation2_0Composite(
+		Pane<?> parentPane, 
+		PropertyValueModel<? extends GeneratorContainer> subjectHolder,
+		Composite parent) {
+
+			super(parentPane, subjectHolder, parent);
+	}
+
+	@Override
+	protected void addSequenceGeneratorComposite(Composite container, int topMargin, int leftMargin) {
+		new SequenceGenerator2_0Composite(
+			this,
+			this.buildSequenceGeneratorHolder(),
+			this.addSubPane(container, topMargin, leftMargin),
+			this.buildSequenceGeneratorBuilder()
+		);
+	}
+
+}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0Composite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0Composite.java
index ab9d786890..c34ca95179 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0Composite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0Composite.java
@@ -9,8 +9,11 @@
  ******************************************************************************/
 package org.eclipse.jpt.ui.internal.jpa2.orm.details;
 
+import org.eclipse.jpt.core.context.GeneratorContainer;
 import org.eclipse.jpt.core.context.orm.OrmEntity;
 import org.eclipse.jpt.ui.WidgetFactory;
+import org.eclipse.jpt.ui.internal.BaseJpaUiFactory;
+import org.eclipse.jpt.ui.internal.jpa2.mappings.details.Generation2_0Composite;
 import org.eclipse.jpt.ui.internal.jpa2.mappings.details.Overrides2_0Composite;
 import org.eclipse.jpt.ui.internal.orm.details.AbstractOrmEntityComposite;
 import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -43,5 +46,10 @@ public class OrmEntity2_0Composite extends AbstractOrmEntityComposite
 	protected void addAttributeOverridesComposite(Composite container) {
 		new Overrides2_0Composite(this, container);
 	}
-	
+
+	@Override
+	protected void addGeneratorsComposite(Composite container, PropertyValueModel<GeneratorContainer> generatorContainerHolder) {
+		new Generation2_0Composite(this, generatorContainerHolder, container);
+	}
+
 }
\ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0UiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0UiProvider.java
index 788193b1fd..6b8886eced 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0UiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jpa2/orm/details/OrmEntity2_0UiProvider.java
@@ -46,12 +46,12 @@ public class OrmEntity2_0UiProvider
 		super();
 	}
 	
-	
 	public JpaComposite buildPersistentTypeMappingComposite(
 			JpaUiFactory factory, 
 			PropertyValueModel<OrmEntity> subjectHolder, 
 			Composite parent, 
 			WidgetFactory widgetFactory) {
-		return new OrmEntity2_0Composite(subjectHolder, parent, widgetFactory);
+
+		return factory.createOrmEntityComposite(subjectHolder, parent, widgetFactory);
 	}
 }
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java
index 42cc25a96b..bc2322211d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java
@@ -89,37 +89,41 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 	@Override
 	protected void initializeLayout(Composite container) {
 
-		initializeTableGeneratorPane(container);
-		initializeSequenceGeneratorPane(container);
+		this.initializeTableGeneratorPane(container);
+		this.initializeSequenceGeneratorPane(container);
 	}
 
 	private void initializeSequenceGeneratorPane(Composite container) {
 
 		// Sequence Generator sub-section
-		container = addCollapsableSubSection(
-			addSubPane(container, 10),
+		container = this.addCollapsableSubSection(
+			this.addSubPane(container, 10),
 			JptUiMappingsMessages.GeneratorsComposite_sequenceGeneratorSection,
 			this.sequenceGeneratorExpansionStateHolder
 		);
 
 		// Sequence Generator check box
 		Button sequenceGeneratorCheckBox = addCheckBox(
-			addSubPane(container, 5),
+			this.addSubPane(container, 5),
 			JptUiMappingsMessages.GeneratorsComposite_sequenceGeneratorCheckBox,
-			buildSequenceGeneratorBooleanHolder(),
+			this.buildSequenceGeneratorBooleanHolder(),
 			JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR
 		);
 
 		// Sequence Generator pane
+		this.addSequenceGeneratorComposite(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16);
+	}
+	
+	protected void addSequenceGeneratorComposite(Composite container, int topMargin, int leftMargin) {
 		new SequenceGeneratorComposite(
 			this,
-			buildSequenceGeneratorHolder(),
-			addSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16),
-			buildSequenceGeneratorBuilder()
+			this.buildSequenceGeneratorHolder(),
+			this.addSubPane(container, topMargin, leftMargin),
+			this.buildSequenceGeneratorBuilder()
 		);
 	}
 
-	private PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder() {
+	protected PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder() {
 		return new PropertyAspectAdapter<GeneratorContainer, SequenceGenerator>(getSubjectHolder(), GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) {
 			@Override
 			protected SequenceGenerator buildValue_() {
@@ -128,7 +132,7 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		};
 	}
 
-	private GeneratorBuilder<SequenceGenerator> buildSequenceGeneratorBuilder() {
+	protected GeneratorBuilder<SequenceGenerator> buildSequenceGeneratorBuilder() {
 		return new GeneratorBuilder<SequenceGenerator>() {
 			public SequenceGenerator addGenerator() {
 				return getSubject().addSequenceGenerator();
@@ -166,9 +170,9 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		);
 
 		Button tableGeneratorCheckBox = addCheckBox(
-			addSubPane(container, 5),
+			this.addSubPane(container, 5),
 			JptUiMappingsMessages.GeneratorsComposite_tableGeneratorCheckBox,
-			buildTableGeneratorBooleanHolder(),
+			this.buildTableGeneratorBooleanHolder(),
 			JpaHelpContextIds.MAPPING_TABLE_GENERATOR
 		);
 
@@ -176,9 +180,9 @@ public class GenerationComposite extends Pane<GeneratorContainer>
 		// Table Generator pane
 		new TableGeneratorComposite(
 			this,
-			buildTableGeneratorHolder(),
-			addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16),
-			buildTableGeneratorBuilder()
+			this.buildTableGeneratorHolder(),
+			this.addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16),
+			this.buildTableGeneratorBuilder()
 		);
 	}