diff options
author | kmoore | 2008-02-25 16:20:08 +0000 |
---|---|---|
committer | kmoore | 2008-02-25 16:20:08 +0000 |
commit | 799475ec15f7f5d8838fef3d8397d38fde082111 (patch) | |
tree | 45e8be97e6d1f3db423baf767a669e8955790b84 /jpa/plugins | |
parent | b7f9a0cb92fdf23807be30cb6ca97b579f7a7a8b (diff) | |
download | webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.tar.gz webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.tar.xz webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.zip |
Refactored packages into public API, renamed interfaces
Diffstat (limited to 'jpa/plugins')
839 files changed, 15632 insertions, 19331 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF index da2cd267a4..cd34ef3bea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.core;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.jpt.core.internal.JptCorePlugin +Bundle-Activator: org.eclipse.jpt.core.JptCorePlugin Bundle-ClassPath: . Bundle-Localization: plugin Eclipse-LazyStart: true @@ -34,8 +34,13 @@ Require-Bundle: org.eclipse.core.commands, org.eclipse.wst.validation, org.eclipse.wst.xml.core, org.eclipse.xsd -Export-Package: org.eclipse.jpt.core.internal;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.context.base;x-friends:="org.eclipse.jpt.ui", +Export-Package: org.eclipse.jpt.core, + org.eclipse.jpt.core.context, + org.eclipse.jpt.core.context.java, + org.eclipse.jpt.core.context.orm, + org.eclipse.jpt.core.context.persistence, + org.eclipse.jpt.core.internal;x-friends:="org.eclipse.jpt.ui", + org.eclipse.jpt.core.internal.context, org.eclipse.jpt.core.internal.context.java;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.context.orm;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.context.persistence, @@ -46,15 +51,14 @@ Export-Package: org.eclipse.jpt.core.internal;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.platform.base;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.platform.generic;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.prefs;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.resource.common;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.resource.common.translators;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.resource.java;x-friends:="org.eclipse.jpt.ui,org.eclipse.jpt.gen", - org.eclipse.jpt.core.internal.resource.orm;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.resource.orm.translators;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.resource.orm.util;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.resource.persistence;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.resource.persistence.translators;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.resource.persistence.util;x-friends:="org.eclipse.jpt.ui", org.eclipse.jpt.core.internal.synch;x-friends:="org.eclipse.jpt.ui", - org.eclipse.jpt.core.internal.validation;x-friends:="org.eclipse.jpt.ui" + org.eclipse.jpt.core.internal.validation;x-friends:="org.eclipse.jpt.ui", + org.eclipse.jpt.core.resource.common;x-friends:="org.eclipse.jpt.ui", + org.eclipse.jpt.core.resource.java, + org.eclipse.jpt.core.resource.orm;x-friends:="org.eclipse.jpt.ui", + org.eclipse.jpt.core.resource.persistence;x-friends:="org.eclipse.jpt.ui" Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore index 932907c7c4..1c984eaeb2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore +++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore @@ -15,21 +15,21 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="#//AccessType" defaultValueLiteral="PROPERTY"/> <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerators" upperBound="-1" - eType="#//SequenceGenerator" containment="true" resolveProxies="false"/> + eType="#//XmlSequenceGenerator" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerators" upperBound="-1" - eType="#//TableGenerator" containment="true" resolveProxies="false"/> + eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedQueries" upperBound="-1" - eType="#//NamedQuery" containment="true" resolveProxies="false"/> + eType="#//XmlNamedQuery" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedNativeQueries" upperBound="-1" - eType="#//NamedNativeQuery" containment="true" resolveProxies="false"/> + eType="#//XmlNamedNativeQuery" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1" eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="mappedSuperclasses" upperBound="-1" - eType="#//MappedSuperclass" containment="true" resolveProxies="false"/> + eType="#//XmlMappedSuperclass" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="entities" upperBound="-1" - eType="#//Entity" containment="true" resolveProxies="false"/> + eType="#//XmlEntity" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="embeddables" upperBound="-1" - eType="#//Embeddable" containment="true" resolveProxies="false"/> + eType="#//XmlEmbeddable" containment="true" resolveProxies="false"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="PersistenceUnitMetadata"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="xmlMappingMetadataComplete" @@ -46,7 +46,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="entityListeners" eType="#//EntityListeners" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TypeMapping" abstract="true"> + <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeMapping" abstract="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="access" eType="#//AccessType" @@ -56,7 +56,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" eType="#//Attributes" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MappedSuperclass" eSuperTypes="#//TypeMapping"> + <eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass" eSuperTypes="#//AbstractTypeMapping"> <eStructuralFeatures xsi:type="ecore:EReference" name="idClass" eType="#//IdClass" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners" @@ -80,29 +80,29 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="postLoad" eType="#//PostLoad" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Entity" eSuperTypes="#//TypeMapping"> + <eClassifiers xsi:type="ecore:EClass" name="XmlEntity" eSuperTypes="#//AbstractTypeMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//Table" + <eStructuralFeatures xsi:type="ecore:EReference" name="table" eType="#//XmlTable" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="secondaryTables" upperBound="-1" - eType="#//SecondaryTable" containment="true" resolveProxies="false"/> + eType="#//XmlSecondaryTable" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns" - upperBound="-1" eType="#//PrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> + upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="idClass" eType="#//IdClass" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="inheritance" eType="#//Inheritance" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorValue" eType="#//DiscriminatorValue"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//DiscriminatorColumn" + <eStructuralFeatures xsi:type="ecore:EReference" name="discriminatorColumn" eType="#//XmlDiscriminatorColumn" containment="true" resolveProxies="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//SequenceGenerator" + <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//XmlSequenceGenerator" containment="true" resolveProxies="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//TableGenerator" + <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedQueries" upperBound="-1" - eType="#//NamedQuery" containment="true" resolveProxies="false"/> + eType="#//XmlNamedQuery" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="namedNativeQueries" upperBound="-1" - eType="#//NamedNativeQuery" containment="true" resolveProxies="false"/> + eType="#//XmlNamedNativeQuery" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="sqlResultSetMappings" upperBound="-1" eType="#//SqlResultSetMapping" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="excludeDefaultListeners" @@ -126,82 +126,83 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="postLoad" eType="#//PostLoad" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="attributeOverrides" upperBound="-1" - eType="#//AttributeOverride" containment="true" resolveProxies="false"/> + eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="associationOverrides" upperBound="-1" - eType="#//AssociationOverride" containment="true" resolveProxies="false"/> + eType="#//XmlAssociationOverride" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Embeddable" eSuperTypes="#//TypeMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddable" eSuperTypes="#//AbstractTypeMapping"/> <eClassifiers xsi:type="ecore:EClass" name="Attributes"> - <eStructuralFeatures xsi:type="ecore:EReference" name="ids" upperBound="-1" eType="#//Id" + <eStructuralFeatures xsi:type="ecore:EReference" name="ids" upperBound="-1" eType="#//Xmld" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="embeddedIds" upperBound="-1" - eType="#//EmbeddedId" containment="true" resolveProxies="false"/> + eType="#//XmlEmbeddedId" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="basics" upperBound="-1" - eType="#//Basic" containment="true" resolveProxies="false"/> + eType="#//XmlBasic" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="versions" upperBound="-1" - eType="#//Version" containment="true" resolveProxies="false"/> + eType="#//XmlVersion" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="manyToOnes" upperBound="-1" - eType="#//ManyToOne" containment="true" resolveProxies="false"/> + eType="#//XmlManyToOne" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="oneToManys" upperBound="-1" - eType="#//OneToMany" containment="true" resolveProxies="false"/> + eType="#//XmlOneToMany" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="oneToOnes" upperBound="-1" - eType="#//OneToOne" containment="true" resolveProxies="false"/> + eType="#//XmlOneToOne" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="manyToManys" upperBound="-1" - eType="#//ManyToMany" containment="true" resolveProxies="false"/> + eType="#//XmlManyToMany" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="embeddeds" upperBound="-1" - eType="#//Embedded" containment="true" resolveProxies="false"/> + eType="#//XmlEmbedded" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="transients" upperBound="-1" - eType="#//Transient" containment="true" resolveProxies="false"/> + eType="#//XmlTransient" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AttributeMapping" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeMapping" abstract="true" + interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="ColumnMapping" abstract="true" interface="true"> - <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//Column" + <eStructuralFeatures xsi:type="ecore:EReference" name="column" eType="#//XmlColumn" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="RelationshipMapping" abstract="true" - interface="true" eSuperTypes="#//AttributeMapping"> + <eClassifiers xsi:type="ecore:EClass" name="XmlRelationshipMapping" abstract="true" + interface="true" eSuperTypes="#//XmlAttributeMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="targetEntity" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType" defaultValueLiteral="LAZY"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="joinTable" eType="#//JoinTable" + <eStructuralFeatures xsi:type="ecore:EReference" name="joinTable" eType="#//XmlJoinTable" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="cascade" eType="#//CascadeType" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="MultiRelationshipMapping" abstract="true" - interface="true" eSuperTypes="#//RelationshipMapping"> + <eClassifiers xsi:type="ecore:EClass" name="XmlMultiRelationshipMapping" abstract="true" + interface="true" eSuperTypes="#//XmlRelationshipMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="mappedBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="orderBy" eType="#//OrderBy"/> <eStructuralFeatures xsi:type="ecore:EReference" name="mapKey" eType="#//MapKey" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SingleRelationshipMapping" abstract="true" - interface="true" eSuperTypes="#//RelationshipMapping"> + <eClassifiers xsi:type="ecore:EClass" name="XmlSingleRelationshipMapping" abstract="true" + interface="true" eSuperTypes="#//XmlRelationshipMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1" - eType="#//JoinColumn" containment="true" resolveProxies="false"/> + eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Id" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping #//ColumnMapping"> - <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="#//GeneratedValue" + <eClassifiers xsi:type="ecore:EClass" name="Xmld" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping #//ColumnMapping"> + <eStructuralFeatures xsi:type="ecore:EReference" name="generatedValue" eType="#//XmlGeneratedValue" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//TableGenerator" + <eStructuralFeatures xsi:type="ecore:EReference" name="tableGenerator" eType="#//XmlTableGenerator" containment="true" resolveProxies="false"/> - <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//SequenceGenerator" + <eStructuralFeatures xsi:type="ecore:EReference" name="sequenceGenerator" eType="#//XmlSequenceGenerator" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="IdImpl" eSuperTypes="#//Id"/> - <eClassifiers xsi:type="ecore:EClass" name="EmbeddedId" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping"> + <eClassifiers xsi:type="ecore:EClass" name="IdImpl" eSuperTypes="#//Xmld"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbeddedId" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping"> <eStructuralFeatures xsi:type="ecore:EReference" name="attributeOverrides" upperBound="-1" - eType="#//AttributeOverride" containment="true" resolveProxies="false"/> + eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EmbeddedIdImpl" eSuperTypes="#//EmbeddedId"/> - <eClassifiers xsi:type="ecore:EClass" name="Basic" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping #//ColumnMapping"> + <eClassifiers xsi:type="ecore:EClass" name="EmbeddedIdImpl" eSuperTypes="#//XmlEmbeddedId"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlBasic" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping #//ColumnMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="fetch" eType="#//FetchType" defaultValueLiteral="LAZY"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> @@ -209,51 +210,52 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="enumerated" eType="#//EnumType"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="BasicImpl" eSuperTypes="#//Basic"/> - <eClassifiers xsi:type="ecore:EClass" name="Version" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping #//ColumnMapping"> + <eClassifiers xsi:type="ecore:EClass" name="BasicImpl" eSuperTypes="#//XmlBasic"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlVersion" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping #//ColumnMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="temporal" eType="#//TemporalType"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="VersionImpl" eSuperTypes="#//Version"/> - <eClassifiers xsi:type="ecore:EClass" name="ManyToOne" abstract="true" interface="true" - eSuperTypes="#//SingleRelationshipMapping"/> - <eClassifiers xsi:type="ecore:EClass" name="ManyToOneImpl" eSuperTypes="#//ManyToOne"/> - <eClassifiers xsi:type="ecore:EClass" name="OneToMany" abstract="true" interface="true" - eSuperTypes="#//MultiRelationshipMapping"> + <eClassifiers xsi:type="ecore:EClass" name="VersionImpl" eSuperTypes="#//XmlVersion"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToOne" abstract="true" interface="true" + eSuperTypes="#//XmlSingleRelationshipMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="ManyToOneImpl" eSuperTypes="#//XmlManyToOne"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany" abstract="true" interface="true" + eSuperTypes="#//XmlMultiRelationshipMapping"> <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1" - eType="#//JoinColumn" containment="true" resolveProxies="false"/> + eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OneToManyImpl" eSuperTypes="#//OneToMany"/> - <eClassifiers xsi:type="ecore:EClass" name="OneToOne" abstract="true" interface="true" - eSuperTypes="#//SingleRelationshipMapping"> + <eClassifiers xsi:type="ecore:EClass" name="OneToManyImpl" eSuperTypes="#//XmlOneToMany"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne" abstract="true" interface="true" + eSuperTypes="#//XmlSingleRelationshipMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="mappedBy" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns" - upperBound="-1" eType="#//PrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> - </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="OneToOneImpl" eSuperTypes="#//OneToOne"/> - <eClassifiers xsi:type="ecore:EClass" name="ManyToMany" abstract="true" interface="true" - eSuperTypes="#//MultiRelationshipMapping"/> - <eClassifiers xsi:type="ecore:EClass" name="ManyToManyImpl" eSuperTypes="#//ManyToMany"/> - <eClassifiers xsi:type="ecore:EClass" name="Embedded" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping"> + upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="OneToOneImpl" eSuperTypes="#//XmlOneToOne"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany" abstract="true" interface="true" + eSuperTypes="#//XmlMultiRelationshipMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="ManyToManyImpl" eSuperTypes="#//XmlManyToMany"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping"> <eStructuralFeatures xsi:type="ecore:EReference" name="attributeOverrides" upperBound="-1" - eType="#//AttributeOverride" containment="true" resolveProxies="false"/> + eType="#//XmlAttributeOverride" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="EmbeddedImpl" eSuperTypes="#//Embedded"/> - <eClassifiers xsi:type="ecore:EClass" name="Transient" abstract="true" interface="true" - eSuperTypes="#//AttributeMapping"/> - <eClassifiers xsi:type="ecore:EClass" name="TransientImpl" eSuperTypes="#//Transient"/> - <eClassifiers xsi:type="ecore:EClass" name="AssociationOverride"> + <eClassifiers xsi:type="ecore:EClass" name="EmbeddedImpl" eSuperTypes="#//XmlEmbedded"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlTransient" abstract="true" interface="true" + eSuperTypes="#//XmlAttributeMapping"/> + <eClassifiers xsi:type="ecore:EClass" name="TransientImpl" eSuperTypes="#//XmlTransient"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlAssociationOverride"> <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" lowerBound="1" - upperBound="-1" eType="#//JoinColumn" containment="true" resolveProxies="false"/> + upperBound="-1" eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AttributeOverride" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlAttributeOverride" abstract="true" + interface="true"> <eStructuralFeatures xsi:type="ecore:EReference" name="column" lowerBound="1" - eType="#//Column" containment="true" resolveProxies="false"/> + eType="#//XmlColumn" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AttributeOverrideImpl" eSuperTypes="#//AttributeOverride"/> + <eClassifiers xsi:type="ecore:EClass" name="AttributeOverrideImpl" eSuperTypes="#//XmlAttributeOverride"/> <eClassifiers xsi:type="ecore:EClass" name="CascadeType" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeAll" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadePersist" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/> @@ -262,29 +264,29 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="cascadeRefresh" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//Boolean"/> </eClassifiers> <eClassifiers xsi:type="ecore:EClass" name="CascadeTypeImpl" eSuperTypes="#//CascadeType"/> - <eClassifiers xsi:type="ecore:EClass" name="NamedColumn" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlNamedColumn" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnDefinition" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AbstractColumn" abstract="true" interface="true" - eSuperTypes="#//NamedColumn"> + <eClassifiers xsi:type="ecore:EClass" name="XmlAbstractColumn" abstract="true" interface="true" + eSuperTypes="#//XmlNamedColumn"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="insertable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="updatable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Column" abstract="true" interface="true" - eSuperTypes="#//AbstractColumn"> + <eClassifiers xsi:type="ecore:EClass" name="XmlColumn" abstract="true" interface="true" + eSuperTypes="#//XmlAbstractColumn"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="precision" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="scale" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="ColumnImpl" eSuperTypes="#//Column"/> + <eClassifiers xsi:type="ecore:EClass" name="ColumnImpl" eSuperTypes="#//XmlColumn"/> <eClassifiers xsi:type="ecore:EClass" name="ColumnResult"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="DiscriminatorColumn" eSuperTypes="#//NamedColumn"> + <eClassifiers xsi:type="ecore:EClass" name="XmlDiscriminatorColumn" eSuperTypes="#//XmlNamedColumn"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="discriminatorType" eType="#//DiscriminatorType" defaultValueLiteral="STRING"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="length" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> @@ -327,12 +329,12 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="column" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GeneratedValue" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlGeneratedValue" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="generator" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//GenerationType" defaultValueLiteral="TABLE"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="GeneratedValueImpl" eSuperTypes="#//GeneratedValue"/> + <eClassifiers xsi:type="ecore:EClass" name="GeneratedValueImpl" eSuperTypes="#//XmlGeneratedValue"/> <eClassifiers xsi:type="ecore:EClass" name="IdClass"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="className" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> @@ -341,19 +343,19 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strategy" eType="#//InheritanceType" defaultValueLiteral="SINGLE_TABLE"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="JoinColumn" abstract="true" interface="true" - eSuperTypes="#//AbstractColumn"> + <eClassifiers xsi:type="ecore:EClass" name="XmlJoinColumn" abstract="true" interface="true" + eSuperTypes="#//XmlAbstractColumn"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedColumnName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="JoinColumnImpl" eSuperTypes="#//JoinColumn"/> - <eClassifiers xsi:type="ecore:EClass" name="JoinTable" abstract="true" interface="true" - eSuperTypes="#//AbstractTable"> + <eClassifiers xsi:type="ecore:EClass" name="JoinColumnImpl" eSuperTypes="#//XmlJoinColumn"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlJoinTable" abstract="true" interface="true" + eSuperTypes="#//XmlAbstractTable"> <eStructuralFeatures xsi:type="ecore:EReference" name="joinColumns" upperBound="-1" - eType="#//JoinColumn" containment="true" resolveProxies="false"/> + eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/> <eStructuralFeatures xsi:type="ecore:EReference" name="inverseJoinColumns" upperBound="-1" - eType="#//JoinColumn" containment="true" resolveProxies="false"/> + eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="JoinTableImpl" eSuperTypes="#//JoinTable"/> + <eClassifiers xsi:type="ecore:EClass" name="JoinTableImpl" eSuperTypes="#//XmlJoinTable"/> <eClassifiers xsi:type="ecore:EClass" name="Lob"/> <eClassifiers xsi:type="ecore:EClass" name="MapKey" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> @@ -363,13 +365,13 @@ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="hints" upperBound="-1" - eType="#//QueryHint" containment="true" resolveProxies="false"/> + eType="#//XmlQueryHint" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="NamedNativeQuery" eSuperTypes="#//Query"> + <eClassifiers xsi:type="ecore:EClass" name="XmlNamedNativeQuery" eSuperTypes="#//Query"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultClass" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="resultSetMapping" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="NamedQuery" eSuperTypes="#//Query"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlNamedQuery" eSuperTypes="#//Query"/> <eClassifiers xsi:type="ecore:EClass" name="PostLoad" eSuperTypes="#//EventMethod"/> <eClassifiers xsi:type="ecore:EClass" name="PostPersist" eSuperTypes="#//EventMethod"/> <eClassifiers xsi:type="ecore:EClass" name="PostRemove" eSuperTypes="#//EventMethod"/> @@ -377,35 +379,35 @@ <eClassifiers xsi:type="ecore:EClass" name="PrePersist" eSuperTypes="#//EventMethod"/> <eClassifiers xsi:type="ecore:EClass" name="PreRemove" eSuperTypes="#//EventMethod"/> <eClassifiers xsi:type="ecore:EClass" name="PreUpdate" eSuperTypes="#//EventMethod"/> - <eClassifiers xsi:type="ecore:EClass" name="PrimaryKeyJoinColumn" eSuperTypes="#//NamedColumn"> + <eClassifiers xsi:type="ecore:EClass" name="XmlPrimaryKeyJoinColumn" eSuperTypes="#//XmlNamedColumn"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="referencedColumnName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="QueryHint"> + <eClassifiers xsi:type="ecore:EClass" name="XmlQueryHint"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="AbstractTable" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlAbstractTable" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1" eType="#//UniqueConstraint" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Table" eSuperTypes="#//AbstractTable"/> - <eClassifiers xsi:type="ecore:EClass" name="SecondaryTable" eSuperTypes="#//AbstractTable"> + <eClassifiers xsi:type="ecore:EClass" name="XmlTable" eSuperTypes="#//XmlAbstractTable"/> + <eClassifiers xsi:type="ecore:EClass" name="XmlSecondaryTable" eSuperTypes="#//XmlAbstractTable"> <eStructuralFeatures xsi:type="ecore:EReference" name="primaryKeyJoinColumns" - upperBound="-1" eType="#//PrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> + upperBound="-1" eType="#//XmlPrimaryKeyJoinColumn" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="Generator" abstract="true" interface="true"> + <eClassifiers xsi:type="ecore:EClass" name="XmlGenerator" abstract="true" interface="true"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="initialValue" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="allocationSize" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//IntObject"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SequenceGenerator" abstract="true" interface="true" - eSuperTypes="#//Generator"> + <eClassifiers xsi:type="ecore:EClass" name="XmlSequenceGenerator" abstract="true" + interface="true" eSuperTypes="#//XmlGenerator"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="sequenceName" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="SequenceGeneratorImpl" eSuperTypes="#//SequenceGenerator"/> + <eClassifiers xsi:type="ecore:EClass" name="SequenceGeneratorImpl" eSuperTypes="#//XmlSequenceGenerator"/> <eClassifiers xsi:type="ecore:EClass" name="SqlResultSetMapping"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EReference" name="entityResults" upperBound="-1" @@ -413,8 +415,8 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="columnResults" upperBound="-1" eType="#//ColumnResult" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TableGenerator" abstract="true" interface="true" - eSuperTypes="#//Generator"> + <eClassifiers xsi:type="ecore:EClass" name="XmlTableGenerator" abstract="true" interface="true" + eSuperTypes="#//XmlGenerator"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="table" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="catalog" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> <eStructuralFeatures xsi:type="ecore:EAttribute" name="schema" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> @@ -424,7 +426,7 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="uniqueConstraints" upperBound="-1" eType="#//UniqueConstraint" containment="true" resolveProxies="false"/> </eClassifiers> - <eClassifiers xsi:type="ecore:EClass" name="TableGeneratorImpl" eSuperTypes="#//TableGenerator"/> + <eClassifiers xsi:type="ecore:EClass" name="TableGeneratorImpl" eSuperTypes="#//XmlTableGenerator"/> <eClassifiers xsi:type="ecore:EClass" name="UniqueConstraint"> <eStructuralFeatures xsi:type="ecore:EAttribute" name="columnNames" unique="false" lowerBound="1" upperBound="-1" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/> diff --git a/jpa/plugins/org.eclipse.jpt.core/plugin.xml b/jpa/plugins/org.eclipse.jpt.core/plugin.xml index c5d4d48274..fb96d37b3c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/plugin.xml +++ b/jpa/plugins/org.eclipse.jpt.core/plugin.xml @@ -36,13 +36,13 @@ <factory class="org.eclipse.jpt.core.internal.JpaProjectAdapterFactory" adaptableType="org.eclipse.core.resources.IProject"> - <adapter type="org.eclipse.jpt.core.internal.IJpaProject"/> + <adapter type="org.eclipse.jpt.core.JpaProject"/> </factory> <factory class="org.eclipse.jpt.core.internal.JpaProjectAdapterFactory" adaptableType="org.eclipse.jdt.core.IJavaProject"> - <adapter type="org.eclipse.jpt.core.internal.IJpaProject"/> + <adapter type="org.eclipse.jpt.core.JpaProject"/> </factory> </extension> @@ -91,7 +91,7 @@ point="org.eclipse.wst.common.modulecore.resourceFactories"> <resourceFactory - class="org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceFactory" + class="org.eclipse.jpt.core.resource.persistence.PersistenceResourceFactory" isDefault="true" shortSegment="persistence.xml"> <contentTypeBinding @@ -100,7 +100,7 @@ </resourceFactory> <resourceFactory - class="org.eclipse.jpt.core.internal.resource.orm.OrmResourceFactory" + class="org.eclipse.jpt.core.resource.orm.OrmResourceFactory" isDefault="true" shortSegment="orm.xml"> <contentTypeBinding @@ -215,20 +215,6 @@ </extension> - - <!-- ***** EMF extensions ***** --> - - <extension - point="org.eclipse.emf.ecore.generated_package"> - - <package - class="org.eclipse.jpt.core.internal.content.java.JpaJavaPackage" - genModel="model/old_coreModels.genmodel" - uri="jpt.java.xmi"> - </package> - - </extension> - <!-- ***** JPT extensions (eat our own dogfood) ***** --> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IContextModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ContextModel.java index fb074eec17..a64f63bd6a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IContextModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ContextModel.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.List; @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public interface IContextModel +public interface ContextModel { /** * Update the context model with the content of the JPA project diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaAnnotationProvider.java index 2703d4c39b..06a665d85a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaAnnotationProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaAnnotationProvider.java @@ -8,17 +8,17 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.Type; -import org.eclipse.jpt.core.internal.resource.java.Annotation; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -public interface IJpaAnnotationProvider +public interface JpaAnnotationProvider { /** * Build an Annotation with the given fully qualififed annotation name. @@ -26,9 +26,9 @@ public interface IJpaAnnotationProvider * @param mappingAnnotationName * @return */ - Annotation buildTypeMappingAnnotation(JavaPersistentTypeResource parent, Type type, String mappingAnnotationName); + Annotation buildTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName); - Annotation buildNullTypeMappingAnnotation(JavaPersistentTypeResource parent, Type type, String mappingAnnotationName); + Annotation buildNullTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName); /** * Build an Annotation with the given fully qualififed annotation name. @@ -36,9 +36,9 @@ public interface IJpaAnnotationProvider * @param annotationName * @return */ - Annotation buildTypeAnnotation(JavaPersistentTypeResource parent, Type type, String annotationName); + Annotation buildTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName); - Annotation buildNullTypeAnnotation(JavaPersistentTypeResource parent, Type type, String annotationName); + Annotation buildNullTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName); /** * Ordered iterator of fully qualified annotation names that can apply to a Type @@ -56,9 +56,9 @@ public interface IJpaAnnotationProvider * @param mappingAnnotationName * @return */ - Annotation buildAttributeMappingAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String mappingAnnotationName); + Annotation buildAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName); - Annotation buildNullAttributeMappingAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String mappingAnnotationName); + Annotation buildNullAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName); /** * Build an Annotation with the given fully qualififed annotation name. @@ -66,9 +66,9 @@ public interface IJpaAnnotationProvider * @param annotationName * @return */ - Annotation buildAttributeAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String annotationName); + Annotation buildAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName); - Annotation buildNullAttributeAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String annotationName); + Annotation buildNullAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName); /** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java index 6bb7df5633..dbb905811d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaDataSource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import org.eclipse.jpt.db.internal.ConnectionProfile; /** * */ -public interface IJpaDataSource extends IJpaNode { +public interface JpaDataSource extends JpaNode { /** * Return the data source's connection profile name. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java index bd55860c25..192a378198 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFactory.java @@ -7,27 +7,27 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.jpt.core.internal.platform.base.BaseJpaFactory; /** - * Use IJpaFactory to create any core (e.g. IJpaProject), resource - * (e.g. PersistenceResource), or context (e.g. IAttributeMapping) model objects. + * Use JpaFactory to create any core (e.g. JpaProject), resource + * (e.g. PersistenceResource), or context (e.g. AttributeMapping) model objects. * @see BaseJpaFactory */ -public interface IJpaFactory +public interface JpaFactory { /** - * Construct an IJpaProject for the specified config, to be + * Construct a JpaProject for the specified config, to be * added to the specified JPA project. Return null if unable to create * the JPA file (e.g. the content type is unrecognized). */ - IJpaProject createJpaProject(IJpaProject.Config config) throws CoreException; + JpaProject buildJpaProject(JpaProject.Config config) throws CoreException; - IJpaDataSource createJpaDataSource(IJpaProject jpaProject, String connectionProfileName); + JpaDataSource buildJpaDataSource(JpaProject jpaProject, String connectionProfileName); /** * Construct a JPA file for the specified file and with the specified resource @@ -35,7 +35,7 @@ public interface IJpaFactory * This should be non-null iff (if and only if) {@link #hasRelevantContent(IFile)} * returns true. */ - IJpaFile createJpaFile(IJpaProject jpaProject, IFile file, IResourceModel resourceModel); + JpaFile buildJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel); /** * Return true if a resource model will be provided for the given file @@ -47,12 +47,12 @@ public interface IJpaFactory * This should be non-null iff (if and only if) {@link #hasRelevantContent(IFile)} * returns true. */ - IResourceModel buildResourceModel(IJpaProject jpaProject, IFile file); + ResourceModel buildResourceModel(JpaProject jpaProject, IFile file); /** * Build a (updated) context model to be associated with the given JPA project. * The context model will be built once, but updated many times. - * @see update(IJpaProject, IContextModel, IProgressMonitor) + * @see JpaProject.update(ProgressMonitor) */ - IContextModel buildContextModel(IJpaProject jpaProject); + ContextModel buildContextModel(JpaProject jpaProject); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java index a358301803..c168af42fa 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaFile.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.ElementChangedEvent; @@ -15,11 +15,11 @@ import org.eclipse.jdt.core.ElementChangedEvent; /** * */ -public interface IJpaFile extends IJpaNode +public interface JpaFile extends JpaNode { /** * Return the type of resource represented by this JPA file - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ String getResourceType(); @@ -31,12 +31,12 @@ public interface IJpaFile extends IJpaNode /** * Return the resource model represented by this JPA file */ - IResourceModel getResourceModel(); + ResourceModel getResourceModel(); /** * Return the structure node best represented by the location in the file */ - IJpaStructureNode structureNode(int textOffset); + JpaStructureNode structureNode(int textOffset); /** * Forward the Java element changed event to the JPA file's content. @@ -53,11 +53,11 @@ public interface IJpaFile extends IJpaNode * jpaFile was added to the JpaProject * @param jpaFile */ - void fileAdded(IJpaFile jpaFile); + void fileAdded(JpaFile jpaFile); /** * jpaFile was removed from the JpaProject * @param jpaFile */ - void fileRemoved(IJpaFile jpaFile); + void fileRemoved(JpaFile jpaFile); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaModel.java index a37c41410e..cce7523e53 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaModel.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.Iterator; import org.eclipse.core.resources.IFile; @@ -18,14 +18,14 @@ import org.eclipse.jpt.utility.internal.model.Model; /** * The JPA model holds all the JPA projects. */ -public interface IJpaModel extends Model { +public interface JpaModel extends Model { /** * Return the JPA project corresponding to the specified Eclipse project. * Return null if unable to associate the specified Eclipse project * with a JPA project. */ - IJpaProject jpaProject(IProject project) throws CoreException; + JpaProject jpaProject(IProject project) throws CoreException; /** * Return whether the JPA model contains a JPA project corresponding @@ -34,9 +34,10 @@ public interface IJpaModel extends Model { boolean containsJpaProject(IProject project); /** - * Return the JPA model's JPA projects. + * Return the JPA model's JPA projects. This has performance implications, + * it will build all the JPA projects. */ - Iterator<IJpaProject> jpaProjects() throws CoreException; + Iterator<JpaProject> jpaProjects() throws CoreException; public static final String JPA_PROJECTS_COLLECTION = "jpaProjects"; /** @@ -48,6 +49,6 @@ public interface IJpaModel extends Model { * Return the JPA file corresponding to the specified Eclipse file, * or null if unable to associate the specified file with a JPA file. */ - IJpaFile jpaFile(IFile file) throws CoreException; + JpaFile jpaFile(IFile file) throws CoreException; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java index c467ec0ebe..254bd3a98a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.List; @@ -20,13 +20,13 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; /** * Tweak the node interface with JPA-specific protocol. */ -public interface IJpaNode extends Node, IAdaptable +public interface JpaNode extends Node, IAdaptable { /** * Return the JPA project the node belongs to. */ - IJpaProject jpaProject(); + JpaProject jpaProject(); /** * Return the resource that most directly contains the node. @@ -44,8 +44,8 @@ public interface IJpaNode extends Node, IAdaptable // ********** covariant overrides ********** - IJpaNode parent(); + JpaNode parent(); - IJpaProject root(); + JpaProject root(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java new file mode 100644 index 0000000000..c7788adde3 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java @@ -0,0 +1,134 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core; + +import java.util.List; +import org.eclipse.core.resources.IFile; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; + +/** + * This interface is to be implemented by a JPA vendor to provide extensions to + * the core JPA model. The core JPA model will provide functionality for JPA + * spec annotations in java, persistence.xml and (orm.xml) mapping files. + * The org.eclipse.jpt.core.genericPlatform extension supplies + * resource models for those file types. As another vendor option you + * will have to supply those resource models as well or different ones + * as necessary. + * + * See the org.eclipse.jpt.core.jpaPlatform extension point + */ +public interface JpaPlatform +{ + /** + * Get the ID for this platform + */ + String getId(); + + /** + * Set the ID for this platform. This is an extension + * so you can't use a non-default constructor. + * + * ************* + * * IMPORTANT * For INTERNAL use only!! + * ************* + */ + void setId(String theId); + + + // **************** Model construction / updating ************************** + + /** + * Construct a JPA file for the specified file, to be added to the specified + * JPA project. (Defer to the factory for actual object creation.) + * Return null if unable to create the JPA file (e.g. the content type is + * unrecognized). + */ + JpaFile buildJpaFile(JpaProject jpaProject, IFile file); + + /** + * Return a factory responsible for creating core (e.g. IJpaProject), resource + * (e.g. PersistenceResource), and context (e.g. IPersistenceUnit) model + * objects + */ + JpaFactory jpaFactory(); + + + // **************** Java annotation support ******************************** + + /** + * Return an annotation provider responsible for determining what annotations + * are supported and constructing java resource model objects + */ + JpaAnnotationProvider annotationProvider(); + + + // **************** Java type mapping support ******************************** + + /** + * Build a Java type mapping with the given mapping key and parent. Throws a IllegalArgumentException + * if the typeMappingKey is not supported by this platform. + * Override {@link #BaseJpaPlatform.addJavaTypeMappingProvidersTo(Collection<IJavaTypeMappingProvider>)} + * to add new supported type mappings to the platform + */ + JavaTypeMapping buildJavaTypeMappingFromMappingKey(String typeMappingKey, JavaPersistentType parent); + + /** + * Build a Java type mapping with the given mapping annotation and parent. Throws a IllegalArgumentException + * if the mapping annotation is not supported by this platform. + * Override {@link #BaseJpaPlatform.addJavaTypeMappingProvidersTo(Collection<IJavaTypeMappingProvider>)} + * to add new supported type mappings to the platform + */ + JavaTypeMapping buildJavaTypeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentType parent); + + // **************** Java attribute mapping support ******************************** + + /** + * Build a Java attribute mapping with the given mapping key and parent. Throws a IllegalArgumentException + * if the attributeMappingKey is not supported by this platform. + * Override {@link #BaseJpaPlatform.addJavaAttributeMappingProvidersTo(Collection<IJavaAttributeMappingProvider>)} + * to add new supported attribute mappings to the platform + */ + JavaAttributeMapping buildJavaAttributeMappingFromMappingKey(String attributeMappingKey, JavaPersistentAttribute parent); + + /** + * Build a Java attribute mapping with the given mapping annotation and parent. Throws a IllegalArgumentException + * if the mapping annotation is not supported by this platform. + * Override {@link #BaseJpaPlatform.addJavaAttributeMappingProvidersTo(Collection<IJavaAttributeMappingProvider>)} + * to add new supported attribute mappings to the platform + */ + JavaAttributeMapping buildJavaAttributeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentAttribute parent); + + /** + * Build a default Java attribute mapping with the given mapping annotation and parent. Throws a IllegalArgumentException + * if the mapping annotation is not supported by this platform. + * Override {@link #BaseJpaPlatform.addDefaultJavaAttributeMappingProvidersTo(Collection<IDefaultJavaAttributeMappingProvider>)} + * to add new supported attribute mappings to the platform + */ + JavaAttributeMapping buildDefaultJavaAttributeMapping(JavaPersistentAttribute parent); + + /** + * Return the attribute mapping key corresponding to the default atribute mapping + * that applies to the Java persistent attribute. This will be based on the attribute's + * type. See {@link IDefaultJavaAttributeMappingProvider.#defaultApplies(IJavaPersistentAttribute)} + */ + String defaultJavaAttributeMappingKey(JavaPersistentAttribute persistentAttribute); + + // ************************************************************************* + + /** + * Adds validation messages to the growing list of messages for a given project + */ + void addToMessages(JpaProject project, List<IMessage> messages); + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java index 621ac96c0a..02f428ec59 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.Iterator; import org.eclipse.core.resources.IFile; @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.utility.internal.CommandExecutor; @@ -29,7 +29,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; /** * */ -public interface IJpaProject extends IJpaNode { +public interface JpaProject extends JpaNode { /** * Return the JPA project's name, which is the Eclipse project's name. @@ -50,7 +50,7 @@ public interface IJpaProject extends IJpaNode { * Return the vendor-specific JPA platform that builds the JPA project * and its contents. */ - IJpaPlatform jpaPlatform(); + JpaPlatform jpaPlatform(); /** * Return the project's connection @@ -65,7 +65,7 @@ public interface IJpaProject extends IJpaNode { /** * Return the data source the JPA project is mapped to. */ - IJpaDataSource dataSource(); + JpaDataSource dataSource(); // **************** discover annotated classes ***************************** @@ -102,7 +102,7 @@ public interface IJpaProject extends IJpaNode { /** * Return the JPA project's JPA files. */ - Iterator<IJpaFile> jpaFiles(); + Iterator<JpaFile> jpaFiles(); /** * Return the size of the JPA project's JPA files. @@ -114,14 +114,14 @@ public interface IJpaProject extends IJpaNode { * Return null if unable to associate the given file * with a JPA file. */ - IJpaFile jpaFile(IFile file); + JpaFile jpaFile(IFile file); /** * Return the JPA project's JPA files for the specified content type ID. * The content type ID should match that given in the * JPA file content provider. */ - Iterator<IJpaFile> jpaFiles(String contentTypeId); + Iterator<JpaFile> jpaFiles(String contentTypeId); // **************** various queries **************************************** @@ -136,7 +136,7 @@ public interface IJpaProject extends IJpaNode { /** * Return the context model representing the JPA content of this project */ - IContextModel contextModel(); + ContextModel contextModel(); /** * Return an iterator on all ITypes that are annotated within this project @@ -147,7 +147,7 @@ public interface IJpaProject extends IJpaNode { * Return the Java persistent type resource for the specified fully qualified type name; * null, if none exists. */ - JavaPersistentTypeResource javaPersistentTypeResource(String typeName); + JavaResourcePersistentType javaPersistentTypeResource(String typeName); // **************** jpa model synchronization and lifecycle **************** @@ -287,7 +287,7 @@ public interface IJpaProject extends IJpaNode { /** * Return the JPA platform to be associated with the new JPA project. */ - IJpaPlatform jpaPlatform(); + JpaPlatform jpaPlatform(); /** * Return the name of the connection profile to be associated diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaStructureNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java index 8beb25455f..aebd6f02bf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaStructureNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java @@ -8,30 +8,30 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; /** * Implement this interface for objects that appear in the Structure view - * This is used by IJpaSelection to determine selection in the editor. + * This is used by JpaSelection to determine selection in the editor. * Details pages are also provided for each IJpaStructureNode. * - * I did not implement IJpaContextNode and I'm not even sure we should implement - * IJpaNode. It is possibly someone could want a structure node that is + * I did not implement JpaContextNode and I'm not even sure we should implement + * JpaNode. It is possibly someone could want a structure node that is * not actually a contextNode in the model.//TODO */ -public interface IJpaStructureNode extends IJpaNode +public interface JpaStructureNode extends JpaNode { /** * Return the structure node at the given offset. */ - IJpaStructureNode structureNode(int textOffset); + JpaStructureNode structureNode(int textOffset); /** * Return the text range do be used to select text in the editor * corresponding to this node. */ - ITextRange selectionTextRange(); + TextRange selectionTextRange(); /** * Return a unique identifier for all of this class of structure nodes diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptCorePlugin.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java index 67657501ec..93bc5f0334 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JptCorePlugin.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JptCorePlugin.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.IScopeContext; +import org.eclipse.jpt.core.internal.JpaModelManager; import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry; import org.eclipse.jpt.core.internal.platform.generic.GenericJpaPlatform; import org.eclipse.jst.j2ee.internal.J2EEConstants; @@ -123,7 +124,7 @@ public class JptCorePlugin extends Plugin { /** * Return the singular JPA model corresponding to the current workspace. */ - public static IJpaModel jpaModel() { + public static JpaModel jpaModel() { return JpaModelManager.instance().jpaModel(); } @@ -132,7 +133,7 @@ public class JptCorePlugin extends Plugin { * or null if unable to associate the specified project with a * JPA project. */ - public static IJpaProject jpaProject(IProject project) { + public static JpaProject jpaProject(IProject project) { try { return JpaModelManager.instance().jpaProject(project); } catch (CoreException ex) { @@ -145,7 +146,7 @@ public class JptCorePlugin extends Plugin { * Return the JPA file corresponding to the specified Eclipse file, * or null if unable to associate the specified file with a JPA file. */ - public static IJpaFile jpaFile(IFile file) { + public static JpaFile jpaFile(IFile file) { try { return JpaModelManager.instance().jpaFile(file); } catch (CoreException ex) { @@ -216,7 +217,7 @@ public class JptCorePlugin extends Plugin { /** * Return the JPA platform associated with the specified Eclipse project. */ - public static IJpaPlatform jpaPlatform(IProject project) { + public static JpaPlatform jpaPlatform(IProject project) { return JpaPlatformRegistry.instance().jpaPlatform(jpaPlatformId(project)); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IMappingKeys.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/MappingKeys.java index bf7fb60ab0..93655a6748 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IMappingKeys.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/MappingKeys.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; -public interface IMappingKeys +public interface MappingKeys { String ENTITY_TYPE_MAPPING_KEY = "entity"; String MAPPED_SUPERCLASS_TYPE_MAPPING_KEY = "mappedSuperclass"; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java index 3d04d1c578..972b2c6e1e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java @@ -7,29 +7,29 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import java.util.ListIterator; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jpt.utility.internal.model.Model; -public interface IResourceModel extends Model +public interface ResourceModel extends Model { /** * Constant representing a Java resource type - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ static final String JAVA_RESOURCE_TYPE = "JAVA_RESOURCE_TYPE"; /** * Constant representing a persistence.xml resource type - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ static final String PERSISTENCE_RESOURCE_TYPE = "PERSISTENCE_RESOURCE_TYPE"; /** * Constant representing a mapping file (e.g. orm.xml) resource type - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ static final String ORM_RESOURCE_TYPE = "ORM_RESOURCE_TYPE"; @@ -50,7 +50,7 @@ public interface IResourceModel extends Model /** * Return a list iterator of all root structure nodes */ - ListIterator<IJpaStructureNode> rootStructureNodes(); + ListIterator<JpaStructureNode> rootStructureNodes(); /** * Return the size of all root structure nodes @@ -60,15 +60,15 @@ public interface IResourceModel extends Model /** * Return a structure node for the given text offset */ - IJpaStructureNode structureNode(int textOffset); + JpaStructureNode structureNode(int textOffset); void javaElementChanged(ElementChangedEvent event); - void addResourceModelChangeListener(IResourceModelListener listener); + void addResourceModelChangeListener(ResourceModelListener listener); - void removeResourceModelChangeListener(IResourceModelListener listener); + void removeResourceModelChangeListener(ResourceModelListener listener); void dispose(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IResourceModelListener.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModelListener.java index 1b0b91ecb1..ac0f589d74 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IResourceModelListener.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModelListener.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; import org.eclipse.jpt.utility.internal.model.listener.ChangeListener; -public interface IResourceModelListener extends ChangeListener +public interface ResourceModelListener extends ChangeListener { void resourceModelChanged(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/ITextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/TextRange.java index 127438a635..6b14c5d88b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/ITextRange.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/TextRange.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal; +package org.eclipse.jpt.core; /** * A text range defines the offset into, length of, and line of a piece @@ -16,7 +16,7 @@ package org.eclipse.jpt.core.internal; * This interface is not intended to be implemented by clients. * </p> */ -public interface ITextRange { +public interface TextRange { /** * Returns the offset of the text. @@ -60,9 +60,9 @@ public interface ITextRange { /** * Empty implementation of text range. */ - final class Empty implements ITextRange { - public static final ITextRange INSTANCE = new Empty(); - public static ITextRange instance() { + final class Empty implements TextRange { + public static final TextRange INSTANCE = new Empty(); + public static TextRange instance() { return INSTANCE; } // ensure single instance @@ -89,10 +89,10 @@ public interface ITextRange { if (o == this) { return true; } - if ( ! (o instanceof ITextRange)) { + if ( ! (o instanceof TextRange)) { return false; } - ITextRange r = (ITextRange) o; + TextRange r = (TextRange) o; return (r.getOffset() == 0) && (r.getLength() == 0); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AbstractColumn.java index 02dbc36fd5..9fc28dbd07 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAbstractColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AbstractColumn.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface IAbstractColumn extends INamedColumn +public interface AbstractColumn extends NamedColumn { String getTable(); @@ -68,7 +68,7 @@ public interface IAbstractColumn extends INamedColumn /** * Return the (best guess) text location of the column's table. */ - ITextRange tableTextRange(CompilationUnit astRoot); + TextRange tableTextRange(CompilationUnit astRoot); //TODO not sure we really need/want this to be public. This //is used by ColumnComposite to get a list of possible associated tables, but @@ -79,7 +79,7 @@ public interface IAbstractColumn extends INamedColumn * interface allowing columns to be used in multiple places * (e.g. basic mappings and attribute overrides) */ - interface Owner extends INamedColumn.Owner + interface Owner extends NamedColumn.Owner { /** * Return the name of the persistent attribute that contains the column. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAbstractJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AbstractJoinColumn.java index cadb57411c..ad7afe7d42 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAbstractJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AbstractJoinColumn.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; -public interface IAbstractJoinColumn extends INamedColumn +public interface AbstractJoinColumn extends NamedColumn { String getReferencedColumnName(); String getDefaultReferencedColumnName(); @@ -37,17 +37,17 @@ public interface IAbstractJoinColumn extends INamedColumn /** * Return the (best guess) text location of the referenced column name */ - ITextRange referencedColumnNameTextRange(CompilationUnit astRoot); + TextRange referencedColumnNameTextRange(CompilationUnit astRoot); boolean isVirtual(); - interface Owner extends INamedColumn.Owner + interface Owner extends NamedColumn.Owner { /** * Return the wrapper for the datasource table for the referenced column */ Table dbReferencedColumnTable(); - boolean isVirtual(IAbstractJoinColumn joinColumn); + boolean isVirtual(AbstractJoinColumn joinColumn); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AccessType.java index 0f5fa60468..36fdb78d1f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/AccessType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AccessType.java @@ -8,7 +8,7 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; public enum AccessType { @@ -16,32 +16,32 @@ public enum AccessType { PROPERTY; - public static AccessType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.AccessType javaAccess) { - if (javaAccess == org.eclipse.jpt.core.internal.resource.java.AccessType.FIELD) { + public static AccessType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.AccessType javaAccess) { + if (javaAccess == org.eclipse.jpt.core.resource.java.AccessType.FIELD) { return FIELD; } - else if (javaAccess == org.eclipse.jpt.core.internal.resource.java.AccessType.PROPERTY) { + else if (javaAccess == org.eclipse.jpt.core.resource.java.AccessType.PROPERTY) { return PROPERTY; } return null; } - public static AccessType fromXmlResourceModel(org.eclipse.jpt.core.internal.resource.orm.AccessType ormAccess) { - if (ormAccess == org.eclipse.jpt.core.internal.resource.orm.AccessType.FIELD) { + public static AccessType fromXmlResourceModel(org.eclipse.jpt.core.resource.orm.AccessType ormAccess) { + if (ormAccess == org.eclipse.jpt.core.resource.orm.AccessType.FIELD) { return FIELD; } - else if (ormAccess == org.eclipse.jpt.core.internal.resource.orm.AccessType.PROPERTY) { + else if (ormAccess == org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY) { return PROPERTY; } return null; } - public static org.eclipse.jpt.core.internal.resource.orm.AccessType toXmlResourceModel(AccessType access) { + public static org.eclipse.jpt.core.resource.orm.AccessType toXmlResourceModel(AccessType access) { if (access == FIELD) { - return org.eclipse.jpt.core.internal.resource.orm.AccessType.FIELD; + return org.eclipse.jpt.core.resource.orm.AccessType.FIELD; } else if (access == PROPERTY) { - return org.eclipse.jpt.core.internal.resource.orm.AccessType.PROPERTY; + return org.eclipse.jpt.core.resource.orm.AccessType.PROPERTY; } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java index cefcb2596c..9d0e411509 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IAssociationOverride extends IOverride +public interface AssociationOverride extends BaseOverride { - <T extends IJoinColumn> ListIterator<T> joinColumns(); - <T extends IJoinColumn> ListIterator<T> specifiedJoinColumns(); - <T extends IJoinColumn> ListIterator<T> defaultJoinColumns(); + <T extends JoinColumn> ListIterator<T> joinColumns(); + <T extends JoinColumn> ListIterator<T> specifiedJoinColumns(); + <T extends JoinColumn> ListIterator<T> defaultJoinColumns(); int joinColumnsSize(); int specifiedJoinColumnsSize(); int defaultJoinColumnsSize(); - IJoinColumn addSpecifiedJoinColumn(int index); + JoinColumn addSpecifiedJoinColumn(int index); void removeSpecifiedJoinColumn(int index); void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex); String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList"; @@ -27,15 +27,15 @@ public interface IAssociationOverride extends IOverride boolean containsSpecifiedJoinColumns(); - IAssociationOverride.Owner owner(); + AssociationOverride.Owner owner(); - interface Owner extends IOverride.Owner + interface Owner extends BaseOverride.Owner { /** * Return the relationship mapping with the given attribute name. * Return null if it does not exist. This relationship mapping * will be found in the mapped superclass, not in the owning entity */ - IRelationshipMapping relationshipMapping(String attributeName); + RelationshipMapping relationshipMapping(String attributeName); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java index 0841b6ea00..ea64af0e32 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java @@ -7,11 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IAttributeMapping extends IJpaContextNode + +public interface AttributeMapping extends JpaContextNode { - IPersistentAttribute persistentAttribute(); + PersistentAttribute persistentAttribute(); boolean isDefault(); @@ -30,7 +31,7 @@ public interface IAttributeMapping extends IJpaContextNode /** * Return the mapping for the attribute mapping's attribute's type. */ - ITypeMapping typeMapping(); + TypeMapping typeMapping(); /** * Return whether the "attribute" mapping can be overridden. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java index f89bd3e36e..0c633463af 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java @@ -7,22 +7,22 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IAttributeOverride extends IOverride, IColumn.Owner +public interface AttributeOverride extends BaseOverride, Column.Owner { - IColumn getColumn(); + Column getColumn(); - IAttributeOverride.Owner owner(); + AttributeOverride.Owner owner(); - interface Owner extends IOverride.Owner + interface Owner extends BaseOverride.Owner { /** * Return the column mapping with the given attribute name. * Return null if it does not exist. This column mapping * will be found in the mapped superclass (or embeddable), not in the owning entity */ - IColumnMapping columnMapping(String attributeName); + ColumnMapping columnMapping(String attributeName); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java index 6852c53531..8b5771749d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface IOverride extends IJpaContextNode +public interface BaseOverride extends JpaContextNode { String getName(); @@ -32,15 +32,15 @@ public interface IOverride extends IJpaContextNode * Return the type mapping that this override is contained in * @return */ - ITypeMapping typeMapping(); + TypeMapping typeMapping(); /** * Teturn whether the given override is virtual. virtual means that * it is not specified, but defaulted in from the mapped superclass or * embeddable. */ - boolean isVirtual(IOverride override); + boolean isVirtual(BaseOverride override); - ITextRange validationTextRange(CompilationUnit astRoot); + TextRange validationTextRange(CompilationUnit astRoot); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BasicMapping.java index 20d8a8f21f..15925e9592 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BasicMapping.java @@ -7,9 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IBasicMapping extends IAttributeMapping, IColumnMapping, IFetchable, INullable + +public interface BasicMapping extends AttributeMapping, ColumnMapping, Fetchable, Nullable { FetchType DEFAULT_FETCH_TYPE = FetchType.EAGER; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ICascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Cascade.java index f4b4cae76f..8231bb3f7b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ICascade.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Cascade.java @@ -8,9 +8,9 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface ICascade extends IJpaContextNode +public interface Cascade extends JpaContextNode { boolean isAll(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Column.java index 9f724e9b4a..b3a38730c0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Column.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IColumn extends IAbstractColumn +public interface Column extends AbstractColumn { Integer getLength(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ColumnMapping.java index 489dad19cf..fd0caa9eef 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IColumnMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ColumnMapping.java @@ -7,12 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IColumnMapping extends IJpaContextNode, IColumn.Owner + +public interface ColumnMapping extends JpaContextNode, Column.Owner { - IColumn getColumn(); + Column getColumn(); TemporalType getTemporal(); void setTemporal(TemporalType value); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorColumn.java index e6159fc70d..9f66a4c907 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorColumn.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IDiscriminatorColumn extends INamedColumn +public interface DiscriminatorColumn extends NamedColumn { String DEFAULT_NAME = "DTYPE"; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java new file mode 100644 index 0000000000..988c6146e4 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/DiscriminatorType.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.context; + + +public enum DiscriminatorType { + + STRING, + CHAR, + INTEGER; + + + public static DiscriminatorType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.DiscriminatorType javaDiscriminatorType) { + if (javaDiscriminatorType == org.eclipse.jpt.core.resource.java.DiscriminatorType.STRING) { + return STRING; + } + else if (javaDiscriminatorType == org.eclipse.jpt.core.resource.java.DiscriminatorType.CHAR) { + return CHAR; + } + else if (javaDiscriminatorType == org.eclipse.jpt.core.resource.java.DiscriminatorType.INTEGER) { + return INTEGER; + } + return null; + } + + public static org.eclipse.jpt.core.resource.java.DiscriminatorType toJavaResourceModel(DiscriminatorType discriminatorType) { + if (discriminatorType == STRING) { + return org.eclipse.jpt.core.resource.java.DiscriminatorType.STRING; + } + else if (discriminatorType == CHAR) { + return org.eclipse.jpt.core.resource.java.DiscriminatorType.CHAR; + } + else if (discriminatorType == INTEGER) { + return org.eclipse.jpt.core.resource.java.DiscriminatorType.INTEGER; + } + return null; + } + + + public static DiscriminatorType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.DiscriminatorType ormDiscriminatorType) { + if (ormDiscriminatorType == org.eclipse.jpt.core.resource.orm.DiscriminatorType.STRING) { + return STRING; + } + else if (ormDiscriminatorType == org.eclipse.jpt.core.resource.orm.DiscriminatorType.CHAR) { + return CHAR; + } + else if (ormDiscriminatorType == org.eclipse.jpt.core.resource.orm.DiscriminatorType.INTEGER) { + return INTEGER; + } + return null; + } + + public static org.eclipse.jpt.core.resource.orm.DiscriminatorType toOrmResourceModel(DiscriminatorType discriminatorType) { + if (discriminatorType == STRING) { + return org.eclipse.jpt.core.resource.orm.DiscriminatorType.STRING; + } + else if (discriminatorType == CHAR) { + return org.eclipse.jpt.core.resource.orm.DiscriminatorType.CHAR; + } + else if (discriminatorType == INTEGER) { + return org.eclipse.jpt.core.resource.orm.DiscriminatorType.INTEGER; + } + return null; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Embeddable.java index 7bec965e74..a374cec562 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Embeddable.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IEmbeddable extends ITypeMapping + +public interface Embeddable extends TypeMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedIdMapping.java index f0772e1c32..33415ae684 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedIdMapping.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverride.Owner +public interface EmbeddedIdMapping extends AttributeMapping, AttributeOverride.Owner { // **************** attribute overrides ************************************** @@ -20,7 +20,7 @@ public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverrid * Return a list iterator of the attribute overrides whether specified or default. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> attributeOverrides(); + <T extends AttributeOverride> ListIterator<T> attributeOverrides(); /** * Return the number of attribute overrides, both specified and default. @@ -31,7 +31,7 @@ public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverrid * Return a list iterator of the specified attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> specifiedAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> specifiedAttributeOverrides(); String SPECIFIED_ATTRIBUTE_OVERRIDES_LIST = "specifiedAttributeOverridesList"; /** @@ -43,7 +43,7 @@ public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverrid * Return a list iterator of the default attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> defaultAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> defaultAttributeOverrides(); String DEFAULT_ATTRIBUTE_OVERRIDES_LIST = "defaultAttributeOverridesList"; /** @@ -55,7 +55,7 @@ public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverrid * Add a specified attribute override to the entity return the object * representing it. */ - IAttributeOverride addSpecifiedAttributeOverride(int index); + AttributeOverride addSpecifiedAttributeOverride(int index); /** * Remove the specified attribute override from the entity. @@ -65,7 +65,7 @@ public interface IEmbeddedIdMapping extends IAttributeMapping, IAttributeOverrid /** * Remove the specified attribute override at the index from the entity. */ - void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride); + void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride); /** * Move the specified attribute override from the source index to the target index. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedMapping.java index 73135ccbf6..b9bc62a799 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EmbeddedMapping.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride.Owner +public interface EmbeddedMapping extends AttributeMapping, AttributeOverride.Owner { // **************** attribute overrides ************************************** @@ -19,7 +19,7 @@ public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride. * Return a list iterator of the attribute overrides whether specified or default. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> attributeOverrides(); + <T extends AttributeOverride> ListIterator<T> attributeOverrides(); /** * Return the number of attribute overrides, both specified and default. @@ -30,7 +30,7 @@ public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride. * Return a list iterator of the specified attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> specifiedAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> specifiedAttributeOverrides(); String SPECIFIED_ATTRIBUTE_OVERRIDES_LIST = "specifiedAttributeOverridesList"; /** @@ -42,7 +42,7 @@ public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride. * Return a list iterator of the default attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> defaultAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> defaultAttributeOverrides(); String DEFAULT_ATTRIBUTE_OVERRIDES_LIST = "defaultAttributeOverridesList"; /** @@ -54,7 +54,7 @@ public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride. * Add a specified attribute override to the entity return the object * representing it. */ - IAttributeOverride addSpecifiedAttributeOverride(int index); + AttributeOverride addSpecifiedAttributeOverride(int index); /** * Remove the specified attribute override from the entity. @@ -64,7 +64,7 @@ public interface IEmbeddedMapping extends IAttributeMapping, IAttributeOverride. /** * Remove the specified attribute override at the index from the entity. */ - void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride); + void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride); /** * Move the specified attribute override from the source index to the target index. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Entity.java index 975ceaed50..654a38c712 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Entity.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IEntity extends ITypeMapping +public interface Entity extends TypeMapping { // **************** name ************************************** @@ -44,7 +44,7 @@ public interface IEntity extends ITypeMapping * Return the table for this entity, either specified or default. * This will not be null. */ - ITable getTable(); + Table getTable(); // **************** secondary tables ************************************** @@ -53,7 +53,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the secondary tables whether specified or default. * This will not be null. */ - <T extends ISecondaryTable> ListIterator<T> secondaryTables(); + <T extends SecondaryTable> ListIterator<T> secondaryTables(); /** * Return the number of secondary tables, both specified and default. @@ -64,7 +64,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the specified secondary tables. * This will not be null. */ - <T extends ISecondaryTable> ListIterator<T> specifiedSecondaryTables(); + <T extends SecondaryTable> ListIterator<T> specifiedSecondaryTables(); /** * Return the number of specified secondary tables. @@ -75,7 +75,7 @@ public interface IEntity extends ITypeMapping * Add a specified secondary table to the entity return the object * representing it. */ - ISecondaryTable addSpecifiedSecondaryTable(int index); + SecondaryTable addSpecifiedSecondaryTable(int index); /** * Remove the specified secondary table from the entity. @@ -85,7 +85,7 @@ public interface IEntity extends ITypeMapping /** * Remove the specified secondary table at the index from the entity. */ - void removeSpecifiedSecondaryTable(ISecondaryTable secondaryTable); + void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable); /** * Move the specified secondary table from the source index to the target index. @@ -108,7 +108,7 @@ public interface IEntity extends ITypeMapping // **************** discriminator column ************************************** - IDiscriminatorColumn getDiscriminatorColumn(); + DiscriminatorColumn getDiscriminatorColumn(); // **************** discriminator value ************************************** @@ -133,39 +133,39 @@ public interface IEntity extends ITypeMapping // **************** table generator ************************************** - ITableGenerator getTableGenerator(); - ITableGenerator addTableGenerator(); + TableGenerator getTableGenerator(); + TableGenerator addTableGenerator(); void removeTableGenerator(); String TABLE_GENERATOR_PROPERTY = "tableGeneratorProperty"; // **************** sequence generator ************************************** - ISequenceGenerator getSequenceGenerator(); - ISequenceGenerator addSequenceGenerator(); + SequenceGenerator getSequenceGenerator(); + SequenceGenerator addSequenceGenerator(); void removeSequenceGenerator(); String SEQUENCE_GENERATOR_PROPERTY = "sequenceGeneratorProperty"; // **************** primary key join columns ************************************** - <T extends IPrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns(); + <T extends PrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns(); int primaryKeyJoinColumnsSize(); - <T extends IPrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns(); + <T extends PrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns(); String SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST = "specifiedPrimaryKeyJoinColumnsList"; int specifiedPrimaryKeyJoinColumnsSize(); - IPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); String DEFAULT_PRIMARY_KEY_JOIN_COLUMN = "defaultPrimaryKeyJoinColumn"; - IPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); + PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); void removeSpecifiedPrimaryKeyJoinColumn(int index); - void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn primaryKeyJoinColumn); + void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn); void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex); @@ -176,7 +176,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the attribute overrides whether specified or default. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> attributeOverrides(); + <T extends AttributeOverride> ListIterator<T> attributeOverrides(); /** * Return the number of attribute overrides, both specified and default. @@ -187,7 +187,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the specified attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> specifiedAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> specifiedAttributeOverrides(); /** * Return the number of specified attribute overrides. @@ -198,7 +198,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the default attribute overrides. * This will not be null. */ - <T extends IAttributeOverride> ListIterator<T> defaultAttributeOverrides(); + <T extends AttributeOverride> ListIterator<T> defaultAttributeOverrides(); /** * Return the number of default attribute overrides. @@ -209,7 +209,7 @@ public interface IEntity extends ITypeMapping * Add a specified attribute override to the entity return the object * representing it. */ - IAttributeOverride addSpecifiedAttributeOverride(int index); + AttributeOverride addSpecifiedAttributeOverride(int index); /** * Remove the specified attribute override from the entity. @@ -219,7 +219,7 @@ public interface IEntity extends ITypeMapping /** * Remove the specified attribute override at the index from the entity. */ - void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride); + void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride); /** * Move the specified attribute override from the source index to the target index. @@ -234,7 +234,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the association overrides whether specified or default. * This will not be null. */ - <T extends IAssociationOverride> ListIterator<T> associationOverrides(); + <T extends AssociationOverride> ListIterator<T> associationOverrides(); /** * Return the number of association overrides, both specified and default. @@ -245,7 +245,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the specified association overrides. * This will not be null. */ - <T extends IAssociationOverride> ListIterator<T> specifiedAssociationOverrides(); + <T extends AssociationOverride> ListIterator<T> specifiedAssociationOverrides(); /** * Return the number of specified association overrides. @@ -255,7 +255,7 @@ public interface IEntity extends ITypeMapping /** * Return the number of default association overrides. */ - <T extends IAssociationOverride> ListIterator<T> defaultAssociationOverrides(); + <T extends AssociationOverride> ListIterator<T> defaultAssociationOverrides(); /** * Return the number of default association overrides. @@ -266,7 +266,7 @@ public interface IEntity extends ITypeMapping * Add a specified association override to the entity return the object * representing it. */ - IAssociationOverride addSpecifiedAssociationOverride(int index); + AssociationOverride addSpecifiedAssociationOverride(int index); /** * Remove the specified association override at the index from the entity. @@ -276,7 +276,7 @@ public interface IEntity extends ITypeMapping /** * Remove the specified association override from the entity. */ - void removeSpecifiedAssociationOverride(IAssociationOverride associationOverride); + void removeSpecifiedAssociationOverride(AssociationOverride associationOverride); /** * Move the specified association override from the source index to the target index. @@ -292,7 +292,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the named queries. * This will not be null. */ - <T extends INamedQuery> ListIterator<T> namedQueries(); + <T extends NamedQuery> ListIterator<T> namedQueries(); /** * Return the number of named queries. @@ -302,7 +302,7 @@ public interface IEntity extends ITypeMapping /** * Add a named query to the entity return the object representing it. */ - INamedQuery addNamedQuery(int index); + NamedQuery addNamedQuery(int index); /** * Remove the named query at the index from the entity. @@ -312,7 +312,7 @@ public interface IEntity extends ITypeMapping /** * Remove the named query at from the entity. */ - void removeNamedQuery(INamedQuery namedQuery); + void removeNamedQuery(NamedQuery namedQuery); /** * Move the named query from the source index to the target index. @@ -327,7 +327,7 @@ public interface IEntity extends ITypeMapping * Return a list iterator of the specified named native queries. * This will not be null. */ - <T extends INamedNativeQuery> ListIterator<T> namedNativeQueries(); + <T extends NamedNativeQuery> ListIterator<T> namedNativeQueries(); /** * Return the number of named native queries. @@ -337,7 +337,7 @@ public interface IEntity extends ITypeMapping /** * Add a named native query to the entity return the object representing it. */ - INamedNativeQuery addNamedNativeQuery(int index); + NamedNativeQuery addNamedNativeQuery(int index); /** * Remove the named native query at the index from the entity. @@ -347,7 +347,7 @@ public interface IEntity extends ITypeMapping /** * Remove the named native query at from the entity. */ - void removeNamedNativeQuery(INamedNativeQuery namedNativeQuery); + void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery); /** * Move the named native query from the source index to the target index. @@ -371,14 +371,14 @@ public interface IEntity extends ITypeMapping * Non-entities in the hierarchy should be ignored, ie skip * over them in the search for the root. */ - IEntity rootEntity(); + Entity rootEntity(); /** * The first parent in the class hierarchy that is an entity. * This is the parent in the entity (persistent) inheritance hierarchy * (vs class inheritance hierarchy) */ - IEntity parentEntity(); + Entity parentEntity(); /** * Return the name of the entity's primary key column. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EnumType.java index cb4770707c..19b552a1fe 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/EnumType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/EnumType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; public enum EnumType { @@ -16,43 +16,43 @@ public enum EnumType { STRING; - public static EnumType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.EnumType javaEnumType) { - if (javaEnumType == org.eclipse.jpt.core.internal.resource.java.EnumType.ORDINAL) { + public static EnumType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.EnumType javaEnumType) { + if (javaEnumType == org.eclipse.jpt.core.resource.java.EnumType.ORDINAL) { return ORDINAL; } - else if (javaEnumType == org.eclipse.jpt.core.internal.resource.java.EnumType.STRING) { + else if (javaEnumType == org.eclipse.jpt.core.resource.java.EnumType.STRING) { return STRING; } return null; } - public static org.eclipse.jpt.core.internal.resource.java.EnumType toJavaResourceModel(EnumType enumType) { + public static org.eclipse.jpt.core.resource.java.EnumType toJavaResourceModel(EnumType enumType) { if (enumType == ORDINAL) { - return org.eclipse.jpt.core.internal.resource.java.EnumType.ORDINAL; + return org.eclipse.jpt.core.resource.java.EnumType.ORDINAL; } else if (enumType == STRING) { - return org.eclipse.jpt.core.internal.resource.java.EnumType.STRING; + return org.eclipse.jpt.core.resource.java.EnumType.STRING; } return null; } - public static EnumType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.EnumType ormEnumType) { - if (ormEnumType == org.eclipse.jpt.core.internal.resource.orm.EnumType.ORDINAL) { + public static EnumType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.EnumType ormEnumType) { + if (ormEnumType == org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL) { return ORDINAL; } - else if (ormEnumType == org.eclipse.jpt.core.internal.resource.orm.EnumType.STRING) { + else if (ormEnumType == org.eclipse.jpt.core.resource.orm.EnumType.STRING) { return STRING; } return null; } - public static org.eclipse.jpt.core.internal.resource.orm.EnumType toOrmResourceModel(EnumType enumType) { + public static org.eclipse.jpt.core.resource.orm.EnumType toOrmResourceModel(EnumType enumType) { if (enumType == ORDINAL) { - return org.eclipse.jpt.core.internal.resource.orm.EnumType.ORDINAL; + return org.eclipse.jpt.core.resource.orm.EnumType.ORDINAL; } else if (enumType == STRING) { - return org.eclipse.jpt.core.internal.resource.orm.EnumType.STRING; + return org.eclipse.jpt.core.resource.orm.EnumType.STRING; } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java new file mode 100644 index 0000000000..b8f95a60a9 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/FetchType.java @@ -0,0 +1,59 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.context; + + +public enum FetchType { + + EAGER, + LAZY; + + + public static FetchType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.FetchType javaFetchType) { + if (javaFetchType == org.eclipse.jpt.core.resource.java.FetchType.EAGER) { + return EAGER; + } + else if (javaFetchType == org.eclipse.jpt.core.resource.java.FetchType.LAZY) { + return LAZY; + } + return null; + } + + public static org.eclipse.jpt.core.resource.java.FetchType toJavaResourceModel(FetchType fetchType) { + if (fetchType == EAGER) { + return org.eclipse.jpt.core.resource.java.FetchType.EAGER; + } + else if (fetchType == LAZY) { + return org.eclipse.jpt.core.resource.java.FetchType.LAZY; + } + return null; + } + + + public static FetchType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.FetchType ormFetchType) { + if (ormFetchType == org.eclipse.jpt.core.resource.orm.FetchType.EAGER) { + return EAGER; + } + else if (ormFetchType == org.eclipse.jpt.core.resource.orm.FetchType.LAZY) { + return LAZY; + } + return null; + } + + public static org.eclipse.jpt.core.resource.orm.FetchType toOrmResourceModel(FetchType fetchType) { + if (fetchType == EAGER) { + return org.eclipse.jpt.core.resource.orm.FetchType.EAGER; + } + else if (fetchType == LAZY) { + return org.eclipse.jpt.core.resource.orm.FetchType.LAZY; + } + return null; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IFetchable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Fetchable.java index ca5b87895b..003c42ed00 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IFetchable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Fetchable.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IFetchable extends IAttributeMapping +public interface Fetchable extends AttributeMapping { FetchType getFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratedValue.java index 9156ed8c8b..d16acd0242 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GeneratedValue.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface IGeneratedValue extends IJpaContextNode +public interface GeneratedValue extends JpaContextNode { GenerationType getStrategy(); @@ -34,5 +34,5 @@ public interface IGeneratedValue extends IJpaContextNode /** * Return the (best guess) text location of the generator. */ - ITextRange generatorTextRange(CompilationUnit astRoot); + TextRange generatorTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java new file mode 100644 index 0000000000..07fc5411cf --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/GenerationType.java @@ -0,0 +1,85 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.context; + + +public enum GenerationType { + + TABLE, + SEQUENCE, + IDENTITY, + AUTO; + + + public static GenerationType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.GenerationType javaGenerationType) { + if (javaGenerationType == org.eclipse.jpt.core.resource.java.GenerationType.TABLE) { + return TABLE; + } + else if (javaGenerationType == org.eclipse.jpt.core.resource.java.GenerationType.SEQUENCE) { + return SEQUENCE; + } + else if (javaGenerationType == org.eclipse.jpt.core.resource.java.GenerationType.IDENTITY) { + return IDENTITY; + } + else if (javaGenerationType == org.eclipse.jpt.core.resource.java.GenerationType.AUTO) { + return AUTO; + } + return null; + } + + public static org.eclipse.jpt.core.resource.java.GenerationType toJavaResourceModel(GenerationType generationType) { + if (generationType == TABLE) { + return org.eclipse.jpt.core.resource.java.GenerationType.TABLE; + } + else if (generationType == SEQUENCE) { + return org.eclipse.jpt.core.resource.java.GenerationType.SEQUENCE; + } + else if (generationType == IDENTITY) { + return org.eclipse.jpt.core.resource.java.GenerationType.IDENTITY; + } + else if (generationType == AUTO) { + return org.eclipse.jpt.core.resource.java.GenerationType.AUTO; + } + return null; + } + + + public static GenerationType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.GenerationType ormGenerationType) { + if (ormGenerationType == org.eclipse.jpt.core.resource.orm.GenerationType.TABLE) { + return TABLE; + } + else if (ormGenerationType == org.eclipse.jpt.core.resource.orm.GenerationType.SEQUENCE) { + return SEQUENCE; + } + else if (ormGenerationType == org.eclipse.jpt.core.resource.orm.GenerationType.IDENTITY) { + return IDENTITY; + } + else if (ormGenerationType == org.eclipse.jpt.core.resource.orm.GenerationType.AUTO) { + return AUTO; + } + return null; + } + + public static org.eclipse.jpt.core.resource.orm.GenerationType toOrmResourceModel(GenerationType generationType) { + if (generationType == TABLE) { + return org.eclipse.jpt.core.resource.orm.GenerationType.TABLE; + } + else if (generationType == SEQUENCE) { + return org.eclipse.jpt.core.resource.orm.GenerationType.SEQUENCE; + } + else if (generationType == IDENTITY) { + return org.eclipse.jpt.core.resource.orm.GenerationType.IDENTITY; + } + else if (generationType == AUTO) { + return org.eclipse.jpt.core.resource.orm.GenerationType.AUTO; + } + return null; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Generator.java index 8468c39ff2..b87a7d5879 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Generator.java @@ -7,10 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IGenerator extends IJpaContextNode +public interface Generator extends JpaContextNode { String getName(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IBaseJpaContent.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IBaseJpaContent.java index 15b0ec8805..778cda23ef 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IBaseJpaContent.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IBaseJpaContent.java @@ -8,12 +8,12 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -import org.eclipse.jpt.core.internal.IContextModel; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; +import org.eclipse.jpt.core.ContextModel; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; -public interface IBaseJpaContent extends IJpaContextNode, IContextModel +public interface IBaseJpaContent extends JpaContextNode, ContextModel { // **************** persistence xml *************************************** @@ -27,14 +27,14 @@ public interface IBaseJpaContent extends IJpaContextNode, IContextModel * this project. * This may be null. */ - IPersistenceXml getPersistenceXml(); + PersistenceXml getPersistenceXml(); /** * Add a persistence.xml file to this content and return the content associated * with it. * Throws {@link IllegalStateException} if a persistence.xml already exists. */ - IPersistenceXml addPersistenceXml(); + PersistenceXml addPersistenceXml(); /** * Remove the persistence.xml file from this content. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdMapping.java index 0add35302e..07841de9c1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/IdMapping.java @@ -7,22 +7,23 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IIdMapping extends IAttributeMapping, IColumnMapping + +public interface IdMapping extends AttributeMapping, ColumnMapping { - IGeneratedValue getGeneratedValue(); - IGeneratedValue addGeneratedValue(); + GeneratedValue getGeneratedValue(); + GeneratedValue addGeneratedValue(); void removeGeneratedValue(); String GENERATED_VALUE_PROPERTY = "generatedValueProperty"; - ITableGenerator getTableGenerator(); - ITableGenerator addTableGenerator(); + TableGenerator getTableGenerator(); + TableGenerator addTableGenerator(); void removeTableGenerator(); String TABLE_GENERATOR_PROPERTY = "tableGeneratorProperty"; - ISequenceGenerator getSequenceGenerator(); - ISequenceGenerator addSequenceGenerator(); + SequenceGenerator getSequenceGenerator(); + SequenceGenerator addSequenceGenerator(); void removeSequenceGenerator(); String SEQUENCE_GENERATOR_PROPERTY = "sequenceGeneratorProperty"; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java new file mode 100644 index 0000000000..937bd239ad --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/InheritanceType.java @@ -0,0 +1,73 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.context; + + + +public enum InheritanceType { + + + SINGLE_TABLE, + JOINED, + TABLE_PER_CLASS; + + public static InheritanceType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.InheritanceType javaInheritanceType) { + if (javaInheritanceType == org.eclipse.jpt.core.resource.java.InheritanceType.SINGLE_TABLE) { + return SINGLE_TABLE; + } + else if (javaInheritanceType == org.eclipse.jpt.core.resource.java.InheritanceType.JOINED) { + return JOINED; + } + else if (javaInheritanceType == org.eclipse.jpt.core.resource.java.InheritanceType.TABLE_PER_CLASS) { + return TABLE_PER_CLASS; + } + return null; + } + + public static org.eclipse.jpt.core.resource.java.InheritanceType toJavaResourceModel(InheritanceType inheritanceType) { + if (inheritanceType == SINGLE_TABLE) { + return org.eclipse.jpt.core.resource.java.InheritanceType.SINGLE_TABLE; + } + else if (inheritanceType == JOINED) { + return org.eclipse.jpt.core.resource.java.InheritanceType.JOINED; + } + else if (inheritanceType == TABLE_PER_CLASS) { + return org.eclipse.jpt.core.resource.java.InheritanceType.TABLE_PER_CLASS; + } + return null; + } + + + public static InheritanceType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.InheritanceType ormInheritanceType) { + if (ormInheritanceType == org.eclipse.jpt.core.resource.orm.InheritanceType.SINGLE_TABLE) { + return SINGLE_TABLE; + } + else if (ormInheritanceType == org.eclipse.jpt.core.resource.orm.InheritanceType.JOINED) { + return JOINED; + } + else if (ormInheritanceType == org.eclipse.jpt.core.resource.orm.InheritanceType.TABLE_PER_CLASS) { + return TABLE_PER_CLASS; + } + return null; + } + + public static org.eclipse.jpt.core.resource.orm.InheritanceType toOrmResourceModel(InheritanceType inheritanceType) { + if (inheritanceType == SINGLE_TABLE) { + return org.eclipse.jpt.core.resource.orm.InheritanceType.SINGLE_TABLE; + } + else if (inheritanceType == JOINED) { + return org.eclipse.jpt.core.resource.orm.InheritanceType.JOINED; + } + else if (inheritanceType == TABLE_PER_CLASS) { + return org.eclipse.jpt.core.resource.orm.InheritanceType.TABLE_PER_CLASS; + } + return null; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java index f0bea734a3..354a81a785 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java @@ -7,17 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IJoinColumn extends IAbstractColumn, IAbstractJoinColumn + +public interface JoinColumn extends AbstractColumn, AbstractJoinColumn { - IJoinColumn.Owner owner(); + JoinColumn.Owner owner(); /** * interface allowing join columns to be used in multiple places * (e.g. 1:1 mappings and join tables) */ - interface Owner extends IAbstractJoinColumn.Owner, IAbstractColumn.Owner + interface Owner extends AbstractJoinColumn.Owner, AbstractColumn.Owner { /** * return whether the specified table cannot be explicitly specified @@ -33,7 +34,7 @@ public interface IJoinColumn extends IAbstractColumn, IAbstractJoinColumn /** * return the entity referenced by the join column */ - IEntity targetEntity(); + Entity targetEntity(); /** * return the join column's attribute name @@ -43,7 +44,7 @@ public interface IJoinColumn extends IAbstractColumn, IAbstractJoinColumn /** * return the relationship mapping for this join column */ - IRelationshipMapping relationshipMapping(); + RelationshipMapping relationshipMapping(); /** * return the size of the joinColumns collection this join column is a part of diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java index d9dbea1a3c..f098296a31 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IJoinTable extends ITable +public interface JoinTable extends Table { - IRelationshipMapping parent(); + RelationshipMapping parent(); // **************** join columns ************************************** @@ -23,7 +23,7 @@ public interface IJoinTable extends ITable * Return a list iterator of the join columns whether specified or default. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> joinColumns(); + <T extends JoinColumn> ListIterator<T> joinColumns(); /** * Return the number of join columns, both specified and default. @@ -34,7 +34,7 @@ public interface IJoinTable extends ITable * Return a list iterator of the specified join columns. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> specifiedJoinColumns(); + <T extends JoinColumn> ListIterator<T> specifiedJoinColumns(); String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList"; /** @@ -46,14 +46,14 @@ public interface IJoinTable extends ITable * Return the default join column or null. A default join column * only exists if there are no specified join columns. */ - IJoinColumn getDefaultJoinColumn(); + JoinColumn getDefaultJoinColumn(); String DEFAULT_JOIN_COLUMN = "defaultJoinColumn"; /** * Add a specified join column to the join table return the object * representing it. */ - IJoinColumn addSpecifiedJoinColumn(int index); + JoinColumn addSpecifiedJoinColumn(int index); /** * Remove the specified join column from the join table. @@ -63,7 +63,7 @@ public interface IJoinTable extends ITable /** * Remove the specified join column at the index from the join table. */ - void removeSpecifiedJoinColumn(IJoinColumn joinColumn); + void removeSpecifiedJoinColumn(JoinColumn joinColumn); /** * Move the specified join column from the source index to the target index. @@ -79,7 +79,7 @@ public interface IJoinTable extends ITable * Return a list iterator of the inverse join columns whether specified or default. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> inverseJoinColumns(); + <T extends JoinColumn> ListIterator<T> inverseJoinColumns(); /** * Return the number of inverse join columns, both specified and default. @@ -90,7 +90,7 @@ public interface IJoinTable extends ITable * Return a list iterator of the specified inverse join columns. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> specifiedInverseJoinColumns(); + <T extends JoinColumn> ListIterator<T> specifiedInverseJoinColumns(); String SPECIFIED_INVERSE_JOIN_COLUMNS_LIST = "specifiedInverseJoinColumnsList"; /** @@ -102,14 +102,14 @@ public interface IJoinTable extends ITable * Return the default inverse join column or null. A default inverse join column * only exists if there are no specified inverse join columns. */ - IJoinColumn getDefaultInverseJoinColumn(); + JoinColumn getDefaultInverseJoinColumn(); String DEFAULT_INVERSE_JOIN_COLUMN = "defaultInverseJoinColumn"; /** * Add a specified inverse join column to the join table return the object * representing it. */ - IJoinColumn addSpecifiedInverseJoinColumn(int index); + JoinColumn addSpecifiedInverseJoinColumn(int index); /** * Remove the specified inverse join column from the join table. @@ -119,7 +119,7 @@ public interface IJoinTable extends ITable /** * Remove the specified inverse join column at the index from the join table. */ - void removeSpecifiedInverseJoinColumn(IJoinColumn joinColumn); + void removeSpecifiedInverseJoinColumn(JoinColumn joinColumn); /** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java index c2b83bfbb0..ca91184ad4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java @@ -8,16 +8,16 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -public interface IJpaContextNode extends IJpaNode +public interface JpaContextNode extends JpaNode { - IPersistenceUnit persistenceUnit(); + PersistenceUnit persistenceUnit(); /** * Return the EntityMappings if this contextNode is within an orm.xml context @@ -25,6 +25,5 @@ public interface IJpaContextNode extends IJpaNode */ EntityMappings entityMappings(); - //TODO interface for this - XmlPersistentType xmlPersistentType(); + OrmPersistentType ormPersistentType(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToManyMapping.java index b293b5bd43..be3afeb5bf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToManyMapping.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IManyToManyMapping extends IMultiRelationshipMapping +public interface ManyToManyMapping extends MultiRelationshipMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToOneMapping.java index d99a7f2ac8..68dbcfcaa6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/ManyToOneMapping.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IOneToManyMapping extends IMultiRelationshipMapping + +public interface ManyToOneMapping extends SingleRelationshipMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappedSuperclass.java index 7531f932b8..34dd27e3a7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MappedSuperclass.java @@ -7,10 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IMappedSuperclass extends ITypeMapping + +public interface MappedSuperclass extends TypeMapping { String getIdClass(); void setIdClass(String value); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MultiRelationshipMapping.java index cd858ac03c..10b6ea0e4c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/MultiRelationshipMapping.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.Iterator; -public interface IMultiRelationshipMapping extends INonOwningMapping +public interface MultiRelationshipMapping extends NonOwningMapping { FetchType DEFAULT_FETCH_TYPE = FetchType.LAZY; @@ -33,7 +33,7 @@ public interface IMultiRelationshipMapping extends INonOwningMapping String CUSTOM_ORDERING_PROPERTY = "customOrderingProperty"; - IJoinTable getJoinTable(); + JoinTable getJoinTable(); boolean isJoinTableSpecified(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java index e2f8b07de3..477502895d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; -public interface INamedColumn extends IJpaContextNode +public interface NamedColumn extends JpaContextNode { String getName(); @@ -51,7 +51,7 @@ public interface INamedColumn extends IJpaContextNode /** * Return the (best guess) text location of the column's name. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); Owner owner(); /** @@ -63,13 +63,13 @@ public interface INamedColumn extends IJpaContextNode /** * Return the type mapping that contains the column. */ - ITypeMapping typeMapping(); + TypeMapping typeMapping(); /** * Return the column owner's text range. This can be returned by the * column when its annotation is not present. */ - ITextRange validationTextRange(CompilationUnit astRoot); + TextRange validationTextRange(CompilationUnit astRoot); /** * Return the wrapper for the datasource table for the given table name diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedNativeQuery.java index 24d813e95c..459215ae54 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedNativeQuery.java @@ -7,10 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface INamedNativeQuery extends IQuery + +public interface NamedNativeQuery extends Query { String getResultClass(); void setResultClass(String value); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedQuery.java index 5b98e1e835..0cd14cb80b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedQuery.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface INamedQuery extends IQuery + +public interface NamedQuery extends Query {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INonOwningMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NonOwningMapping.java index c7a08c5e9d..68ded69297 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INonOwningMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NonOwningMapping.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface INonOwningMapping extends IRelationshipMapping +public interface NonOwningMapping extends RelationshipMapping { String getMappedBy(); void setMappedBy(String value); @@ -21,7 +21,7 @@ public interface INonOwningMapping extends IRelationshipMapping Iterator<String> candidateMappedByAttributeNames(); - boolean mappedByIsValid(IAttributeMapping mappedByMapping); + boolean mappedByIsValid(AttributeMapping mappedByMapping); - ITextRange mappedByTextRange(CompilationUnit astRoot); + TextRange mappedByTextRange(CompilationUnit astRoot); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INullable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Nullable.java index d99ebbad16..028054a941 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/INullable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Nullable.java @@ -7,7 +7,8 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; + /** * This interface is used for mappings that support the optional element. @@ -16,7 +17,7 @@ package org.eclipse.jpt.core.internal.context.base; * and is disregarded for primitive types; it may be used in schema generation. * @author kamoore */ -public interface INullable extends IAttributeMapping +public interface Nullable extends AttributeMapping { Boolean getOptional(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToManyMapping.java index e69c056b3d..2f446f2e58 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToManyMapping.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IManyToOneMapping extends ISingleRelationshipMapping + +public interface OneToManyMapping extends MultiRelationshipMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.java new file mode 100644 index 0000000000..32c9d9d67a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/OneToOneMapping.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context; + +public interface OneToOneMapping + extends SingleRelationshipMapping, NonOwningMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentAttribute.java index 4fb066f973..7eb6f75bd1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentAttribute.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; -public interface IPersistentAttribute extends IJpaContextNode, IJpaStructureNode +public interface PersistentAttribute extends JpaContextNode, JpaStructureNode { String getName(); String NAME_PROPERTY = "nameProperty"; @@ -33,12 +33,12 @@ public interface IPersistentAttribute extends IJpaContextNode, IJpaStructureNode * Return the attribute's "specified" mapping, or if it is null * return the "default" mapping. WIll not return null. */ - IAttributeMapping getMapping(); + AttributeMapping getMapping(); /** * Return the attribute's "specified" mapping, could be null */ - IAttributeMapping getSpecifiedMapping(); + AttributeMapping getSpecifiedMapping(); /** * Clients should call this method to set the attribute's mapping. @@ -49,9 +49,9 @@ public interface IPersistentAttribute extends IJpaContextNode, IJpaStructureNode String SPECIFIED_MAPPING_PROPERTY = "specifiedMappingProperty"; String DEFAULT_MAPPING_PROPERTY = "defaultMappingProperty"; - ITypeMapping typeMapping(); + TypeMapping typeMapping(); - IPersistentType persistentType(); + PersistentType persistentType(); /** * If the attribute is mapped to a primary key column, return the diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentType.java index a192518e52..026627bc19 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PersistentType.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.Iterator; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; -public interface IPersistentType extends IJpaContextNode, IJpaStructureNode +public interface PersistentType extends JpaContextNode, JpaStructureNode { String getName(); String NAME_PROPERTY = "nameProperty"; @@ -22,7 +22,7 @@ public interface IPersistentType extends IJpaContextNode, IJpaStructureNode AccessType access(); String ACCESS_PROPERTY = "accessProperty"; - ITypeMapping getMapping(); + TypeMapping getMapping(); String mappingKey(); void setMappingKey(String key); String MAPPING_PROPERTY = "mappingProperty"; @@ -31,8 +31,8 @@ public interface IPersistentType extends IJpaContextNode, IJpaStructureNode /** - * Return the parent IPersistentType from the inheritance hierarchy. - * If the java inheritance parent is not a IPersistentType then continue + * Return the parent {@link PersistentType} from the inheritance hierarchy. + * If the java inheritance parent is not a {@link PersistentType} then continue * up the hierarchy(the JPA spec allows non-persistent types to be part of the hierarchy.) * Return null if this persistentType is the root persistent type. * Example: @@ -49,15 +49,15 @@ public interface IPersistentType extends IJpaContextNode, IJpaStructureNode * If this is the Cat JavaPersistentType then parentPersistentType is the Model JavaPersistentType * The parentPersistentType could be found in java or xml. */ - IPersistentType parentPersistentType(); + PersistentType parentPersistentType(); /** - * Return a read-only iterator of the contained IPersistentAttributes + * Return a read-only iterator of the contained {@link PersistentAttribute} */ - <T extends IPersistentAttribute> ListIterator<T> attributes(); + <T extends PersistentAttribute> ListIterator<T> attributes(); /** - * Return the size of IPersistentAttributes list + * Return the size of {@link PersistentAttribute}s list * @return */ int attributesSize(); @@ -66,10 +66,10 @@ public interface IPersistentType extends IJpaContextNode, IJpaStructureNode Iterator<String> attributeNames(); /** - * Return a read-only iterator of the all the IPersistentAttributes + * Return a read-only iterator of the all the {@link PersistentAttribute}s * in the hierarchy */ - Iterator<IPersistentAttribute> allAttributes(); + Iterator<PersistentAttribute> allAttributes(); Iterator<String> allAttributeNames(); @@ -77,15 +77,15 @@ public interface IPersistentType extends IJpaContextNode, IJpaStructureNode * Return the attribute named <code>attributeName</code> if * it exists locally on this type */ - IPersistentAttribute attributeNamed(String attributeName); + PersistentAttribute attributeNamed(String attributeName); /** * Resolve and return the attribute named <code>attributeName</code> if it * is distinct and exists within the context of this type */ - IPersistentAttribute resolveAttribute(String attributeName); + PersistentAttribute resolveAttribute(String attributeName); - Iterator<IPersistentType> inheritanceHierarchy(); + Iterator<PersistentType> inheritanceHierarchy(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumn.java index 731f06ab4a..c61f9bcd8f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/PrimaryKeyJoinColumn.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IPrimaryKeyJoinColumn extends IAbstractJoinColumn + +public interface PrimaryKeyJoinColumn extends AbstractJoinColumn {}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Query.java index 415fd0b27e..538a4485d2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Query.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface IQuery extends IJpaContextNode +public interface Query extends JpaContextNode { //************************ name *********************** @@ -31,7 +31,7 @@ public interface IQuery extends IJpaContextNode /** * Return a list iterator of the hints. This will not be null. */ - <T extends IQueryHint> ListIterator<T> hints(); + <T extends QueryHint> ListIterator<T> hints(); /** * Return the number of hints. @@ -41,7 +41,7 @@ public interface IQuery extends IJpaContextNode /** * Add a hint to the query and return the object representing it. */ - IQueryHint addHint(int index); + QueryHint addHint(int index); /** * Remove the hint from the query. @@ -51,7 +51,7 @@ public interface IQuery extends IJpaContextNode /** * Remove the hint at the index from the query. */ - void removeHint(IQueryHint queryHint); + void removeHint(QueryHint queryHint); /** * Move the hint from the source index to the target index. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHint.java index 6513585e66..30341966c0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/QueryHint.java @@ -7,10 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IQueryHint extends IJpaContextNode + +public interface QueryHint extends JpaContextNode { String getName(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/RelationshipMapping.java index d780da88f3..34748d7743 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/RelationshipMapping.java @@ -7,10 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IRelationshipMapping extends IAttributeMapping, IFetchable + +public interface RelationshipMapping extends AttributeMapping, Fetchable { // **************** target entity ************************************** @@ -24,7 +25,7 @@ public interface IRelationshipMapping extends IAttributeMapping, IFetchable String getDefaultTargetEntity(); String DEFAULT_TARGET_ENTITY_PROPERTY = "defaultTargetEntityProperty"; - IEntity getResolvedTargetEntity(); + Entity getResolvedTargetEntity(); String RESOLVED_TARGET_ENTITY_PROPERTY = "resolvedTargetEntityProperty"; /** @@ -35,14 +36,14 @@ public interface IRelationshipMapping extends IAttributeMapping, IFetchable // **************** cascade ************************************** - ICascade getCascade(); + Cascade getCascade(); /** * Return the Entity that owns this relationship mapping * @return */ - IEntity getEntity(); + Entity getEntity(); /** * Return whether this mapping is the owning side of the relationship. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java index 29d2ec297f..ec9034410e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface ISecondaryTable extends ITable +public interface SecondaryTable extends Table { - public IEntity parent(); + public Entity parent(); /** * Return a list iterator of the primary key join columns whether specified or default. * This will not be null. */ - <T extends IPrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns(); + <T extends PrimaryKeyJoinColumn> ListIterator<T> primaryKeyJoinColumns(); String SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST = "specifiedPrimaryKeyJoinColumnsList"; /** @@ -33,7 +33,7 @@ public interface ISecondaryTable extends ITable * Return a list iterator of the specified primary key join columns. * This will not be null. */ - <T extends IPrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns(); + <T extends PrimaryKeyJoinColumn> ListIterator<T> specifiedPrimaryKeyJoinColumns(); /** * Return the number of specified primary key join columns. @@ -44,14 +44,14 @@ public interface ISecondaryTable extends ITable * Return the default primary key join column or null. A default primary key join column * only exists if there are no specified primary key join columns. */ - IPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); String DEFAULT_PRIMARY_KEY_JOIN_COLUMN = "defaultPrimaryKeyJoinColumn"; /** * Add a specified primary key join column to the secondary table return the object * representing it. */ - IPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); + PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); /** * Remove the specified primary key join column from the secondary table. @@ -61,7 +61,7 @@ public interface ISecondaryTable extends ITable /** * Remove the specified primary key join column at the index from the secondary table. */ - void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn pkJoinColumn); + void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn); /** * Move the specified primary key join column from the source index to the target index. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java index 5bdd4a6765..7736231534 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SequenceGenerator.java @@ -7,10 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface ISequenceGenerator extends IGenerator + +public interface SequenceGenerator extends Generator { Integer DEFAULT_INITIAL_VALUE = Integer.valueOf(1); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SingleRelationshipMapping.java index 91f37b8a63..19f1f09cb1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ISingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SingleRelationshipMapping.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.ListIterator; -public interface ISingleRelationshipMapping extends IRelationshipMapping, INullable +public interface SingleRelationshipMapping extends RelationshipMapping, Nullable { // **************** fetch type ************************************** @@ -25,7 +25,7 @@ public interface ISingleRelationshipMapping extends IRelationshipMapping, INulla * Return a list iterator of the join columns whether specified or default. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> joinColumns(); + <T extends JoinColumn> ListIterator<T> joinColumns(); /** * Return the number of join columns, both specified and default. @@ -36,7 +36,7 @@ public interface ISingleRelationshipMapping extends IRelationshipMapping, INulla * Return a list iterator of the specified join columns. * This will not be null. */ - <T extends IJoinColumn> ListIterator<T> specifiedJoinColumns(); + <T extends JoinColumn> ListIterator<T> specifiedJoinColumns(); String SPECIFIED_JOIN_COLUMNS_LIST = "specifiedJoinColumnsList"; /** @@ -48,14 +48,14 @@ public interface ISingleRelationshipMapping extends IRelationshipMapping, INulla * Return the default join column or null. A default join column * only exists if there are no specified join columns. */ - IJoinColumn getDefaultJoinColumn(); + JoinColumn getDefaultJoinColumn(); String DEFAULT_JOIN_COLUMN = "defaultJoinColumn"; /** * Add a specified join column to the join table return the object * representing it. */ - IJoinColumn addSpecifiedJoinColumn(int index); + JoinColumn addSpecifiedJoinColumn(int index); /** * Remove the specified join column from the join table. @@ -65,7 +65,7 @@ public interface ISingleRelationshipMapping extends IRelationshipMapping, INulla /** * Remove the specified join column at the index from the join table. */ - void removeSpecifiedJoinColumn(IJoinColumn joinColumn); + void removeSpecifiedJoinColumn(JoinColumn joinColumn); /** * Move the specified join column from the source index to the target index. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Table.java index fc3fc5449b..f4bdf38f21 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/Table.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.db.internal.Schema; -public interface ITable extends IJpaContextNode +public interface Table extends JpaContextNode { String getName(); @@ -66,11 +66,11 @@ public interface ITable extends IJpaContextNode */ boolean isResolved(); - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); - ITextRange schemaTextRange(CompilationUnit astRoot); + TextRange schemaTextRange(CompilationUnit astRoot); - ITextRange catalogTextRange(CompilationUnit astRoot); + TextRange catalogTextRange(CompilationUnit astRoot); // // class UniqueConstraintOwner implements IUniqueConstraint.Owner diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TableGenerator.java index 686823eb1a..5a95870eb3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TableGenerator.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; -public interface ITableGenerator extends IGenerator +public interface TableGenerator extends Generator { Integer DEFAULT_INITIAL_VALUE = Integer.valueOf(0); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java new file mode 100644 index 0000000000..7927190c4f --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TemporalType.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.context; + + +public enum TemporalType { + + DATE, + TIME, + TIMESTAMP; + + + public static TemporalType fromJavaResourceModel(org.eclipse.jpt.core.resource.java.TemporalType javaTemporalType) { + if (javaTemporalType == org.eclipse.jpt.core.resource.java.TemporalType.DATE) { + return DATE; + } + else if (javaTemporalType == org.eclipse.jpt.core.resource.java.TemporalType.TIME) { + return TIME; + } + else if (javaTemporalType == org.eclipse.jpt.core.resource.java.TemporalType.TIMESTAMP) { + return TIMESTAMP; + } + return null; + } + + public static org.eclipse.jpt.core.resource.java.TemporalType toJavaResourceModel(TemporalType temporalType) { + if (temporalType == DATE) { + return org.eclipse.jpt.core.resource.java.TemporalType.DATE; + } + else if (temporalType == TIME) { + return org.eclipse.jpt.core.resource.java.TemporalType.TIME; + } + else if (temporalType == TIMESTAMP) { + return org.eclipse.jpt.core.resource.java.TemporalType.TIMESTAMP; + } + return null; + } + + + public static TemporalType fromOrmResourceModel(org.eclipse.jpt.core.resource.orm.TemporalType ormTemporalType) { + if (ormTemporalType == org.eclipse.jpt.core.resource.orm.TemporalType.DATE) { + return DATE; + } + else if (ormTemporalType == org.eclipse.jpt.core.resource.orm.TemporalType.TIME) { + return TIME; + } + else if (ormTemporalType == org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP) { + return TIMESTAMP; + } + return null; + } + + public static org.eclipse.jpt.core.resource.orm.TemporalType toOrmResourceModel(TemporalType temporalType) { + if (temporalType == DATE) { + return org.eclipse.jpt.core.resource.orm.TemporalType.DATE; + } + else if (temporalType == TIME) { + return org.eclipse.jpt.core.resource.orm.TemporalType.TIME; + } + else if (temporalType == TIMESTAMP) { + return org.eclipse.jpt.core.resource.orm.TemporalType.TIMESTAMP; + } + return null; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TransientMapping.java index bdc3676644..627c07da64 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TransientMapping.java @@ -7,8 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface ITransientMapping extends IAttributeMapping + +public interface TransientMapping extends AttributeMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java index f508f4a34c..386b3d54df 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/ITypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java @@ -7,13 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; import java.util.Iterator; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; -public interface ITypeMapping extends IJpaContextNode +public interface TypeMapping extends JpaContextNode { /** * Return a unique key for the ITypeMapping. If this is defined in @@ -22,7 +21,7 @@ public interface ITypeMapping extends IJpaContextNode */ String getKey(); - IPersistentType persistentType(); + PersistentType persistentType(); boolean isMapped(); @@ -35,14 +34,14 @@ public interface ITypeMapping extends IJpaContextNode * Return the type mapping's "associated" tables, which includes the * primary table and the collection of secondary tables. */ - Iterator<ITable> associatedTables(); + Iterator<Table> associatedTables(); /** * Return the type mapping's "associated" tables, which includes the * primary table and the collection of secondary tables, as well as all * inherited "associated" tables. */ - Iterator<ITable> associatedTablesIncludingInherited(); + Iterator<Table> associatedTablesIncludingInherited(); /** * Return the names of the type mapping's "associated" tables, @@ -54,14 +53,14 @@ public interface ITypeMapping extends IJpaContextNode /** * return the resolved primary db table */ - Table primaryDbTable(); + org.eclipse.jpt.db.internal.Table primaryDbTable(); Schema dbSchema(); /** * return the resolved associated db table with the passed in name */ - Table dbTable(String tableName); + org.eclipse.jpt.db.internal.Table dbTable(String tableName); /** * Return whether the specified table is invalid for any annotations diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/VersionMapping.java index 9050f4b7df..85a4496359 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/VersionMapping.java @@ -7,9 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context; -public interface IVersionMapping extends IAttributeMapping, IColumnMapping + +public interface VersionMapping extends AttributeMapping, ColumnMapping { } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IDefaultJavaAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/DefaultJavaAttributeMappingProvider.java index ea8d2c4356..60cf07d51b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IDefaultJavaAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/DefaultJavaAttributeMappingProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; /** * Map a string key to an attribute mapping and its corresponding * Java annotation adapter. */ -public interface IDefaultJavaAttributeMappingProvider extends IJavaAttributeMappingProvider { +public interface DefaultJavaAttributeMappingProvider extends JavaAttributeMappingProvider { /** * Given the IJavaPersistentAttribute return whether the default mapping applies. * This will be used to determine the default mapping in the case where no * mapping has been specified. */ - boolean defaultApplies(IJavaPersistentAttribute persistentAttribute); + boolean defaultApplies(JavaPersistentAttribute persistentAttribute); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAssociationOverride.java index bc1ccd7d14..1a438ac9d6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAssociationOverride.java @@ -7,24 +7,24 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverride; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; -public interface IJavaAssociationOverride extends IAssociationOverride, IJavaJpaContextNode +public interface JavaAssociationOverride extends AssociationOverride, JavaJpaContextNode { @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> joinColumns(); + ListIterator<JavaJoinColumn> joinColumns(); @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> specifiedJoinColumns(); + ListIterator<JavaJoinColumn> specifiedJoinColumns(); @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> defaultJoinColumns(); - IJavaJoinColumn addSpecifiedJoinColumn(int index); + ListIterator<JavaJoinColumn> defaultJoinColumns(); + JavaJoinColumn addSpecifiedJoinColumn(int index); - void initializeFromResource(AssociationOverride associationOverride); + void initializeFromResource(AssociationOverrideAnnotation associationOverride); - void update(AssociationOverride associationOverride); + void update(AssociationOverrideAnnotation associationOverride); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java index 8706bb4a4c..24d7d99b1c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; -public interface IJavaAttributeMapping extends IAttributeMapping, IJavaJpaContextNode +public interface JavaAttributeMapping extends AttributeMapping, JavaJpaContextNode { - IJavaPersistentAttribute persistentAttribute(); + JavaPersistentAttribute persistentAttribute(); - void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource); + void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource); - void update(JavaPersistentAttributeResource persistentAttributeResource); + void update(JavaResourcePersistentAttribute persistentAttributeResource); String annotationName(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java index 4d28bc9f37..432f73a356 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; /** * Map a string key to a type mapping and its corresponding * Java annotation adapter. */ -public interface IJavaAttributeMappingProvider { +public interface JavaAttributeMappingProvider { /** * A unique String that corresponds to the IJavaAttributeMapping key @@ -25,12 +25,10 @@ public interface IJavaAttributeMappingProvider { String annotationName(); /** - * Create an IJavaAtttributeMapping for the given attribute. Use the IJpaFactory - * for creation so that extenders can create their own IJpaFactory instead of - * creating their own attributeMappingProvider. - * @param type - * @param jpaFactory + * Create an {@link JavaAttributeMapping} for the given attribute. Use the {@link JpaFactory} + * for creation so that extenders can create their own {@link JpaFactory} instead of + * creating their own {@link JavaAttributeMappingProvider}. */ - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java new file mode 100644 index 0000000000..608dcbb1a5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeOverride.java @@ -0,0 +1,23 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; + +public interface JavaAttributeOverride extends AttributeOverride, JavaJpaContextNode, JavaColumn.Owner +{ + JavaColumn getColumn(); + + void initializeFromResource(AttributeOverrideAnnotation attributeOverride); + + void update(AttributeOverrideAnnotation attributeOverride); + +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java new file mode 100644 index 0000000000..4c80336cae --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBasicMapping.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.BasicMapping; + +public interface JavaBasicMapping extends JavaAttributeMapping, BasicMapping, JavaColumnMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java index 8d7ca17781..e8c91b5110 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java @@ -7,17 +7,17 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IAbstractColumn; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.resource.java.Column; +import org.eclipse.jpt.core.context.AbstractColumn; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -public interface IJavaColumn extends IJavaNamedColumn, IColumn +public interface JavaColumn extends JavaNamedColumn, Column { - void initializeFromResource(Column columnResource); + void initializeFromResource(ColumnAnnotation columnResource); - void update(Column columnResource); + void update(ColumnAnnotation columnResource); boolean isConnected(); @@ -26,9 +26,9 @@ public interface IJavaColumn extends IJavaNamedColumn, IColumn * interface allowing columns to be used in multiple places * (e.g. basic mappings and attribute overrides) */ - interface Owner extends IAbstractColumn.Owner + interface Owner extends AbstractColumn.Owner { - Column columnResource(); + ColumnAnnotation columnResource(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java new file mode 100644 index 0000000000..4a45ac16bd --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumnMapping.java @@ -0,0 +1,17 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.ColumnMapping; + +public interface JavaColumnMapping extends JavaJpaContextNode, ColumnMapping, JavaColumn.Owner +{ + JavaColumn getColumn(); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaDiscriminatorColumn.java index 5231266c2b..a183a79fcd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaDiscriminatorColumn.java @@ -7,14 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IQueryHint; -import org.eclipse.jpt.core.internal.resource.java.QueryHint; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -public interface IJavaQueryHint extends IQueryHint, IJavaJpaContextNode -{ - void initializeFromResource(QueryHint queryHint); +public interface JavaDiscriminatorColumn extends JavaNamedColumn, DiscriminatorColumn +{ + void initializeFromResource(JavaResourcePersistentMember persistentResource); - void update(QueryHint queryHint); -} + void update(JavaResourcePersistentMember persistentResource); + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddable.java index 8f586b0b1e..8f40e46e0f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/IOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddable.java @@ -7,8 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.context.java; -public interface IOneToOneMapping - extends ISingleRelationshipMapping, INonOwningMapping +import org.eclipse.jpt.core.context.Embeddable; + + + +public interface JavaEmbeddable extends JavaTypeMapping, Embeddable {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedIdMapping.java index 3e16cbde62..cc6175d659 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedIdMapping.java @@ -7,19 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; -public interface IJavaEmbeddedMapping extends IJavaAttributeMapping, IEmbeddedMapping +public interface JavaEmbeddedIdMapping extends JavaAttributeMapping, EmbeddedIdMapping { @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> attributeOverrides(); + ListIterator<JavaAttributeOverride> attributeOverrides(); @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> defaultAttributeOverrides(); + ListIterator<JavaAttributeOverride> defaultAttributeOverrides(); @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides(); - IJavaAttributeOverride addSpecifiedAttributeOverride(int index); - + ListIterator<JavaAttributeOverride> specifiedAttributeOverrides(); + JavaAttributeOverride addSpecifiedAttributeOverride(int index); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedMapping.java index b417a9042f..d9707786b0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEmbeddedMapping.java @@ -7,18 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; +import org.eclipse.jpt.core.context.EmbeddedMapping; -public interface IJavaEmbeddedIdMapping extends IJavaAttributeMapping, IEmbeddedIdMapping +public interface JavaEmbeddedMapping extends JavaAttributeMapping, EmbeddedMapping { @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> attributeOverrides(); + ListIterator<JavaAttributeOverride> attributeOverrides(); @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> defaultAttributeOverrides(); + ListIterator<JavaAttributeOverride> defaultAttributeOverrides(); @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides(); - IJavaAttributeOverride addSpecifiedAttributeOverride(int index); + ListIterator<JavaAttributeOverride> specifiedAttributeOverrides(); + JavaAttributeOverride addSpecifiedAttributeOverride(int index); + } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.java new file mode 100644 index 0000000000..2ce3a74937 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaEntity.java @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import java.util.ListIterator; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; + +public interface JavaEntity extends JavaTypeMapping, Entity +{ + JavaTable getTable(); + + JavaDiscriminatorColumn getDiscriminatorColumn(); + + JavaTableGenerator getTableGenerator(); + JavaTableGenerator addTableGenerator(); + + JavaSequenceGenerator getSequenceGenerator(); + JavaSequenceGenerator addSequenceGenerator(); + + @SuppressWarnings("unchecked") + ListIterator<JavaSecondaryTable> secondaryTables(); + @SuppressWarnings("unchecked") + ListIterator<JavaSecondaryTable> specifiedSecondaryTables(); + JavaSecondaryTable addSpecifiedSecondaryTable(int index); + + @SuppressWarnings("unchecked") + ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns(); + JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); + @SuppressWarnings("unchecked") + ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns(); + PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); + + @SuppressWarnings("unchecked") + ListIterator<JavaAttributeOverride> attributeOverrides(); + @SuppressWarnings("unchecked") + ListIterator<JavaAttributeOverride> specifiedAttributeOverrides(); + @SuppressWarnings("unchecked") + ListIterator<JavaAttributeOverride> defaultAttributeOverrides(); + JavaAttributeOverride addSpecifiedAttributeOverride(int index); + + @SuppressWarnings("unchecked") + ListIterator<JavaAssociationOverride> associationOverrides(); + @SuppressWarnings("unchecked") + ListIterator<JavaAssociationOverride> specifiedAssociationOverrides(); + @SuppressWarnings("unchecked") + ListIterator<JavaAssociationOverride> defaultAssociationOverrides(); + JavaAssociationOverride addSpecifiedAssociationOverride(int index); + + @SuppressWarnings("unchecked") + ListIterator<JavaNamedQuery> namedQueries(); + JavaNamedQuery addNamedQuery(int index); + + @SuppressWarnings("unchecked") + ListIterator<JavaNamedNativeQuery> namedNativeQueries(); + JavaNamedNativeQuery addNamedNativeQuery(int index); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java index e01a5a1db0..1a1451fce7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.resource.java.GeneratedValue; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; -public interface IJavaGeneratedValue extends IGeneratedValue, IJavaJpaContextNode +public interface JavaGeneratedValue extends GeneratedValue, JavaJpaContextNode { - void initializeFromResource(GeneratedValue generatedValue); + void initializeFromResource(GeneratedValueAnnotation generatedValue); - void update(GeneratedValue generatedValue); + void update(GeneratedValueAnnotation generatedValue); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java index 922df25631..ebadde283b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IGenerator; -import org.eclipse.jpt.core.internal.resource.java.Generator; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.core.resource.java.GeneratorAnnotation; -public interface IJavaGenerator<T extends Generator> extends IGenerator, IJavaJpaContextNode +public interface JavaGenerator<T extends GeneratorAnnotation> extends Generator, JavaJpaContextNode { void initializeFromResource(T generator); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaIdMapping.java index b70d8bd11f..4f43125e85 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaIdMapping.java @@ -7,15 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.IdMapping; -public interface IJavaPrimaryKeyJoinColumn extends IPrimaryKeyJoinColumn, IJavaNamedColumn + +public interface JavaIdMapping extends JavaAttributeMapping, IdMapping, JavaColumnMapping { - void initializeFromResource(PrimaryKeyJoinColumn primaryKeyJoinColumn); + JavaGeneratedValue getGeneratedValue(); + JavaGeneratedValue addGeneratedValue(); - void update(PrimaryKeyJoinColumn primaryKeyJoinColumn); - -}
\ No newline at end of file + JavaSequenceGenerator getSequenceGenerator(); + JavaSequenceGenerator addSequenceGenerator(); + + JavaTableGenerator getTableGenerator(); + JavaTableGenerator addTableGenerator(); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java index be95f96bd5..2fc33148cb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java @@ -7,17 +7,17 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.JoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; -public interface IJavaJoinColumn extends IJoinColumn, IJavaNamedColumn +public interface JavaJoinColumn extends JoinColumn, JavaNamedColumn { - void initializeFromResource(JoinColumn joinColumn); + void initializeFromResource(JoinColumnAnnotation joinColumn); boolean isConnected(); - void update(JoinColumn joinColumn); + void update(JoinColumnAnnotation joinColumn); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java new file mode 100644 index 0000000000..812dd507a5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinTable.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.context.java; + +import java.util.ListIterator; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; + + +public interface JavaJoinTable extends JoinTable, JavaJpaContextNode +{ + void initializeFromResource(JavaResourcePersistentAttribute attributeResource); + + void update(JavaResourcePersistentAttribute attributeResource); + + boolean isSpecified(); + + @SuppressWarnings("unchecked") + ListIterator<JavaJoinColumn> joinColumns(); + + JavaJoinColumn getDefaultJoinColumn(); + + @SuppressWarnings("unchecked") + ListIterator<JavaJoinColumn> specifiedJoinColumns(); + + JavaJoinColumn addSpecifiedJoinColumn(int index); + + + @SuppressWarnings("unchecked") + ListIterator<JavaJoinColumn> inverseJoinColumns(); + + JavaJoinColumn getDefaultInverseJoinColumn(); + + @SuppressWarnings("unchecked") + ListIterator<JavaJoinColumn> specifiedInverseJoinColumns(); + + JavaJoinColumn addSpecifiedInverseJoinColumn(int index); + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java index e3ec3db461..97e12a12d6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java @@ -7,17 +7,17 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.JpaContextNode; import org.eclipse.jpt.utility.internal.Filter; -public interface IJavaJpaContextNode extends IJpaContextNode +public interface JavaJpaContextNode extends JpaContextNode { - ITextRange validationTextRange(CompilationUnit astRoot); + TextRange validationTextRange(CompilationUnit astRoot); /** * Return the Java code-completion proposals for the specified position diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java new file mode 100644 index 0000000000..e265ce9af4 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToManyMapping.java @@ -0,0 +1,15 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.ManyToManyMapping; + +public interface JavaManyToManyMapping extends JavaMultiRelationshipMapping, ManyToManyMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java new file mode 100644 index 0000000000..c85c298ccc --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaManyToOneMapping.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.ManyToOneMapping; + + +public interface JavaManyToOneMapping extends JavaSingleRelationshipMapping, ManyToOneMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java new file mode 100644 index 0000000000..186bb587be --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMappedSuperclass.java @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.MappedSuperclass; + + +public interface JavaMappedSuperclass + extends JavaTypeMapping, MappedSuperclass +{ + +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java new file mode 100644 index 0000000000..ebca789301 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaMultiRelationshipMapping.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.MultiRelationshipMapping; + +public interface JavaMultiRelationshipMapping extends JavaRelationshipMapping, MultiRelationshipMapping +{ + + JavaJoinTable getJoinTable(); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java new file mode 100644 index 0000000000..a6cecf2558 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java @@ -0,0 +1,18 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.NamedColumn; + + +public interface JavaNamedColumn extends NamedColumn, JavaJpaContextNode +{ + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java index b4ac2288b2..6c8785c863 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedNativeQuery.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.INamedQuery; -import org.eclipse.jpt.core.internal.resource.java.NamedQuery; +import org.eclipse.jpt.core.context.NamedNativeQuery; +import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; -public interface IJavaNamedQuery extends INamedQuery, IJavaQuery<NamedQuery> +public interface JavaNamedNativeQuery extends NamedNativeQuery, JavaQuery<NamedNativeQueryAnnotation> { } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java index 974ed01d34..dbb0599c6d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedQuery.java @@ -7,13 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; +import org.eclipse.jpt.core.context.NamedQuery; +import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; - -public interface IJavaMappedSuperclass - extends IJavaTypeMapping, IMappedSuperclass +public interface JavaNamedQuery extends NamedQuery, JavaQuery<NamedQueryAnnotation> { } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java new file mode 100644 index 0000000000..5a15d790fd --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToManyMapping.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.OneToManyMapping; + + +public interface JavaOneToManyMapping extends JavaMultiRelationshipMapping, OneToManyMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToOneMapping.java index 2d7c804fd2..65a590e20d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaOneToOneMapping.java @@ -7,11 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; +import org.eclipse.jpt.core.context.OneToOneMapping; - - -public interface IJavaEmbeddable extends IJavaTypeMapping, IEmbeddable +public interface JavaOneToOneMapping extends JavaSingleRelationshipMapping, OneToOneMapping {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentAttribute.java index be29ab58a1..beb2f47eba 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentAttribute.java @@ -7,28 +7,28 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; -public interface IJavaPersistentAttribute extends IPersistentAttribute, IJavaJpaContextNode +public interface JavaPersistentAttribute extends PersistentAttribute, JavaJpaContextNode { - IJavaAttributeMapping getMapping(); + JavaAttributeMapping getMapping(); - IJavaAttributeMapping getSpecifiedMapping(); + JavaAttributeMapping getSpecifiedMapping(); - IJavaTypeMapping typeMapping(); + JavaTypeMapping typeMapping(); - IJavaPersistentType persistentType(); + JavaPersistentType persistentType(); - void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource); + void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource); - void update(JavaPersistentAttributeResource persistentAttributeResource); + void update(JavaResourcePersistentAttribute persistentAttributeResource); - JavaPersistentAttributeResource getPersistentAttributeResource(); + JavaResourcePersistentAttribute getPersistentAttributeResource(); /** * Return whether the attribute contains the given offset into the text file. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentType.java index d7714aee9f..f56a148172 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPersistentType.java @@ -7,32 +7,32 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -public interface IJavaPersistentType extends IPersistentType, IJavaJpaContextNode +public interface JavaPersistentType extends PersistentType, JavaJpaContextNode { - IJavaTypeMapping getMapping(); + JavaTypeMapping getMapping(); @SuppressWarnings("unchecked") - ListIterator<IJavaPersistentAttribute> attributes(); + ListIterator<JavaPersistentAttribute> attributes(); - IJavaPersistentAttribute attributeNamed(String attributeName); + JavaPersistentAttribute attributeNamed(String attributeName); /** * Resolve and return the attribute named <code>attributeName</code> if it * is distinct and exists within the context of this type */ - IPersistentAttribute resolveAttribute(String attributeName); + PersistentAttribute resolveAttribute(String attributeName); - void initializeFromResource(JavaPersistentTypeResource persistentTypeResource); + void initializeFromResource(JavaResourcePersistentType persistentTypeResource); - void update(JavaPersistentTypeResource persistentTypeResource); + void update(JavaResourcePersistentType persistentTypeResource); /** * Return whether any attribute in this persistent type contains a mapping annotation diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java new file mode 100644 index 0000000000..84cb19aba7 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaPrimaryKeyJoinColumn.java @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; + +public interface JavaPrimaryKeyJoinColumn extends PrimaryKeyJoinColumn, JavaNamedColumn +{ + void initializeFromResource(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumn); + + void update(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumn); + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java index 6bc94d55c3..a206c43bf6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java @@ -7,18 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IQuery; -import org.eclipse.jpt.core.internal.resource.java.Query; +import org.eclipse.jpt.core.context.Query; +import org.eclipse.jpt.core.resource.java.QueryAnnotation; -public interface IJavaQuery<E extends Query> extends IQuery, IJavaJpaContextNode +public interface JavaQuery<E extends QueryAnnotation> extends Query, JavaJpaContextNode { @SuppressWarnings("unchecked") - ListIterator<IJavaQueryHint> hints(); - IJavaQueryHint addHint(int index); + ListIterator<JavaQueryHint> hints(); + JavaQueryHint addHint(int index); void initializeFromResource(E queryResource); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java new file mode 100644 index 0000000000..8d1f020856 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQueryHint.java @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.QueryHint; +import org.eclipse.jpt.core.resource.java.QueryHintAnnotation; + +public interface JavaQueryHint extends QueryHint, JavaJpaContextNode +{ + void initializeFromResource(QueryHintAnnotation queryHint); + + void update(QueryHintAnnotation queryHint); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java new file mode 100644 index 0000000000..6609ec9307 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaRelationshipMapping.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.RelationshipMapping; + + +public interface JavaRelationshipMapping extends JavaAttributeMapping, RelationshipMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java new file mode 100644 index 0000000000..2f77b25210 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSecondaryTable.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.context.java; + +import java.util.ListIterator; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; + + +public interface JavaSecondaryTable extends SecondaryTable, JavaJpaContextNode +{ + + @SuppressWarnings("unchecked") + ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns(); + + JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); + + @SuppressWarnings("unchecked") + ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns(); + + JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); + + void initializeFromResource(SecondaryTableAnnotation secondaryTable); + + void update(SecondaryTableAnnotation secondaryTable); + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java index d7aeaab8aa..1a09769d6e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSequenceGenerator.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.core.internal.resource.java.TableGenerator; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; -public interface IJavaTableGenerator extends IJavaGenerator<TableGenerator>, ITableGenerator +public interface JavaSequenceGenerator extends JavaGenerator<SequenceGeneratorAnnotation>, SequenceGenerator { }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSingleRelationshipMapping.java index f8137258af..71bd1275ed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaSingleRelationshipMapping.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.ISingleRelationshipMapping; +import org.eclipse.jpt.core.context.SingleRelationshipMapping; -public interface IJavaSingleRelationshipMapping extends IJavaRelationshipMapping, ISingleRelationshipMapping +public interface JavaSingleRelationshipMapping extends JavaRelationshipMapping, SingleRelationshipMapping { @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> joinColumns(); + ListIterator<JavaJoinColumn> joinColumns(); - IJavaJoinColumn getDefaultJoinColumn(); + JavaJoinColumn getDefaultJoinColumn(); @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> specifiedJoinColumns(); + ListIterator<JavaJoinColumn> specifiedJoinColumns(); - IJavaJoinColumn addSpecifiedJoinColumn(int index); + JavaJoinColumn addSpecifiedJoinColumn(int index); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaStructureNodes.java index 25841df9a7..047e3a5984 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaStructureNodes.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaStructureNodes.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; -public interface IJavaStructureNodes +public interface JavaStructureNodes { String COMPILATION_UNIT_ID = JptCorePlugin.PLUGIN_ID + ".java.compilationUnit"; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTable.java index 203e0edfa1..ef5e9574b8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaColumnMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTable.java @@ -7,11 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -public interface IJavaColumnMapping extends IJavaJpaContextNode, IColumnMapping, IJavaColumn.Owner +public interface JavaTable extends Table, JavaJpaContextNode { - IJavaColumn getColumn(); -} + void initializeFromResource(JavaResourcePersistentMember persistentResource); + + void update(JavaResourcePersistentMember persistentResource); +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java index 4b6b61c77b..26c02205d9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTableGenerator.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.resource.java.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; -public interface IJavaSequenceGenerator extends IJavaGenerator<SequenceGenerator>, ISequenceGenerator +public interface JavaTableGenerator extends JavaGenerator<TableGeneratorAnnotation>, TableGenerator { }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java new file mode 100644 index 0000000000..936a453600 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTransientMapping.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.TransientMapping; + + +public interface JavaTransientMapping extends JavaAttributeMapping, TransientMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java index b3e287fcf8..93baeae280 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -public interface IJavaTypeMapping extends ITypeMapping, IJavaJpaContextNode +public interface JavaTypeMapping extends TypeMapping, JavaJpaContextNode { - IJavaPersistentType persistentType(); + JavaPersistentType persistentType(); - void initializeFromResource(JavaPersistentTypeResource persistentTypeResource); + void initializeFromResource(JavaResourcePersistentType persistentTypeResource); - void update(JavaPersistentTypeResource persistentTypeResource); + void update(JavaResourcePersistentType persistentTypeResource); String annotationName(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java index 03194d6f28..c6b7b3270f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.java; +package org.eclipse.jpt.core.context.java; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; /** * Map a string key to a type mapping and its corresponding * Java annotation adapter. */ -public interface IJavaTypeMappingProvider { +public interface JavaTypeMappingProvider { /** * A unique String that corresponds to the IJavaTypeMapping key @@ -31,6 +31,6 @@ public interface IJavaTypeMappingProvider { * @param type * @param jpaFactory */ - public IJavaTypeMapping buildMapping(IJavaPersistentType parent, IJpaBaseContextFactory factory); + public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaBaseContextFactory factory); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java new file mode 100644 index 0000000000..e89ab683d0 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaVersionMapping.java @@ -0,0 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.context.java; + +import org.eclipse.jpt.core.context.VersionMapping; + + +public interface JavaVersionMapping extends JavaAttributeMapping, VersionMapping, JavaColumnMapping +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java index be99bd692e..5b84997147 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/EntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java @@ -8,17 +8,19 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmNamedNativeQuery; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmNamedQuery; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public interface EntityMappings extends IJpaContextNode, IJpaStructureNode +public interface EntityMappings extends JpaContextNode, JpaStructureNode { String getVersion(); @@ -65,45 +67,45 @@ public interface EntityMappings extends IJpaContextNode, IJpaStructureNode PersistenceUnitMetadata getPersistenceUnitMetadata(); - ListIterator<XmlPersistentType> xmlPersistentTypes(); - int xmlPersistentTypesSize(); - XmlPersistentType addXmlPersistentType(String mappingKey, String className); - void removeXmlPersistentType(int index); - void removeXmlPersistentType(XmlPersistentType xmlPersistentType); - //void moveXmlPersistentType(int targetIndex, int sourceIndex); + ListIterator<OrmPersistentType> ormPersistentTypes(); + int ormPersistentTypesSize(); + OrmPersistentType addOrmPersistentType(String mappingKey, String className); + void removeOrmPersistentType(int index); + void removeOrmPersistentType(OrmPersistentType ormPersistentType); + //void moveOrmPersistentType(int targetIndex, int sourceIndex); boolean containsPersistentType(String className); String PERSISTENT_TYPES_LIST = "persistentTypes"; - <T extends ISequenceGenerator> ListIterator<T> sequenceGenerators(); + <T extends SequenceGenerator> ListIterator<T> sequenceGenerators(); int sequenceGeneratorsSize(); - ISequenceGenerator addSequenceGenerator(int index); + SequenceGenerator addSequenceGenerator(int index); void removeSequenceGenerator(int index); - void removeSequenceGenerator(ISequenceGenerator sequenceGenerator); + void removeSequenceGenerator(SequenceGenerator sequenceGenerator); void moveSequenceGenerator(int targetIndex, int sourceIndex); String SEQUENCE_GENERATORS_LIST = "sequenceGeneratorsList"; - <T extends ITableGenerator> ListIterator<T> tableGenerators(); + <T extends TableGenerator> ListIterator<T> tableGenerators(); int tableGeneratorsSize(); - ITableGenerator addTableGenerator(int index); + TableGenerator addTableGenerator(int index); void removeTableGenerator(int index); - void removeTableGenerator(ITableGenerator tableGenerator); + void removeTableGenerator(TableGenerator tableGenerator); void moveTableGenerator(int targetIndex, int sourceIndex); String TABLE_GENERATORS_LIST = "tableGeneratorsList"; - ListIterator<XmlNamedQuery> namedQueries(); + ListIterator<GenericOrmNamedQuery> namedQueries(); int namedQueriesSize(); - XmlNamedQuery addNamedQuery(int index); + GenericOrmNamedQuery addNamedQuery(int index); void removeNamedQuery(int index); - void removeNamedQuery(XmlNamedQuery namedQuery); + void removeNamedQuery(GenericOrmNamedQuery namedQuery); void moveNamedQuery(int targetIndex, int sourceIndex); String NAMED_QUERIES_LIST = "namedQueriesList"; - ListIterator<XmlNamedNativeQuery> namedNativeQueries(); + ListIterator<GenericOrmNamedNativeQuery> namedNativeQueries(); int namedNativeQueriesSize(); - XmlNamedNativeQuery addNamedNativeQuery(int index); + GenericOrmNamedNativeQuery addNamedNativeQuery(int index); void removeNamedNativeQuery(int index); - void removeNamedNativeQuery(XmlNamedNativeQuery namedNativeQuery); + void removeNamedNativeQuery(GenericOrmNamedNativeQuery namedNativeQuery); void moveNamedNativeQuery(int targetIndex, int sourceIndex); String NAMED_NATIVE_QUERIES_LIST = "namedNativeQueriesList"; @@ -115,15 +117,15 @@ public interface EntityMappings extends IJpaContextNode, IJpaStructureNode * Return the XmlPersistentType listed in this mapping file * with the given fullyQualifiedTypeName. Return null if non exists. */ - XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName); + OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName); - void changeMapping(XmlPersistentType xmlPersistentType, XmlTypeMapping<? extends TypeMapping> oldMapping, XmlTypeMapping<? extends TypeMapping> newMapping); + void changeMapping(OrmPersistentType ormPersistentType, OrmTypeMapping<? extends AbstractTypeMapping> oldMapping, OrmTypeMapping<? extends AbstractTypeMapping> newMapping); // **************** updating *********************************************** - void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); - void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); // ************************************************************************* diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java index cd6e89f978..5b5c290853 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java @@ -7,15 +7,17 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; -public interface IXmlAttributeMappingProvider +public interface OrmAttributeMappingProvider { String key(); - XmlAttributeMapping<? extends AttributeMapping> buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent); + AbstractOrmAttributeMapping<? extends XmlAttributeMapping> buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java index 672b79c923..9461856b70 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java @@ -7,23 +7,28 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.context.base.IAbstractColumn; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.resource.orm.Column; +import org.eclipse.jpt.core.context.AbstractColumn; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.resource.orm.XmlColumn; -public interface IXmlColumn extends IColumn +public interface OrmColumn extends Column { Owner owner(); - /** + + void initializeFrom(Column oldColumn); + void initialize(XmlColumn column); + void update(XmlColumn column); + + /** * interface allowing columns to be used in multiple places * (e.g. basic mappings and attribute overrides) */ - interface Owner extends IAbstractColumn.Owner + interface Owner extends AbstractColumn.Owner { - Column columnResource(); + XmlColumn columnResource(); void addColumnResource(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java new file mode 100644 index 0000000000..b396b45e27 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumnMapping.java @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.context.orm; + +import org.eclipse.jpt.core.context.ColumnMapping; + + +public interface OrmColumnMapping extends ColumnMapping, OrmColumn.Owner +{ + + OrmColumn getColumn(); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java new file mode 100644 index 0000000000..907d7d6280 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java @@ -0,0 +1,66 @@ +/******************************************************************************* + * Copyright (c) 2008 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.core.context.orm; + +import java.util.ListIterator; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddable; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; + +public interface OrmPersistentType extends PersistentType +{ + String VIRTUAL_ATTRIBUTES_LIST = "virtualAttributesList"; + + @SuppressWarnings("unchecked") + ListIterator<OrmPersistentAttribute> attributes(); + + OrmPersistentAttribute attributeNamed(String attributeName); + + OrmPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName); + + void removeSpecifiedXmlPersistentAttribute(OrmPersistentAttribute xmlPersistentAttribute); + + ListIterator<OrmPersistentAttribute> specifiedAttributes(); + + int specifiedAttributesSize(); + + ListIterator<OrmPersistentAttribute> virtualAttributes(); + + int virtualAttributesSize(); + + OrmTypeMapping<? extends AbstractTypeMapping> getMapping(); + + void initialize(XmlEntity entity); + + void initialize(XmlMappedSuperclass mappedSuperclass); + + void initialize(XmlEmbeddable embeddable); + + void update(XmlEntity entity); + + void update(XmlMappedSuperclass mappedSuperclass); + + void update(XmlEmbeddable embeddable); + + boolean containsOffset(int textOffset); + + boolean isFor(String fullyQualifiedTypeName); + + void classChanged(String oldClass, String newClass); + + void setPersistentAttributeVirtual(OrmPersistentAttribute xmlPersistentAttribute, boolean virtual); + + public JavaPersistentType javaPersistentType(); + +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IOrmStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNodes.java index 866153de2b..35de318175 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IOrmStructureNodes.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmStructureNodes.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; -public interface IOrmStructureNodes +public interface OrmStructureNodes { String ENTITY_MAPPINGS_ID = diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java new file mode 100644 index 0000000000..0e0678bb2f --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java @@ -0,0 +1,60 @@ +package org.eclipse.jpt.core.context.orm; + +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; + +public interface OrmTypeMapping<E extends AbstractTypeMapping> extends TypeMapping +{ + String JAVA_PERSISTENT_TYPE_PROPERTY = "javaPersistentTypeProperty"; + + String getClass_(); + void setClass(String newClass); + String CLASS_PROPERTY = "classProperty"; + + AccessType getAccess(); + AccessType getDefaultAccess(); + String DEFAULT_ACCESS_PROPERTY = "defaultAccessProperty"; + + AccessType getSpecifiedAccess(); + void setSpecifiedAccess(AccessType newSpecifiedAccess); + String SPECIFIED_ACCESS_PROPERTY = "specifiedAccessProperty"; + + + boolean isMetadataComplete(); + Boolean getSpecifiedMetadataComplete(); + void setSpecifiedMetadataComplete(Boolean newSpecifiedMetadataComplete); + String SPECIFIED_METADATA_COMPLETE_PROPERTY = "specifiedMetadataCompleteProperty"; + + boolean isDefaultMetadataComplete(); + String DEFAULT_METADATA_COMPLETE_PROPERTY = "defaultMetadataCompleteProperty"; + + + /** + * type mappings are a sequence in the orm schema. We must keep + * the list of type mappings in the appropriate order so the wtp xml + * translators will write them to the xml in that order and they + * will adhere to the schema. + * + * Each concrete subclass of XmlTypeMapping must implement this + * method and return an int that matches it's order in the schema + * @return + */ + int xmlSequence(); + + void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); + + E addToResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); + + void initializeFrom(OrmTypeMapping<? extends AbstractTypeMapping> oldMapping); + + E typeMappingResource(); + + JavaPersistentType getJavaPersistentType(); + + TextRange selectionTextRange(); + + boolean containsOffset(int textOffset); +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java index 7bdb3e6847..c3ba58f41d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public interface IXmlTypeMappingProvider +public interface OrmTypeMappingProvider { String key(); - XmlTypeMapping<? extends TypeMapping> buildTypeMapping(IJpaBaseContextFactory factory, XmlPersistentType parent); + OrmTypeMapping<? extends AbstractTypeMapping> buildTypeMapping(JpaBaseContextFactory factory, OrmPersistentType parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java index 28facfc486..098ba8ba20 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXml.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java @@ -8,13 +8,13 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.OrmResource; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmResource; -public interface OrmXml extends IJpaContextNode, IJpaStructureNode +public interface OrmXml extends JpaContextNode, JpaStructureNode { // **************** persistence ******************************************* @@ -45,10 +45,10 @@ public interface OrmXml extends IJpaContextNode, IJpaStructureNode PersistenceUnitDefaults persistenceUnitDefaults(); /** - * Return the XmlPersistentType listed in this mapping file + * Return the OrmPersistentType listed in this mapping file * with the given fullyQualifiedTypeName. Return null if non exists. */ - XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName); + OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName); // **************** updating ********************************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitDefaults.java index 57f4d71ad7..409a788ebd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitDefaults.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.JpaContextNode; -public interface PersistenceUnitDefaults extends IJpaContextNode +public interface PersistenceUnitDefaults extends JpaContextNode { String getSchema(); @@ -33,8 +33,8 @@ public interface PersistenceUnitDefaults extends IJpaContextNode void setCascadePersist(boolean value); String CASCADE_PERSIST_PROPERTY = "cascadePersistProperty"; - void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); - void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitMetadata.java index 519756ef7c..e517e91810 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/PersistenceUnitMetadata.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.orm; +package org.eclipse.jpt.core.context.orm; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; +import org.eclipse.jpt.core.context.JpaContextNode; -public interface PersistenceUnitMetadata extends IJpaContextNode +public interface PersistenceUnitMetadata extends JpaContextNode { boolean isXmlMappingMetadataComplete(); void setXmlMappingMetadataComplete(boolean value); @@ -19,8 +19,8 @@ public interface PersistenceUnitMetadata extends IJpaContextNode PersistenceUnitDefaults getPersistenceUnitDefaults(); - void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); - void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); + void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java index 1ad434870b..5948b04708 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/ClassRef.java @@ -8,15 +8,15 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef; -public interface IClassRef extends IJpaContextNode, IJpaStructureNode +public interface ClassRef extends JpaContextNode, JpaStructureNode { /** * Return true if the IClassRef matches the fullyQualfiedTypeName @@ -60,7 +60,7 @@ public interface IClassRef extends IJpaContextNode, IJpaStructureNode * This can be null. * This is not settable by users of this API. */ - IJavaPersistentType getJavaPersistentType(); + JavaPersistentType getJavaPersistentType(); // **************** initialize/update ************************************** @@ -82,5 +82,5 @@ public interface IClassRef extends IJpaContextNode, IJpaStructureNode */ boolean containsOffset(int textOffset); - ITextRange validationTextRange(); + TextRange validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java index 1a9f728c8a..b3b0b02972 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IMappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java @@ -8,16 +8,16 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.orm.OrmXml; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef; -public interface IMappingFileRef extends IJpaContextNode, IJpaStructureNode +public interface MappingFileRef extends JpaContextNode, JpaStructureNode { /** * Return whether this mapping file ref is represented by an entry in the @@ -63,10 +63,10 @@ public interface IMappingFileRef extends IJpaContextNode, IJpaStructureNode PersistenceUnitDefaults persistenceUnitDefaults(); /** - * Return the XmlPersistentType listed in this mapping file + * Return the OrmPersistentType listed in this mapping file * with the given fullyQualifiedTypeName. Return null if non exists. */ - XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName); + OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName); /** * Return whether the text representation of this persistence unit contains diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java index 94ff37a08d..c618be0522 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistence.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Persistence.java @@ -8,14 +8,14 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.persistence.XmlPersistence; -public interface IPersistence extends IJpaContextNode, IJpaStructureNode +public interface Persistence extends JpaContextNode, JpaStructureNode { // **************** persistence units ************************************** @@ -28,7 +28,7 @@ public interface IPersistence extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of persistence units. * This will not be null. */ - ListIterator<IPersistenceUnit> persistenceUnits(); + ListIterator<PersistenceUnit> persistenceUnits(); /** * Return the size of the persistence unit list. @@ -40,18 +40,18 @@ public interface IPersistence extends IJpaContextNode, IJpaStructureNode * Add a persistence unit to the persistence node and return the object * representing it. */ - IPersistenceUnit addPersistenceUnit(); + PersistenceUnit addPersistenceUnit(); /** * Add a persistence unit to the persistence node at the specified index and * return the object representing it. */ - IPersistenceUnit addPersistenceUnit(int index); + PersistenceUnit addPersistenceUnit(int index); /** * Remove the persistence unit from the persistence node. */ - void removePersistenceUnit(IPersistenceUnit persistenceUnit); + void removePersistenceUnit(PersistenceUnit persistenceUnit); /** * Remove the persistence unit at the specified index from the persistence node. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceStructureNodes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceStructureNodes.java index 320fe8c1e5..9a8bea1d42 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceStructureNodes.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceStructureNodes.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; -public interface IPersistenceStructureNodes +public interface PersistenceStructureNodes { String PERSISTENCE_ID = diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java index e17d943b52..5d43f4d2d6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode +public interface PersistenceUnit extends JpaContextNode, JpaStructureNode { // **************** parent ************************************************* - IPersistence persistence(); + Persistence parent(); // **************** name *************************************************** @@ -165,7 +165,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * implied. * This will not be null. */ - ListIterator<IMappingFileRef> mappingFileRefs(); + ListIterator<MappingFileRef> mappingFileRefs(); /** * Return of mapping file refs, specified and implied. @@ -183,7 +183,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of specified mapping file refs. * This will not be null. */ - ListIterator<IMappingFileRef> specifiedMappingFileRefs(); + ListIterator<MappingFileRef> specifiedMappingFileRefs(); /** * Return of specified mapping file refs. @@ -194,18 +194,18 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Add a specified mapping file ref to the persistence unit and return the object * representing it. */ - IMappingFileRef addSpecifiedMappingFileRef(); + MappingFileRef addSpecifiedMappingFileRef(); /** * Add a specified mapping file ref to the persistence unit at the specified index and * return the object representing it. */ - IMappingFileRef addSpecifiedMappingFileRef(int index); + MappingFileRef addSpecifiedMappingFileRef(int index); /** * Remove the specified mapping file ref from the persistence unit. */ - void removeSpecifiedMappingFileRef(IMappingFileRef mappingFileRef); + void removeSpecifiedMappingFileRef(MappingFileRef mappingFileRef); /** * Remove the specified mapping file ref at the specified index from the persistence unit. @@ -224,12 +224,12 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return the current implied mapping file ref. * This may be null. */ - IMappingFileRef getImpliedMappingFileRef(); + MappingFileRef getImpliedMappingFileRef(); /** * Adds the implied mapping file ref */ - IMappingFileRef setImpliedMappingFileRef(); + MappingFileRef setImpliedMappingFileRef(); /** * Removes the implied mapping file ref @@ -243,7 +243,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of class refs, whether specified or implied. * This will not be null. */ - ListIterator<IClassRef> classRefs(); + ListIterator<ClassRef> classRefs(); /** * Return the number of specified and implied class refs. @@ -261,7 +261,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of specified class refs. * This will not be null. */ - ListIterator<IClassRef> specifiedClassRefs(); + ListIterator<ClassRef> specifiedClassRefs(); /** * Return the number of specified class refs. @@ -272,18 +272,18 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Add a specified class ref to the persistence unit and return the object * representing it. */ - IClassRef addSpecifiedClassRef(); + ClassRef addSpecifiedClassRef(); /** * Add a specified class ref to the persistence unit at the specified index and * return the object representing it. */ - IClassRef addSpecifiedClassRef(int index); + ClassRef addSpecifiedClassRef(int index); /** * Remove the specified class ref from the persistence unit. */ - void removeSpecifiedClassRef(IClassRef classRef); + void removeSpecifiedClassRef(ClassRef classRef); /** * Remove the specified class ref at the specified index from the persistence unit. @@ -302,7 +302,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of implied class refs. * This will not be null. */ - ListIterator<IClassRef> impliedClassRefs(); + ListIterator<ClassRef> impliedClassRefs(); /** * Return the number of implied class refs. @@ -313,18 +313,18 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Add an implied class ref to the persistence unit and return the object * representing it. */ - IClassRef addImpliedClassRef(String className); + ClassRef addImpliedClassRef(String className); /** * Add an implied class ref to the persistence unit at the specified index and * return the object representing it. */ - IClassRef addImpliedClassRef(int index, String className); + ClassRef addImpliedClassRef(int index, String className); /** * Remove the implied class ref from the persistence unit. */ - void removeImpliedClassRef(IClassRef classRef); + void removeImpliedClassRef(ClassRef classRef); /** * Remove the implied class ref at the specified index from the persistence unit. @@ -386,7 +386,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return an iterator on the list of properties. * This will not be null. */ - ListIterator<IProperty> properties(); + ListIterator<Property> properties(); int propertiesSize(); @@ -394,11 +394,11 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Add a property to the persistence unit and return the object * representing it. */ - IProperty addProperty(); + Property addProperty(); - IProperty getProperty(String key); + Property getProperty(String key); - IProperty getProperty(String key, String value); + Property getProperty(String key, String value); void putProperty(String key, String value, boolean allowDuplicates); @@ -409,7 +409,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode /** * Remove the property from the persistence unit. */ - void removeProperty(IProperty property); + void removeProperty(Property property); /** * Remove the property with the given key from the persistence unit. @@ -450,7 +450,7 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode * Return the IPersistentType specified in this PersistenceUnit with the given * fully qualified type name */ - IPersistentType persistentType(String fullyQualifiedTypeName); + PersistentType persistentType(String fullyQualifiedTypeName); /** * Return whether the text representation of this persistence unit contains @@ -458,5 +458,5 @@ public interface IPersistenceUnit extends IJpaContextNode, IJpaStructureNode */ boolean containsOffset(int textOffset); - ITextRange validationTextRange(); + TextRange validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceUnitTransactionType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitTransactionType.java index ce2d28e7a8..a8ad2e44dd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceUnitTransactionType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnitTransactionType.java @@ -8,7 +8,7 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; public enum PersistenceUnitTransactionType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java index 21f895b045..0441d4e145 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IPersistenceXml.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceXml.java @@ -8,13 +8,13 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResource; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.persistence.PersistenceResource; -public interface IPersistenceXml extends IJpaContextNode, IJpaStructureNode +public interface PersistenceXml extends JpaContextNode, JpaStructureNode { // **************** persistence ******************************************* @@ -27,14 +27,14 @@ public interface IPersistenceXml extends IJpaContextNode, IJpaStructureNode * Return the content represented by the root of the persistence.xml file. * This may be null. */ - IPersistence getPersistence(); + Persistence getPersistence(); /** * Add a persistence node to the persistence.xml file and return the object * representing it. * Throws {@link IllegalStateException} if a persistence node already exists. */ - IPersistence addPersistence(); + Persistence addPersistence(); /** * Remove the persistence node from the persistence.xml file. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Property.java index 1313abdf01..6090e1acb1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/IProperty.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/Property.java @@ -8,12 +8,12 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.persistence; +package org.eclipse.jpt.core.context.persistence; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperty; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.persistence.XmlProperty; -public interface IProperty extends IJpaContextNode +public interface Property extends JpaContextNode { // **************** name *************************************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java index 3216115fbf..e00fec6eb2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java @@ -17,6 +17,10 @@ import java.util.Set; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Platform; import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; @@ -27,15 +31,15 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; /** * */ -public abstract class JpaNode +public abstract class AbstractJpaNode extends AbstractNode - implements IJpaNode + implements JpaNode { // ********** constructor ********** - protected JpaNode(IJpaNode parent) { + protected AbstractJpaNode(JpaNode parent) { super(parent); } @@ -54,7 +58,7 @@ public abstract class JpaNode return parent().resource(); } - public IJpaProject jpaProject() { + public JpaProject jpaProject() { return this.root(); } @@ -66,31 +70,31 @@ public abstract class JpaNode // ********** overrides ********** @Override - public IJpaNode parent() { - return (IJpaNode) super.parent(); + public JpaNode parent() { + return (JpaNode) super.parent(); } @Override - public IJpaProject root() { - return (IJpaProject) super.root(); + public JpaProject root() { + return (JpaProject) super.root(); } // ********** convenience methods ********** - public Iterator<IJpaNode> jpaChildren() { - return new TransformationIterator<Node, IJpaNode>(this.children()) { + public Iterator<JpaNode> jpaChildren() { + return new TransformationIterator<Node, JpaNode>(this.children()) { @Override - protected IJpaNode transform(Node next) { - return (IJpaNode) next; + protected JpaNode transform(Node next) { + return (JpaNode) next; } }; } - protected IJpaPlatform jpaPlatform() { + protected JpaPlatform jpaPlatform() { return this.jpaProject().jpaPlatform(); } - protected IJpaFactory jpaFactory() { + protected JpaFactory jpaFactory() { return this.jpaPlatform().jpaFactory(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java index 0b62113177..de1197af06 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java @@ -13,24 +13,26 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.model.AbstractModel; public abstract class AbstractResourceModel extends AbstractModel - implements IResourceModel + implements ResourceModel { - private final List<IJpaStructureNode> rootStructureNodes; + private final List<JpaStructureNode> rootStructureNodes; protected AbstractResourceModel() { - this.rootStructureNodes = new ArrayList<IJpaStructureNode>(); + this.rootStructureNodes = new ArrayList<JpaStructureNode>(); } public abstract Object resource(); - public ListIterator<IJpaStructureNode> rootStructureNodes() { - return new CloneListIterator<IJpaStructureNode>(this.rootStructureNodes); + public ListIterator<JpaStructureNode> rootStructureNodes() { + return new CloneListIterator<JpaStructureNode>(this.rootStructureNodes); } public int rootStructureNodesSize() { @@ -40,17 +42,17 @@ public abstract class AbstractResourceModel /** * Add the new node to the end of the list. */ - public void addRootStructureNode(IJpaStructureNode structureNode) { + public void addRootStructureNode(JpaStructureNode structureNode) { this.addRootStructureNode(this.rootStructureNodes.size(), structureNode); } - public void addRootStructureNode(int index, IJpaStructureNode structureNode) { + public void addRootStructureNode(int index, JpaStructureNode structureNode) { if ( ! this.rootStructureNodes.contains(structureNode)) { this.addItemToList(index, structureNode, this.rootStructureNodes, ROOT_STRUCTURE_NODES_LIST); } } - public void removeRootStructureNode(IJpaStructureNode structureNode) { + public void removeRootStructureNode(JpaStructureNode structureNode) { this.removeItemFromList(structureNode, this.rootStructureNodes, ROOT_STRUCTURE_NODES_LIST); } @@ -58,10 +60,10 @@ public abstract class AbstractResourceModel this.removeItemFromList(index, this.rootStructureNodes, ROOT_STRUCTURE_NODES_LIST); } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { synchronized (this.rootStructureNodes) { - for (IJpaStructureNode rootNode : this.rootStructureNodes) { - IJpaStructureNode node = rootNode.structureNode(textOffset); + for (JpaStructureNode rootNode : this.rootStructureNodes) { + JpaStructureNode node = rootNode.structureNode(textOffset); if (node != null) { return node; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java index 17ab50273a..71f52224ac 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java @@ -12,18 +12,18 @@ package org.eclipse.jpt.core.internal; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.utility.internal.StringTools; /** * This updater will update the project in a job that executes in a separate * thread and allows calls to #update() to return immediately. */ -public class AsynchronousJpaProjectUpdater implements IJpaProject.Updater { - protected final IJpaProject jpaProject; +public class AsynchronousJpaProjectUpdater implements JpaProject.Updater { + protected final JpaProject jpaProject; protected final UpdateJob job; - public AsynchronousJpaProjectUpdater(IJpaProject jpaProject) { + public AsynchronousJpaProjectUpdater(JpaProject jpaProject) { super(); this.jpaProject = jpaProject; this.job = this.buildJob(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java index c0fcb06082..5d910d77b5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaDataSource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java @@ -9,6 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal; +import org.eclipse.jpt.core.JpaDataSource; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionListener; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; @@ -20,9 +22,9 @@ import org.eclipse.jpt.db.internal.Table; /** * */ -public class JpaDataSource - extends JpaNode - implements IJpaDataSource +public class GenericJpaDataSource + extends AbstractJpaNode + implements JpaDataSource { /** * cache the connection profile name so we can detect when @@ -49,7 +51,7 @@ public class JpaDataSource // ********** constructor/initialization ********** - public JpaDataSource(IJpaProject jpaProject, String connectionProfileName) { + public GenericJpaDataSource(JpaProject jpaProject, String connectionProfileName) { super(jpaProject); this.profileListener = this.buildProfileListener(); @@ -140,15 +142,15 @@ public class JpaDataSource // possible name change public void profileChanged(ConnectionProfile profile) { - if (profile == JpaDataSource.this.connectionProfile) { - JpaDataSource.this.setConnectionProfileName(profile.getName()); + if (profile == GenericJpaDataSource.this.connectionProfile) { + GenericJpaDataSource.this.setConnectionProfileName(profile.getName()); } } // profile added or removed public void profileReplaced(ConnectionProfile oldProfile, ConnectionProfile newProfile) { - if (oldProfile == JpaDataSource.this.connectionProfile) { - JpaDataSource.this.setConnectionProfile(newProfile); + if (oldProfile == GenericJpaDataSource.this.connectionProfile) { + GenericJpaDataSource.this.setConnectionProfile(newProfile); } } @@ -165,7 +167,7 @@ public class JpaDataSource } public void opened(ConnectionProfile profile) { - JpaDataSource.this.jpaProject().update(); + GenericJpaDataSource.this.jpaProject().update(); } public void aboutToClose(ConnectionProfile profile) { @@ -177,7 +179,7 @@ public class JpaDataSource } public void closed(ConnectionProfile profile) { - JpaDataSource.this.jpaProject().update(); + GenericJpaDataSource.this.jpaProject().update(); } public void modified(ConnectionProfile profile) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java index c5b880a202..6b9ae61a56 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaFile.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java @@ -11,8 +11,12 @@ package org.eclipse.jpt.core.internal; import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.ElementChangedEvent; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; -public class JpaFile extends JpaNode implements IJpaFile +public class GenericJpaFile extends AbstractJpaNode implements JpaFile { /** * The IFile associated with this JPA file @@ -22,10 +26,10 @@ public class JpaFile extends JpaNode implements IJpaFile /** * The resource model represented by this JPA file */ - protected final IResourceModel resourceModel; + protected final ResourceModel resourceModel; - public JpaFile(IJpaProject jpaProject, IFile file, IResourceModel resourceModel) { + public GenericJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel) { super(jpaProject); this.file = file; this.resourceModel = resourceModel; @@ -35,11 +39,11 @@ public class JpaFile extends JpaNode implements IJpaFile return file; } - public IResourceModel getResourceModel() { + public ResourceModel getResourceModel() { return resourceModel; } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { return resourceModel.structureNode(textOffset); } @@ -55,11 +59,11 @@ public class JpaFile extends JpaNode implements IJpaFile getResourceModel().javaElementChanged(event); } - public void fileAdded(IJpaFile jpaFile) { + public void fileAdded(JpaFile jpaFile) { getResourceModel().resolveTypes(); } - public void fileRemoved(IJpaFile jpaFile) { + public void fileRemoved(JpaFile jpaFile) { getResourceModel().resolveTypes(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java index 01c9d66d0e..ce522cb5ce 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java @@ -27,14 +27,18 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.core.ElementChangedEvent; -import org.eclipse.jpt.core.internal.IJpaProject.Config; -import org.eclipse.jpt.core.internal.facet.IJpaFacetDataModelProperties; -import org.eclipse.jpt.core.internal.resource.orm.EntityMappings; -import org.eclipse.jpt.core.internal.resource.orm.OrmArtifactEdit; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.OrmResource; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceArtifactEdit; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResource; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaModel; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.JpaProject.Config; +import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; +import org.eclipse.jpt.core.resource.orm.EntityMappings; +import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmResource; +import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit; +import org.eclipse.jpt.core.resource.persistence.PersistenceResource; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.AbstractModel; @@ -49,9 +53,9 @@ import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActionEvent * their associated JPA projects when necessary. Other than performance, * this should be transparent to clients. */ -public class JpaModel +public class GenericJpaModel extends AbstractModel - implements IJpaModel + implements JpaModel { /** maintain a list of all the current JPA projects */ @@ -65,7 +69,7 @@ public class JpaModel * current Eclipse projects with JPA facets. * The JPA model can only be instantiated by the JPA model manager. */ - JpaModel() throws CoreException { + GenericJpaModel() throws CoreException { super(); ResourcesPlugin.getWorkspace().getRoot().accept(new ResourceProxyVisitor(), IResource.NONE); } @@ -77,7 +81,7 @@ public class JpaModel * This will trigger the instantiation of the JPA project associated with the * specified Eclipse project. */ - public synchronized IJpaProject jpaProject(IProject project) throws CoreException { + public synchronized JpaProject jpaProject(IProject project) throws CoreException { return this.jpaProjectHolder(project).jpaProject(); } @@ -92,9 +96,9 @@ public class JpaModel /** * This will trigger the instantiation of all the JPA projects. */ - public synchronized Iterator<IJpaProject> jpaProjects() throws CoreException { + public synchronized Iterator<JpaProject> jpaProjects() throws CoreException { // force the CoreException to occur here (instead of later, in Iterator#next()) - ArrayList<IJpaProject> jpaProjects = new ArrayList<IJpaProject>(this.jpaProjectHolders.size()); + ArrayList<JpaProject> jpaProjects = new ArrayList<JpaProject>(this.jpaProjectHolders.size()); for (IJpaProjectHolder holder : this.jpaProjectHolders) { jpaProjects.add(holder.jpaProject()); } @@ -112,8 +116,8 @@ public class JpaModel * This will trigger the instantiation of the JPA project associated with the * specified file. */ - public synchronized IJpaFile jpaFile(IFile file) throws CoreException { - IJpaProject jpaProject = this.jpaProject(file.getProject()); + public synchronized JpaFile jpaFile(IFile file) throws CoreException { + JpaProject jpaProject = this.jpaProject(file.getProject()); return (jpaProject == null) ? null : jpaProject.jpaFile(file); } @@ -132,7 +136,7 @@ public class JpaModel return NullJpaProjectHolder.instance(); } - private IJpaProject.Config buildJpaProjectConfig(IProject project) { + private JpaProject.Config buildJpaProjectConfig(IProject project) { SimpleJpaProjectConfig config = new SimpleJpaProjectConfig(); config.setProject(project); config.setJpaPlatform(JptCorePlugin.jpaPlatform(project)); @@ -150,7 +154,7 @@ public class JpaModel * JPA projects can only be added by the JPA model manager. * The JPA project will only be instantiated later, on demand. */ - private void addJpaProject(IJpaProject.Config config) { + private void addJpaProject(JpaProject.Config config) { dumpStackTrace(); // figure out exactly when JPA projects are added this.jpaProjectHolders.add(this.jpaProjectHolder(config.project()).buildJpaProjectHolder(this, config)); } @@ -218,7 +222,7 @@ public class JpaModel IProject project = event.getProject().getProject(); IDataModel dataModel = (IDataModel) event.getActionConfig(); - boolean buildOrmXml = dataModel.getBooleanProperty(IJpaFacetDataModelProperties.CREATE_ORM_XML); + boolean buildOrmXml = dataModel.getBooleanProperty(JpaFacetDataModelProperties.CREATE_ORM_XML); this.buildProjectXmlJob(project, buildOrmXml).schedule(); // assume(?) this is the first event to indicate we need to add the JPA project to the JPA model @@ -229,7 +233,7 @@ public class JpaModel Job job = new Job("Create Project XML files") { @Override protected IStatus run(IProgressMonitor monitor) { - JpaModel.this.createProjectXml(project, buildOrmXml); + GenericJpaModel.this.createProjectXml(project, buildOrmXml); return Status.OK_STATUS; } }; @@ -338,7 +342,7 @@ public class JpaModel * called by the JPA project holder when the JPA project is actually * instantiated */ - /* private */ void jpaProjectBuilt(IJpaProject jpaProject) { + /* private */ void jpaProjectBuilt(JpaProject jpaProject) { this.fireItemAdded(JPA_PROJECTS_COLLECTION, jpaProject); } @@ -346,7 +350,7 @@ public class JpaModel * called by the JPA project holder if the JPA project has been * instantiated and we need to remove it */ - /* private */ void jpaProjectRemoved(IJpaProject jpaProject) { + /* private */ void jpaProjectRemoved(JpaProject jpaProject) { this.fireItemRemoved(JPA_PROJECTS_COLLECTION, jpaProject); } @@ -364,13 +368,13 @@ public class JpaModel boolean holdsJpaProjectFor(IProject project); - IJpaProject jpaProject() throws CoreException; + JpaProject jpaProject() throws CoreException; void synchronizeJpaFiles(IResourceDelta delta) throws CoreException; void javaElementChanged(ElementChangedEvent event); - IJpaProjectHolder buildJpaProjectHolder(JpaModel jpaModel, IJpaProject.Config config); + IJpaProjectHolder buildJpaProjectHolder(GenericJpaModel jpaModel, JpaProject.Config config); void remove(); @@ -392,7 +396,7 @@ public class JpaModel return false; } - public IJpaProject jpaProject() throws CoreException { + public JpaProject jpaProject() throws CoreException { return null; } @@ -404,7 +408,7 @@ public class JpaModel // do nothing } - public IJpaProjectHolder buildJpaProjectHolder(JpaModel jpaModel, Config config) { + public IJpaProjectHolder buildJpaProjectHolder(GenericJpaModel jpaModel, Config config) { return new JpaProjectHolder(jpaModel, config); } @@ -422,11 +426,11 @@ public class JpaModel * Pair a JPA project config with its lazily-initialized JPA project. */ private static class JpaProjectHolder implements IJpaProjectHolder { - private final JpaModel jpaModel; - private final IJpaProject.Config config; - private IJpaProject jpaProject; + private final GenericJpaModel jpaModel; + private final JpaProject.Config config; + private JpaProject jpaProject; - JpaProjectHolder(JpaModel jpaModel, IJpaProject.Config config) { + JpaProjectHolder(GenericJpaModel jpaModel, JpaProject.Config config) { super(); this.jpaModel = jpaModel; this.config = config; @@ -436,7 +440,7 @@ public class JpaModel return this.config.project().equals(project); } - public IJpaProject jpaProject() throws CoreException { + public JpaProject jpaProject() throws CoreException { if (this.jpaProject == null) { this.jpaProject = this.buildJpaProject(); // notify listeners of the JPA model @@ -445,8 +449,8 @@ public class JpaModel return this.jpaProject; } - private IJpaProject buildJpaProject() throws CoreException { - return this.config.jpaPlatform().jpaFactory().createJpaProject(this.config); + private JpaProject buildJpaProject() throws CoreException { + return this.config.jpaPlatform().jpaFactory().buildJpaProject(this.config); } public void synchronizeJpaFiles(IResourceDelta delta) throws CoreException { @@ -461,7 +465,7 @@ public class JpaModel } } - public IJpaProjectHolder buildJpaProjectHolder(JpaModel jm, Config c) { + public IJpaProjectHolder buildJpaProjectHolder(GenericJpaModel jm, Config c) { throw new IllegalArgumentException(c.project().getName()); } @@ -509,7 +513,7 @@ public class JpaModel if (resourceProxy.isAccessible()) { // the project exists and is open IProject project = (IProject) resourceProxy.requestResource(); if (JptCorePlugin.projectHasJpaFacet(project)) { - JpaModel.this.addJpaProject(project); + GenericJpaModel.this.addJpaProject(project); } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java index 0b9f5d7f9c..88f3899974 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java @@ -32,11 +32,19 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.ContextModel; +import org.eclipse.jpt.core.JpaDataSource; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.ResourceModelListener; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; import org.eclipse.jpt.core.internal.resource.java.JpaCompilationUnitResource; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -53,7 +61,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; /** * */ -public class JpaProject extends JpaNode implements IJpaProject { +public class GenericJpaProject extends AbstractJpaNode implements JpaProject { /** * The Eclipse project corresponding to the JPA project. @@ -64,12 +72,12 @@ public class JpaProject extends JpaNode implements IJpaProject { * The vendor-specific JPA platform that builds the JPA project * and all its contents. */ - protected final IJpaPlatform jpaPlatform; + protected final JpaPlatform jpaPlatform; /** * The data source that wraps the DTP model. */ - protected final IJpaDataSource dataSource; + protected final JpaDataSource dataSource; /** * Flag indicating whether the project should "discover" annotated @@ -81,13 +89,13 @@ public class JpaProject extends JpaNode implements IJpaProject { /** * The JPA files associated with the JPA project. */ - protected final Vector<IJpaFile> jpaFiles; + protected final Vector<JpaFile> jpaFiles; /** * The model representing the collated resources associated * with the JPA project. */ - protected IContextModel contextModel; + protected ContextModel contextModel; /** * The visitor passed to resource deltas. @@ -117,7 +125,7 @@ public class JpaProject extends JpaNode implements IJpaProject { * Resource models notify this listener when they change. A project update * should occur any time a resource model changes. */ - protected IResourceModelListener resourceModelListener; + protected ResourceModelListener resourceModelListener; // ********** constructor/initialization ********** @@ -125,14 +133,14 @@ public class JpaProject extends JpaNode implements IJpaProject { /** * The project and JPA platform are required. */ - public JpaProject(IJpaProject.Config config) throws CoreException { + public GenericJpaProject(JpaProject.Config config) throws CoreException { super(null); // JPA project is the root of the containment tree if ((config.project() == null) || (config.jpaPlatform() == null)) { throw new NullPointerException(); } this.project = config.project(); this.jpaPlatform = config.jpaPlatform(); - this.dataSource = this.jpaFactory().createJpaDataSource(this, config.connectionProfileName()); + this.dataSource = this.jpaFactory().buildJpaDataSource(this, config.connectionProfileName()); this.discoversAnnotatedClasses = config.discoverAnnotatedClasses(); this.jpaFiles = this.buildEmptyJpaFiles(); @@ -163,8 +171,8 @@ public class JpaProject extends JpaNode implements IJpaProject { return project(); } - protected Vector<IJpaFile> buildEmptyJpaFiles() { - return new Vector<IJpaFile>(); + protected Vector<JpaFile> buildEmptyJpaFiles() { + return new Vector<JpaFile>(); } protected IResourceDeltaVisitor buildResourceDeltaVisitor() { @@ -183,15 +191,15 @@ public class JpaProject extends JpaNode implements IJpaProject { return new AsynchronousJpaProjectUpdater(this); } - protected IResourceModelListener buildResourceModelListener() { - return new ResourceModelListener(); + protected ResourceModelListener buildResourceModelListener() { + return new DefaultResourceModelListener(); } protected IResourceProxyVisitor buildInitialResourceProxyVisitor() { return new InitialResourceProxyVisitor(); } - protected IContextModel buildContextModel() { + protected ContextModel buildContextModel() { return this.jpaFactory().buildContextModel(this); } @@ -208,7 +216,7 @@ public class JpaProject extends JpaNode implements IJpaProject { case IResource.FOLDER : return true; // visit children case IResource.FILE : - JpaProject.this.addJpaFileInternal((IFile) resource.requestResource()); + GenericJpaProject.this.addJpaFileInternal((IFile) resource.requestResource()); return false; // no children default : return false; // no children @@ -220,7 +228,7 @@ public class JpaProject extends JpaNode implements IJpaProject { // ********** general queries ********** @Override - public IJpaProject root() { + public JpaProject root() { return this; } @@ -237,11 +245,11 @@ public class JpaProject extends JpaNode implements IJpaProject { } @Override - public IJpaPlatform jpaPlatform() { + public JpaPlatform jpaPlatform() { return this.jpaPlatform; } - public IJpaDataSource dataSource() { + public JpaDataSource dataSource() { return this.dataSource; } @@ -280,17 +288,17 @@ public class JpaProject extends JpaNode implements IJpaProject { // **************** JPA files ********************************************** - public Iterator<IJpaFile> jpaFiles() { - return new CloneIterator<IJpaFile>(this.jpaFiles); // read-only + public Iterator<JpaFile> jpaFiles() { + return new CloneIterator<JpaFile>(this.jpaFiles); // read-only } public int jpaFilesSize() { return this.jpaFiles.size(); } - public IJpaFile jpaFile(IFile file) { + public JpaFile jpaFile(IFile file) { synchronized (this.jpaFiles) { - for (IJpaFile jpaFile : this.jpaFiles) { + for (JpaFile jpaFile : this.jpaFiles) { if (jpaFile.getFile().equals(file)) { return jpaFile; } @@ -299,10 +307,10 @@ public class JpaProject extends JpaNode implements IJpaProject { return null; } - public Iterator<IJpaFile> jpaFiles(final String resourceType) { - return new FilteringIterator<IJpaFile, IJpaFile>(this.jpaFiles()) { + public Iterator<JpaFile> jpaFiles(final String resourceType) { + return new FilteringIterator<JpaFile, JpaFile>(this.jpaFiles()) { @Override - protected boolean accept(IJpaFile o) { + protected boolean accept(JpaFile o) { return o.getResourceType().equals(resourceType); } }; @@ -312,10 +320,10 @@ public class JpaProject extends JpaNode implements IJpaProject { * Add a JPA file for the specified file, if appropriate. */ protected void addJpaFile(IFile file) { - IJpaFile jpaFile = this.addJpaFileInternal(file); + JpaFile jpaFile = this.addJpaFileInternal(file); if (jpaFile != null) { this.fireItemAdded(JPA_FILES_COLLECTION, jpaFile); - for (Iterator<IJpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { + for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { stream.next().fileAdded(jpaFile); } } @@ -326,8 +334,8 @@ public class JpaProject extends JpaNode implements IJpaProject { * an event; useful during construction. * Return the new JPA file, null if it was not created. */ - protected IJpaFile addJpaFileInternal(IFile file) { - IJpaFile jpaFile = this.jpaPlatform.buildJpaFile(this, file); + protected JpaFile addJpaFileInternal(IFile file) { + JpaFile jpaFile = this.jpaPlatform.buildJpaFile(this, file); if (jpaFile == null) { return null; } @@ -339,12 +347,12 @@ public class JpaProject extends JpaNode implements IJpaProject { /** * Remove the specified JPA file and dispose it. */ - protected void removeJpaFile(IJpaFile jpaFile) { + protected void removeJpaFile(JpaFile jpaFile) { jpaFile.getResourceModel().removeResourceModelChangeListener(this.resourceModelListener); if ( ! this.removeItemFromCollection(jpaFile, this.jpaFiles, JPA_FILES_COLLECTION)) { throw new IllegalArgumentException("JPA file: " + jpaFile.getFile().getName()); } - for (Iterator<IJpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { + for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { stream.next().fileRemoved(jpaFile); } jpaFile.dispose(); @@ -357,7 +365,7 @@ public class JpaProject extends JpaNode implements IJpaProject { // ********** context model ********** - public IContextModel contextModel() { + public ContextModel contextModel() { return this.contextModel; } @@ -366,9 +374,9 @@ public class JpaProject extends JpaNode implements IJpaProject { public Iterator<IType> annotatedClasses() { return new FilteringIterator<IType, IType>( - new TransformationIterator<JavaPersistentTypeResource, IType>(annotatedJavaPersistentTypes()) { + new TransformationIterator<JavaResourcePersistentType, IType>(annotatedJavaPersistentTypes()) { @Override - protected IType transform(JavaPersistentTypeResource next) { + protected IType transform(JavaResourcePersistentType next) { try { return javaProject().findType(next.getQualifiedName(), new NullProgressMonitor()); } @@ -384,37 +392,37 @@ public class JpaProject extends JpaNode implements IJpaProject { }; } - protected Iterator<JavaPersistentTypeResource> annotatedJavaPersistentTypes() { - return new FilteringIterator<JavaPersistentTypeResource, JavaPersistentTypeResource>( - new TransformationIterator<JpaCompilationUnitResource, JavaPersistentTypeResource>(jpaCompilationUnitResources()) { + protected Iterator<JavaResourcePersistentType> annotatedJavaPersistentTypes() { + return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>( + new TransformationIterator<JpaCompilationUnitResource, JavaResourcePersistentType>(jpaCompilationUnitResources()) { @Override - protected JavaPersistentTypeResource transform(JpaCompilationUnitResource next) { + protected JavaResourcePersistentType transform(JpaCompilationUnitResource next) { return next.getPersistentType(); } }) { @Override - protected boolean accept(JavaPersistentTypeResource o) { + protected boolean accept(JavaResourcePersistentType o) { return o.isPersisted(); } }; } - public Iterator<IJpaFile> javaJpaFiles() { - return this.jpaFiles(IResourceModel.JAVA_RESOURCE_TYPE); + public Iterator<JpaFile> javaJpaFiles() { + return this.jpaFiles(ResourceModel.JAVA_RESOURCE_TYPE); } protected Iterator<JpaCompilationUnitResource> jpaCompilationUnitResources() { - return new TransformationIterator<IJpaFile, JpaCompilationUnitResource>(this.javaJpaFiles()) { + return new TransformationIterator<JpaFile, JpaCompilationUnitResource>(this.javaJpaFiles()) { @Override - protected JpaCompilationUnitResource transform(IJpaFile jpaFile) { + protected JpaCompilationUnitResource transform(JpaFile jpaFile) { return ((JavaResourceModel) jpaFile.getResourceModel()).resource(); } }; } - public JavaPersistentTypeResource javaPersistentTypeResource(String typeName) { + public JavaResourcePersistentType javaPersistentTypeResource(String typeName) { for (JpaCompilationUnitResource jpCompilationUnitResource : CollectionTools.iterable(this.jpaCompilationUnitResources())) { - JavaPersistentTypeResource jptr = jpCompilationUnitResource.javaPersistentTypeResource(typeName); + JavaResourcePersistentType jptr = jpCompilationUnitResource.javaPersistentTypeResource(typeName); if (jptr != null) { return jptr; } @@ -426,7 +434,7 @@ public class JpaProject extends JpaNode implements IJpaProject { // ********** Java change ********** public void javaElementChanged(ElementChangedEvent event) { - for (Iterator<IJpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { + for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { stream.next().javaElementChanged(event); } } @@ -474,9 +482,9 @@ public class JpaProject extends JpaNode implements IJpaProject { protected void addNoConnectionMessage(List<IMessage> messages) { if (! this.dataSource().hasAConnection()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, - IJpaValidationMessages.PROJECT_NO_CONNECTION, + JpaValidationMessages.PROJECT_NO_CONNECTION, this) ); okToProceedForConnectionValidation = false; @@ -486,9 +494,9 @@ public class JpaProject extends JpaNode implements IJpaProject { protected void addInactiveConnectionMessage(List<IMessage> messages) { if (okToProceedForConnectionValidation && ! this.dataSource().isConnected()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, - IJpaValidationMessages.PROJECT_INACTIVE_CONNECTION, + JpaValidationMessages.PROJECT_INACTIVE_CONNECTION, new String[] {this.dataSource().connectionProfileName()}, this) ); @@ -529,7 +537,7 @@ public class JpaProject extends JpaNode implements IJpaProject { public void dispose() { this.updater.dispose(); // use clone iterator while deleting JPA files - for (Iterator<IJpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { + for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { this.removeJpaFile(stream.next()); } this.dataSource.dispose(); @@ -538,12 +546,12 @@ public class JpaProject extends JpaNode implements IJpaProject { // ********** resource model listener ********** - protected class ResourceModelListener implements IResourceModelListener { - protected ResourceModelListener() { + protected class DefaultResourceModelListener implements ResourceModelListener { + protected DefaultResourceModelListener() { super(); } public void resourceModelChanged() { - JpaProject.this.update(); + GenericJpaProject.this.update(); } } @@ -565,7 +573,7 @@ public class JpaProject extends JpaNode implements IJpaProject { } break; case IResourceDelta.REMOVED : - IJpaFile jpaFile = this.jpaFile(file); + JpaFile jpaFile = this.jpaFile(file); if (jpaFile != null) { this.removeJpaFile(jpaFile); } @@ -594,7 +602,7 @@ public class JpaProject extends JpaNode implements IJpaProject { case IResource.FOLDER : return true; // visit children case IResource.FILE : - JpaProject.this.synchronizeJpaFiles((IFile) res, delta.getKind()); + GenericJpaProject.this.synchronizeJpaFiles((IFile) res, delta.getKind()); return false; // no children default : return false; // no children @@ -628,7 +636,7 @@ public class JpaProject extends JpaNode implements IJpaProject { super(); } public CommandExecutor commandExecutor() { - return JpaProject.this.threadLocalModifySharedDocumentCommandExecutor(); + return GenericJpaProject.this.threadLocalModifySharedDocumentCommandExecutor(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaModelObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaModelObject.java deleted file mode 100644 index eba02cd988..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaModelObject.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal; - -public interface IJpaModelObject -{ - Object getParent(); -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java deleted file mode 100644 index 7ca4796b38..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/IJpaPlatform.java +++ /dev/null @@ -1,148 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal; - -import java.util.List; -import org.eclipse.core.resources.IFile; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaTypeMapping; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; - -/** - * This interface is to be implemented by a JPA vendor to provide extensions to - * the core JPA model. The core JPA model will provide functionality for JPA - * spec annotations in java, persistence.xml and (orm.xml) mapping files. - * The org.eclipse.jpt.core.genericPlatform extension supplies - * resource models for those file types. As another vendor option you - * will have to supply those resource models as well or different ones - * as necessary. - * - * See the org.eclipse.jpt.core.jpaPlatform extension point - */ -public interface IJpaPlatform -{ - /** - * Get the ID for this platform - */ - String getId(); - - /** - * Set the ID for this platform - * - * ************* - * * IMPORTANT * For INTERNAL use only!! - * ************* - */ - void setId(String theId); - - - // **************** Model construction / updating ************************** - - /** - * Construct a JPA file for the specified file, to be added to the specified - * JPA project. (Defer to the factory for actual object creation.) - * Return null if unable to create the JPA file (e.g. the content type is - * unrecognized). - */ - IJpaFile buildJpaFile(IJpaProject jpaProject, IFile file); - - /** - * Return a factory responsible for creating core (e.g. IJpaProject), resource - * (e.g. PersistenceResource), and context (e.g. IPersistenceUnit) model - * objects - */ - IJpaFactory jpaFactory(); - - - // **************** Java annotation support ******************************** - - /** - * Return an annotation provider responsible for determining what annotations - * are supported and constructing java resource model objects - */ - IJpaAnnotationProvider annotationProvider(); - - - // **************** Java type mapping support ******************************** - - IJavaTypeMapping createJavaTypeMappingFromMappingKey(String typeMappingKey, IJavaPersistentType parent); - - IJavaTypeMapping createJavaTypeMappingFromAnnotation(String mappingAnnotationName, IJavaPersistentType parent); - - // **************** Java attribute mapping support ******************************** - - IJavaAttributeMapping createJavaAttributeMappingFromMappingKey(String attributeMappingKey, IJavaPersistentAttribute parent); - - IJavaAttributeMapping createJavaAttributeMappingFromAnnotation(String mappingAnnotationName, IJavaPersistentAttribute parent); - - IJavaAttributeMapping createDefaultJavaAttributeMapping(IJavaPersistentAttribute parent); - - String defaultJavaAttributeMappingKey(IJavaPersistentAttribute persistentAttribute); - - // ************************************************************************* - - /** - * Adds validation messages to the growing list of messages for a given project - */ - void addToMessages(IJpaProject project, List<IMessage> messages); - - - // ********** XmlPersistence Unit ******************************************** - // boolean containsPersistenceUnitNamed(String name); - // - // XmlPersistenceUnit persistenceUnitNamed(String name); - // - // Iterator<XmlPersistenceUnit> persistenceUnits(); - // - // int persistenceUnitSize(); - // ********** Persistent Types ******************************************** - // /** - // * Return all persistent types for the persistence unit with the given name - // */ - // Iterator<IPersistentType> persistentTypes(String persistenceUnitName); - // ************************************************************************ - // /** - // * Get the valid persistence XML files from the project - // */ - // Iterator<IJpaFile> validPersistenceXmlFiles(); - - // /** - // * Return an Iterator of IJavaTypeMappingProviders. These define which - // * IJavaTypeMappings are supported and which annotation applies. - // */ - // Iterator<IJavaTypeMappingProvider> javaTypeMappingProviders(); - // - // IJavaTypeMappingProvider javaTypeMappingProvider(String typeMappingKey); - // - // /** - // * Return an Iterator of IJavaAttributeMappingProviders. These define which - // * IJavaAttributeMappings are supported and which annotation applies. - // */ - // Iterator<IJavaAttributeMappingProvider> javaAttributeMappingProviders(); - // - // IJavaAttributeMappingProvider javaAttributeMappingProvider(String attributeMappingKey); - // - // /** - // * Return a ListIterator of IDefaultJavaAttributeMappingProvider. This is a List - // * because the defaults are checked in order. - // */ - // ListIterator<IDefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders(); - // - // /** - // * Returns the IGeneratorRepository for the persistence unit of the - // * given IPersistentType. A NullGeneratorRepository should be returned - // * if the IPersistentType is not part of a persistence unit - // * @param persistentType - // * @return - // */ - // IGeneratorRepository generatorRepository(IPersistentType persistentType); -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java index f9ed33a8bb..302688d20b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelManager.java @@ -29,6 +29,10 @@ import org.eclipse.jdt.core.IJavaElementDelta; import org.eclipse.jdt.core.IOpenable; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaModel; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants; import org.eclipse.jpt.utility.internal.BitTools; import org.eclipse.jpt.utility.internal.StringTools; @@ -72,7 +76,7 @@ public class JpaModelManager { /** * The JPA model - null until the plug-in is started. */ - private JpaModel jpaModel; + private GenericJpaModel jpaModel; /** * Listen for changes to projects and files. @@ -131,7 +135,7 @@ public class JpaModelManager { public synchronized void start() throws Exception { debug("*** START JPA model manager ***"); try { - this.jpaModel = new JpaModel(); + this.jpaModel = new GenericJpaModel(); ResourcesPlugin.getWorkspace().addResourceChangeListener(this.resourceChangeListener); FacetedProjectFramework.addListener(this.facetedProjectListener, IFacetedProjectEvent.Type.values()); JavaCore.addElementChangedListener(this.javaElementChangeListener); @@ -161,7 +165,7 @@ public class JpaModelManager { /** * Return the workspace-wide JPA model. */ - public IJpaModel jpaModel() { + public JpaModel jpaModel() { return this.jpaModel; } @@ -170,7 +174,7 @@ public class JpaModelManager { * or null if unable to associate the specified project with a * JPA project. */ - public IJpaProject jpaProject(IProject project) throws CoreException { + public JpaProject jpaProject(IProject project) throws CoreException { return this.jpaModel.jpaProject(project); } @@ -178,7 +182,7 @@ public class JpaModelManager { * Return the JPA file corresponding to the specified Eclipse file, * or null if unable to associate the specified file with a JPA file. */ - public IJpaFile jpaFile(IFile file) throws CoreException { + public JpaFile jpaFile(IFile file) throws CoreException { return this.jpaModel.jpaFile(file); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelObject.java deleted file mode 100644 index bb32c61275..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaModelObject.java +++ /dev/null @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal; - -import org.eclipse.jpt.utility.internal.model.AbstractModel; - -public abstract class JpaModelObject extends AbstractModel - implements IJpaModelObject -{ - // For now, make this simply an object, but it should eventually be a JpaModelObject - private Object parent; - - - public JpaModelObject(Object theParent) { - super(); - parent = theParent; - initialize(parent); - } - - protected void initialize(Object parent) { - // do nothing by default - } - - /** - * @see IJpaModelObject#getParent() - */ - public Object getParent() { - return parent; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java index ae02bab4db..2514d77e23 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/JpaProjectAdapterFactory.java @@ -12,12 +12,14 @@ package org.eclipse.jpt.core.internal; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; public class JpaProjectAdapterFactory implements IAdapterFactory { private static Class[] PROPERTIES= new Class[] { - IJpaProject.class + JpaProject.class }; public Class[] getAdapterList() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java index 7f57b5b7d6..5396f28241 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java @@ -10,14 +10,16 @@ package org.eclipse.jpt.core.internal; import org.eclipse.core.resources.IProject; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.utility.internal.StringTools; /** * Straightforward implementation of the JPA project config. */ -public class SimpleJpaProjectConfig implements IJpaProject.Config { +public class SimpleJpaProjectConfig implements JpaProject.Config { protected IProject project; - protected IJpaPlatform jpaPlatform; + protected JpaPlatform jpaPlatform; protected String connectionProfileName; protected boolean discoverAnnotatedClasses; @@ -33,11 +35,11 @@ public class SimpleJpaProjectConfig implements IJpaProject.Config { this.project = project; } - public IJpaPlatform jpaPlatform() { + public JpaPlatform jpaPlatform() { return this.jpaPlatform; } - public void setJpaPlatform(IJpaPlatform jpaPlatform) { + public void setJpaPlatform(JpaPlatform jpaPlatform) { this.jpaPlatform = jpaPlatform; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleTextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleTextRange.java index 5db6ad2d72..60aed27a8e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleTextRange.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleTextRange.java @@ -9,12 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.utility.internal.StringTools; /** * Straightforward, albeit almost useless, implementation of ITextRange. */ -public class SimpleTextRange implements ITextRange { +public class SimpleTextRange implements TextRange { private final int offset; private final int length; private final int lineNumber; @@ -59,10 +60,10 @@ public class SimpleTextRange implements ITextRange { if (o == this) { return true; } - if ( ! (o instanceof ITextRange)) { + if ( ! (o instanceof TextRange)) { return false; } - ITextRange r = (ITextRange) o; + TextRange r = (TextRange) o; return (r.getOffset() == this.offset) && (r.getLength() == this.length); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java index bde4745304..5b15115f1e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SynchronousJpaProjectUpdater.java @@ -11,21 +11,21 @@ package org.eclipse.jpt.core.internal; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.utility.internal.StringTools; /** * This updater will update the JPA project immediately and not return until * the update and all resulting updates are complete. */ -public class SynchronousJpaProjectUpdater implements IJpaProject.Updater { - protected final IJpaProject jpaProject; +public class SynchronousJpaProjectUpdater implements JpaProject.Updater { + protected final JpaProject jpaProject; protected boolean updating; protected boolean again; protected static final IProgressMonitor NULL_PROGRESS_MONITOR = new NullProgressMonitor(); - public SynchronousJpaProjectUpdater(IJpaProject jpaProject) { + public SynchronousJpaProjectUpdater(JpaProject jpaProject) { super(); this.jpaProject = jpaProject; this.updating = false; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/JpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java index 88652761a4..0012ec0367 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/JpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java @@ -8,21 +8,22 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.internal.context; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.JpaNode; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.AbstractJpaNode; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public abstract class JpaContextNode extends JpaNode - implements IJpaContextNode +public abstract class AbstractJpaContextNode extends AbstractJpaNode + implements JpaContextNode { // **************** constructor ******************************************** - protected JpaContextNode(IJpaNode parent) { + protected AbstractJpaContextNode(JpaNode parent) { super(parent); } @@ -30,8 +31,8 @@ public abstract class JpaContextNode extends JpaNode // **************** IJpaContextNode impl *********************************** @Override - protected IJpaBaseContextFactory jpaFactory() { - return (IJpaBaseContextFactory) super.jpaFactory(); + protected JpaBaseContextFactory jpaFactory() { + return (JpaBaseContextFactory) super.jpaFactory(); } //TODO casting to IJpaContextNode here(possible CCE). @@ -39,8 +40,8 @@ public abstract class JpaContextNode extends JpaNode * Overidden in BaseJpaContext, Persistence, PersitsenceXml to throw UnsupportedOperationException * Overidden in PersistenceUnit to return it. */ - public IPersistenceUnit persistenceUnit() { - return ((IJpaContextNode) parent()).persistenceUnit(); + public PersistenceUnit persistenceUnit() { + return ((JpaContextNode) parent()).persistenceUnit(); } /** @@ -48,14 +49,14 @@ public abstract class JpaContextNode extends JpaNode * Overidden in EntityMappings to return it. */ public EntityMappings entityMappings() { - return ((IJpaContextNode) parent()).entityMappings(); + return ((JpaContextNode) parent()).entityMappings(); } /** * Overidden in BaseJpaContext to return null * Overidden in XmlPersistentType to return it. */ - public XmlPersistentType xmlPersistentType() { - return ((IJpaContextNode) parent()).xmlPersistentType(); + public OrmPersistentType ormPersistentType() { + return ((JpaContextNode) parent()).ormPersistentType(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/BaseJpaContent.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/BaseJpaContent.java index 7396cd15a2..2d17a57b9b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/BaseJpaContent.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/BaseJpaContent.java @@ -8,34 +8,34 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.internal.context; import java.util.List; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceArtifactEdit; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResource; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.persistence.PersistenceArtifactEdit; +import org.eclipse.jpt.core.resource.persistence.PersistenceResource; import org.eclipse.jpt.utility.internal.node.Node; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class BaseJpaContent extends JpaContextNode +public class BaseJpaContent extends AbstractJpaContextNode implements IBaseJpaContent { - protected IPersistenceXml persistenceXml; + protected PersistenceXml persistenceXml; - public BaseJpaContent(IJpaProject jpaProject) { + public BaseJpaContent(JpaProject jpaProject) { super(jpaProject); } @@ -58,30 +58,30 @@ public class BaseJpaContent extends JpaContextNode } @Override - public XmlPersistentType xmlPersistentType() { + public OrmPersistentType ormPersistentType() { return null; } // **************** persistence xml **************************************** - public IPersistenceXml getPersistenceXml() { + public PersistenceXml getPersistenceXml() { return this.persistenceXml; } - protected void setPersistenceXml(IPersistenceXml persistenceXml) { - IPersistenceXml old = this.persistenceXml; + protected void setPersistenceXml(PersistenceXml persistenceXml) { + PersistenceXml old = this.persistenceXml; this.persistenceXml = persistenceXml; this.firePropertyChanged(PERSISTENCE_XML_PROPERTY, old, persistenceXml); } - public IPersistenceXml addPersistenceXml() { + public PersistenceXml addPersistenceXml() { if (this.persistenceXml != null) { throw new IllegalStateException(); } PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(this.jpaProject().project()); PersistenceResource pr = pae.createDefaultResource(); pae.dispose(); - IPersistenceXml px = this.createPersistenceXml(pr); + PersistenceXml px = this.createPersistenceXml(pr); this.setPersistenceXml(px); return px; } @@ -127,8 +127,8 @@ public class BaseJpaContent extends JpaContextNode pae.dispose(); } - protected IPersistenceXml createPersistenceXml(PersistenceResource persistenceResource) { - IPersistenceXml px = this.jpaFactory().createPersistenceXml(this); + protected PersistenceXml createPersistenceXml(PersistenceResource persistenceResource) { + PersistenceXml px = this.jpaFactory().buildPersistenceXml(this); px.initialize(persistenceResource); return px; } @@ -137,7 +137,7 @@ public class BaseJpaContent extends JpaContextNode // ************************************************************************* @Override - public IPersistenceUnit persistenceUnit() { + public PersistenceUnit persistenceUnit() { throw new UnsupportedOperationException("No PersistenceUnit in this context"); } @@ -167,9 +167,9 @@ public class BaseJpaContent extends JpaContextNode protected void addNoPersistenceXmlMessage(List<IMessage> messages) { if (persistenceXml == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PROJECT_NO_PERSISTENCE_XML, + JpaValidationMessages.PROJECT_NO_PERSISTENCE_XML, this) ); okToContinueValidation = false; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/RelationshipMappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java index 2c6d944b1a..dea08e011e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/RelationshipMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.context.base; +package org.eclipse.jpt.core.internal.context; import java.util.StringTokenizer; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/DiscriminatorType.java deleted file mode 100644 index dc12ccbea2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/DiscriminatorType.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.context.base; - - -public enum DiscriminatorType { - - STRING, - CHAR, - INTEGER; - - - public static DiscriminatorType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.DiscriminatorType javaDiscriminatorType) { - if (javaDiscriminatorType == org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.STRING) { - return STRING; - } - else if (javaDiscriminatorType == org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.CHAR) { - return CHAR; - } - else if (javaDiscriminatorType == org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.INTEGER) { - return INTEGER; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.java.DiscriminatorType toJavaResourceModel(DiscriminatorType discriminatorType) { - if (discriminatorType == STRING) { - return org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.STRING; - } - else if (discriminatorType == CHAR) { - return org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.CHAR; - } - else if (discriminatorType == INTEGER) { - return org.eclipse.jpt.core.internal.resource.java.DiscriminatorType.INTEGER; - } - return null; - } - - - public static DiscriminatorType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType ormDiscriminatorType) { - if (ormDiscriminatorType == org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.STRING) { - return STRING; - } - else if (ormDiscriminatorType == org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.CHAR) { - return CHAR; - } - else if (ormDiscriminatorType == org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.INTEGER) { - return INTEGER; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType toOrmResourceModel(DiscriminatorType discriminatorType) { - if (discriminatorType == STRING) { - return org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.STRING; - } - else if (discriminatorType == CHAR) { - return org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.CHAR; - } - else if (discriminatorType == INTEGER) { - return org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType.INTEGER; - } - return null; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/FetchType.java deleted file mode 100644 index 7630e7e0d2..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/FetchType.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.context.base; - - -public enum FetchType { - - EAGER, - LAZY; - - - public static FetchType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.FetchType javaFetchType) { - if (javaFetchType == org.eclipse.jpt.core.internal.resource.java.FetchType.EAGER) { - return EAGER; - } - else if (javaFetchType == org.eclipse.jpt.core.internal.resource.java.FetchType.LAZY) { - return LAZY; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.java.FetchType toJavaResourceModel(FetchType fetchType) { - if (fetchType == EAGER) { - return org.eclipse.jpt.core.internal.resource.java.FetchType.EAGER; - } - else if (fetchType == LAZY) { - return org.eclipse.jpt.core.internal.resource.java.FetchType.LAZY; - } - return null; - } - - - public static FetchType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.FetchType ormFetchType) { - if (ormFetchType == org.eclipse.jpt.core.internal.resource.orm.FetchType.EAGER) { - return EAGER; - } - else if (ormFetchType == org.eclipse.jpt.core.internal.resource.orm.FetchType.LAZY) { - return LAZY; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.orm.FetchType toOrmResourceModel(FetchType fetchType) { - if (fetchType == EAGER) { - return org.eclipse.jpt.core.internal.resource.orm.FetchType.EAGER; - } - else if (fetchType == LAZY) { - return org.eclipse.jpt.core.internal.resource.orm.FetchType.LAZY; - } - return null; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/GenerationType.java deleted file mode 100644 index 2ee75e2ae0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/GenerationType.java +++ /dev/null @@ -1,85 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.context.base; - - -public enum GenerationType { - - TABLE, - SEQUENCE, - IDENTITY, - AUTO; - - - public static GenerationType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.GenerationType javaGenerationType) { - if (javaGenerationType == org.eclipse.jpt.core.internal.resource.java.GenerationType.TABLE) { - return TABLE; - } - else if (javaGenerationType == org.eclipse.jpt.core.internal.resource.java.GenerationType.SEQUENCE) { - return SEQUENCE; - } - else if (javaGenerationType == org.eclipse.jpt.core.internal.resource.java.GenerationType.IDENTITY) { - return IDENTITY; - } - else if (javaGenerationType == org.eclipse.jpt.core.internal.resource.java.GenerationType.AUTO) { - return AUTO; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.java.GenerationType toJavaResourceModel(GenerationType generationType) { - if (generationType == TABLE) { - return org.eclipse.jpt.core.internal.resource.java.GenerationType.TABLE; - } - else if (generationType == SEQUENCE) { - return org.eclipse.jpt.core.internal.resource.java.GenerationType.SEQUENCE; - } - else if (generationType == IDENTITY) { - return org.eclipse.jpt.core.internal.resource.java.GenerationType.IDENTITY; - } - else if (generationType == AUTO) { - return org.eclipse.jpt.core.internal.resource.java.GenerationType.AUTO; - } - return null; - } - - - public static GenerationType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.GenerationType ormGenerationType) { - if (ormGenerationType == org.eclipse.jpt.core.internal.resource.orm.GenerationType.TABLE) { - return TABLE; - } - else if (ormGenerationType == org.eclipse.jpt.core.internal.resource.orm.GenerationType.SEQUENCE) { - return SEQUENCE; - } - else if (ormGenerationType == org.eclipse.jpt.core.internal.resource.orm.GenerationType.IDENTITY) { - return IDENTITY; - } - else if (ormGenerationType == org.eclipse.jpt.core.internal.resource.orm.GenerationType.AUTO) { - return AUTO; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.orm.GenerationType toOrmResourceModel(GenerationType generationType) { - if (generationType == TABLE) { - return org.eclipse.jpt.core.internal.resource.orm.GenerationType.TABLE; - } - else if (generationType == SEQUENCE) { - return org.eclipse.jpt.core.internal.resource.orm.GenerationType.SEQUENCE; - } - else if (generationType == IDENTITY) { - return org.eclipse.jpt.core.internal.resource.orm.GenerationType.IDENTITY; - } - else if (generationType == AUTO) { - return org.eclipse.jpt.core.internal.resource.orm.GenerationType.AUTO; - } - return null; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/InheritanceType.java deleted file mode 100644 index 8d2760760a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/InheritanceType.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.context.base; - - - -public enum InheritanceType { - - - SINGLE_TABLE, - JOINED, - TABLE_PER_CLASS; - - public static InheritanceType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.InheritanceType javaInheritanceType) { - if (javaInheritanceType == org.eclipse.jpt.core.internal.resource.java.InheritanceType.SINGLE_TABLE) { - return SINGLE_TABLE; - } - else if (javaInheritanceType == org.eclipse.jpt.core.internal.resource.java.InheritanceType.JOINED) { - return JOINED; - } - else if (javaInheritanceType == org.eclipse.jpt.core.internal.resource.java.InheritanceType.TABLE_PER_CLASS) { - return TABLE_PER_CLASS; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.java.InheritanceType toJavaResourceModel(InheritanceType inheritanceType) { - if (inheritanceType == SINGLE_TABLE) { - return org.eclipse.jpt.core.internal.resource.java.InheritanceType.SINGLE_TABLE; - } - else if (inheritanceType == JOINED) { - return org.eclipse.jpt.core.internal.resource.java.InheritanceType.JOINED; - } - else if (inheritanceType == TABLE_PER_CLASS) { - return org.eclipse.jpt.core.internal.resource.java.InheritanceType.TABLE_PER_CLASS; - } - return null; - } - - - public static InheritanceType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.InheritanceType ormInheritanceType) { - if (ormInheritanceType == org.eclipse.jpt.core.internal.resource.orm.InheritanceType.SINGLE_TABLE) { - return SINGLE_TABLE; - } - else if (ormInheritanceType == org.eclipse.jpt.core.internal.resource.orm.InheritanceType.JOINED) { - return JOINED; - } - else if (ormInheritanceType == org.eclipse.jpt.core.internal.resource.orm.InheritanceType.TABLE_PER_CLASS) { - return TABLE_PER_CLASS; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.orm.InheritanceType toOrmResourceModel(InheritanceType inheritanceType) { - if (inheritanceType == SINGLE_TABLE) { - return org.eclipse.jpt.core.internal.resource.orm.InheritanceType.SINGLE_TABLE; - } - else if (inheritanceType == JOINED) { - return org.eclipse.jpt.core.internal.resource.orm.InheritanceType.JOINED; - } - else if (inheritanceType == TABLE_PER_CLASS) { - return org.eclipse.jpt.core.internal.resource.orm.InheritanceType.TABLE_PER_CLASS; - } - return null; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/TemporalType.java deleted file mode 100644 index ec4d21a351..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/base/TemporalType.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.context.base; - - -public enum TemporalType { - - DATE, - TIME, - TIMESTAMP; - - - public static TemporalType fromJavaResourceModel(org.eclipse.jpt.core.internal.resource.java.TemporalType javaTemporalType) { - if (javaTemporalType == org.eclipse.jpt.core.internal.resource.java.TemporalType.DATE) { - return DATE; - } - else if (javaTemporalType == org.eclipse.jpt.core.internal.resource.java.TemporalType.TIME) { - return TIME; - } - else if (javaTemporalType == org.eclipse.jpt.core.internal.resource.java.TemporalType.TIMESTAMP) { - return TIMESTAMP; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.java.TemporalType toJavaResourceModel(TemporalType temporalType) { - if (temporalType == DATE) { - return org.eclipse.jpt.core.internal.resource.java.TemporalType.DATE; - } - else if (temporalType == TIME) { - return org.eclipse.jpt.core.internal.resource.java.TemporalType.TIME; - } - else if (temporalType == TIMESTAMP) { - return org.eclipse.jpt.core.internal.resource.java.TemporalType.TIMESTAMP; - } - return null; - } - - - public static TemporalType fromOrmResourceModel(org.eclipse.jpt.core.internal.resource.orm.TemporalType ormTemporalType) { - if (ormTemporalType == org.eclipse.jpt.core.internal.resource.orm.TemporalType.DATE) { - return DATE; - } - else if (ormTemporalType == org.eclipse.jpt.core.internal.resource.orm.TemporalType.TIME) { - return TIME; - } - else if (ormTemporalType == org.eclipse.jpt.core.internal.resource.orm.TemporalType.TIMESTAMP) { - return TIMESTAMP; - } - return null; - } - - public static org.eclipse.jpt.core.internal.resource.orm.TemporalType toOrmResourceModel(TemporalType temporalType) { - if (temporalType == DATE) { - return org.eclipse.jpt.core.internal.resource.orm.TemporalType.DATE; - } - else if (temporalType == TIME) { - return org.eclipse.jpt.core.internal.resource.orm.TemporalType.TIME; - } - else if (temporalType == TIMESTAMP) { - return org.eclipse.jpt.core.internal.resource.orm.TemporalType.TIMESTAMP; - } - return null; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java index 32996dd38e..7523fafbf2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -14,37 +14,39 @@ import java.util.List; import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.db.internal.Table; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public abstract class JavaAttributeMapping extends JavaContextModel - implements IJavaAttributeMapping +public abstract class AbstractJavaAttributeMapping extends JavaContextModel + implements JavaAttributeMapping { - protected JavaPersistentAttributeResource persistentAttributeResource; + protected JavaResourcePersistentAttribute persistentAttributeResource; - protected JavaAttributeMapping(IJavaPersistentAttribute parent) { + protected AbstractJavaAttributeMapping(JavaPersistentAttribute parent) { super(parent); } - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { this.persistentAttributeResource = persistentAttributeResource; } - protected JavaResource mappingResource() { + protected JavaResourceNode mappingResource() { return this.persistentAttributeResource.mappingAnnotation(annotationName()); } - public JavaPersistentAttribute persistentAttribute() { - return (JavaPersistentAttribute) this.parent(); + public GenericJavaPersistentAttribute persistentAttribute() { + return (GenericJavaPersistentAttribute) this.parent(); } /** @@ -56,14 +58,14 @@ public abstract class JavaAttributeMapping extends JavaContextModel } protected boolean embeddableOwned() { - return this.typeMapping().getKey() == IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return this.typeMapping().getKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } protected boolean entityOwned() { - return this.typeMapping().getKey() == IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return this.typeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY; } - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return this.persistentAttribute().typeMapping(); } @@ -75,12 +77,12 @@ public abstract class JavaAttributeMapping extends JavaContextModel return typeMapping().dbTable(tableName); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = this.mappingResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = this.mappingResource().textRange(astRoot); return (textRange != null) ? textRange : this.persistentAttribute().validationTextRange(astRoot); } - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { this.persistentAttributeResource = persistentAttributeResource; } @@ -112,8 +114,8 @@ public abstract class JavaAttributeMapping extends JavaContextModel } protected void addModifierMessages(List<IMessage> messages, CompilationUnit astRoot) { - JavaPersistentAttribute attribute = this.persistentAttribute(); - if (attribute.getMapping().getKey() != IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY + GenericJavaPersistentAttribute attribute = this.persistentAttribute(); + if (attribute.getMapping().getKey() != MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY && persistentAttributeResource.isForField()) { int flags; @@ -126,9 +128,9 @@ public abstract class JavaAttributeMapping extends JavaContextModel if (Flags.isFinal(flags)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD, + JpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD, new String[] {attribute.getName()}, attribute, attribute.validationTextRange(astRoot)) ); @@ -136,9 +138,9 @@ public abstract class JavaAttributeMapping extends JavaContextModel if (Flags.isPublic(flags)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD, + JpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD, new String[] {attribute.getName()}, attribute, attribute.validationTextRange(astRoot)) ); @@ -150,9 +152,9 @@ public abstract class JavaAttributeMapping extends JavaContextModel protected void addInvalidMappingMessage(List<IMessage> messages, CompilationUnit astRoot) { if (! typeMapping().attributeMappingKeyAllowed(this.getKey())) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING, + JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING, new String[] {this.persistentAttribute().getName()}, this, this.validationTextRange(astRoot)) ); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaColumn.java index c1992d004d..bebbb3b791 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaColumn.java @@ -11,16 +11,17 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractColumn; -import org.eclipse.jpt.core.internal.resource.java.AbstractColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaNamedColumn<T> - implements IAbstractColumn +public abstract class AbstractJavaColumn<T extends AbstractColumnAnnotation> extends AbstractJavaNamedColumn<T> + implements AbstractColumn { protected String specifiedTable; @@ -35,7 +36,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected Boolean specifiedUpdatable; - protected AbstractJavaColumn(IJavaJpaContextNode parent, IAbstractColumn.Owner owner) { + protected AbstractJavaColumn(JavaJpaContextNode parent, AbstractColumn.Owner owner) { super(parent, owner); } @@ -51,8 +52,8 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN } @Override - public IAbstractColumn.Owner owner() { - return (IAbstractColumn.Owner) super.owner(); + public AbstractColumn.Owner owner() { + return (AbstractColumn.Owner) super.owner(); } //************** IAbstractColumn implementation ******************* @@ -70,7 +71,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN String oldSpecifiedTable = this.specifiedTable; this.specifiedTable = newSpecifiedTable; columnResource().setTable(newSpecifiedTable); - firePropertyChanged(IAbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); + firePropertyChanged(AbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); } /** @@ -82,7 +83,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setSpecifiedTable_(String newSpecifiedTable) { String oldSpecifiedTable = this.specifiedTable; this.specifiedTable = newSpecifiedTable; - firePropertyChanged(IAbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); + firePropertyChanged(AbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); } public String getDefaultTable() { @@ -92,7 +93,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setDefaultTable(String newDefaultTable) { String oldDefaultTable = this.defaultTable; this.defaultTable = newDefaultTable; - firePropertyChanged(IAbstractColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable); + firePropertyChanged(AbstractColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable); } public Boolean getUnique() { @@ -100,7 +101,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN } public Boolean getDefaultUnique() { - return IAbstractColumn.DEFAULT_UNIQUE; + return AbstractColumn.DEFAULT_UNIQUE; } public Boolean getSpecifiedUnique() { @@ -111,7 +112,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN Boolean oldSpecifiedUnique = this.specifiedUnique; this.specifiedUnique = newSpecifiedUnique; this.columnResource().setUnique(newSpecifiedUnique); - firePropertyChanged(IAbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); + firePropertyChanged(AbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); } /** @@ -123,7 +124,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setSpecifiedUnique_(Boolean newSpecifiedUnique) { Boolean oldSpecifiedUnique = this.specifiedUnique; this.specifiedUnique = newSpecifiedUnique; - firePropertyChanged(IAbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); + firePropertyChanged(AbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); } public Boolean getNullable() { @@ -131,7 +132,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN } public Boolean getDefaultNullable() { - return IAbstractColumn.DEFAULT_NULLABLE; + return AbstractColumn.DEFAULT_NULLABLE; } public Boolean getSpecifiedNullable() { @@ -142,7 +143,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN Boolean oldSpecifiedNullable = this.specifiedNullable; this.specifiedNullable = newSpecifiedNullable; this.columnResource().setNullable(newSpecifiedNullable); - firePropertyChanged(IAbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); + firePropertyChanged(AbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); } /** @@ -154,7 +155,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setSpecifiedNullable_(Boolean newSpecifiedNullable) { Boolean oldSpecifiedNullable = this.specifiedNullable; this.specifiedNullable = newSpecifiedNullable; - firePropertyChanged(IAbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); + firePropertyChanged(AbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); } public Boolean getInsertable() { @@ -162,7 +163,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN } public Boolean getDefaultInsertable() { - return IAbstractColumn.DEFAULT_INSERTABLE; + return AbstractColumn.DEFAULT_INSERTABLE; } public Boolean getSpecifiedInsertable() { @@ -173,7 +174,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN Boolean oldSpecifiedInsertable = this.specifiedInsertable; this.specifiedInsertable = newSpecifiedInsertable; this.columnResource().setInsertable(newSpecifiedInsertable); - firePropertyChanged(IAbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); + firePropertyChanged(AbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); } /** @@ -185,7 +186,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setSpecifiedInsertable_(Boolean newSpecifiedInsertable) { Boolean oldSpecifiedInsertable = this.specifiedInsertable; this.specifiedInsertable = newSpecifiedInsertable; - firePropertyChanged(IAbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); + firePropertyChanged(AbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); } public Boolean getUpdatable() { @@ -193,7 +194,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN } public Boolean getDefaultUpdatable() { - return IAbstractColumn.DEFAULT_UPDATABLE; + return AbstractColumn.DEFAULT_UPDATABLE; } public Boolean getSpecifiedUpdatable() { @@ -204,7 +205,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN Boolean oldSpecifiedUpdatable = this.specifiedUpdatable; this.specifiedUpdatable = newSpecifiedUpdatable; this.columnResource().setUpdatable(newSpecifiedUpdatable); - firePropertyChanged(IAbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); + firePropertyChanged(AbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); } /** @@ -216,7 +217,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN protected void setSpecifiedUpdatable_(Boolean newSpecifiedUpdatable) { Boolean oldSpecifiedUpdatable = this.specifiedUpdatable; this.specifiedUpdatable = newSpecifiedUpdatable; - firePropertyChanged(IAbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); + firePropertyChanged(AbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); } @Override @@ -224,7 +225,7 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN return this.getTable(); } - public ITextRange tableTextRange(CompilationUnit astRoot) { + public TextRange tableTextRange(CompilationUnit astRoot) { return columnResource().tableTextRange(astRoot); } @@ -277,23 +278,23 @@ public abstract class AbstractJavaColumn<T extends AbstractColumn> extends JavaN return this.owner().defaultTableName(); } - protected String specifiedTable(AbstractColumn column) { + protected String specifiedTable(AbstractColumnAnnotation column) { return column.getTable(); } - protected Boolean specifiedUnique(AbstractColumn column) { + protected Boolean specifiedUnique(AbstractColumnAnnotation column) { return column.getUnique(); } - protected Boolean specifiedNullable(AbstractColumn column) { + protected Boolean specifiedNullable(AbstractColumnAnnotation column) { return column.getNullable(); } - protected Boolean specifiedInsertable(AbstractColumn column) { + protected Boolean specifiedInsertable(AbstractColumnAnnotation column) { return column.getInsertable(); } - protected Boolean specifiedUpdatable(AbstractColumn column) { + protected Boolean specifiedUpdatable(AbstractColumnAnnotation column) { return column.getUpdatable(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java index e404ecc1ea..2d607c5a05 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java @@ -10,12 +10,14 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IGenerator; -import org.eclipse.jpt.core.internal.resource.java.Generator; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.core.context.java.JavaGenerator; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.GeneratorAnnotation; -public abstract class JavaGenerator<T extends Generator> extends JavaContextModel implements IJavaGenerator<T> +public abstract class AbstractJavaGenerator<T extends GeneratorAnnotation> extends JavaContextModel implements JavaGenerator<T> { protected String name; @@ -25,7 +27,7 @@ public abstract class JavaGenerator<T extends Generator> extends JavaContextMode protected T generatorResource; - protected JavaGenerator(IJavaJpaContextNode parent) { + protected AbstractJavaGenerator(JavaJpaContextNode parent) { super(parent); } @@ -40,15 +42,15 @@ public abstract class JavaGenerator<T extends Generator> extends JavaContextMode return this.generatorResource; } - protected String name(Generator generatorResource) { + protected String name(GeneratorAnnotation generatorResource) { return generatorResource.getName(); } - protected Integer specifiedInitialValue(Generator generatorResource) { + protected Integer specifiedInitialValue(GeneratorAnnotation generatorResource) { return generatorResource.getInitialValue(); } - protected Integer specifiedAllocationSize(Generator generatorResource) { + protected Integer specifiedAllocationSize(GeneratorAnnotation generatorResource) { return generatorResource.getAllocationSize(); } @@ -112,15 +114,15 @@ public abstract class JavaGenerator<T extends Generator> extends JavaContextMode } public Integer getDefaultAllocationSize() { - return IGenerator.DEFAULT_ALLOCATION_SIZE; + return Generator.DEFAULT_ALLOCATION_SIZE; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } - public ITextRange selectionTextRange(CompilationUnit astRoot) { + public TextRange selectionTextRange(CompilationUnit astRoot) { return this.generatorResource.textRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index ccb9d1a784..bceb743190 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -13,25 +13,28 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IMultiRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.MapKey; -import org.eclipse.jpt.core.internal.resource.java.OrderBy; -import org.eclipse.jpt.core.internal.resource.java.RelationshipMapping; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.MultiRelationshipMapping; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.MapKey; +import org.eclipse.jpt.core.resource.java.OrderBy; +import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping> - extends JavaRelationshipMapping<T> implements IMultiRelationshipMapping +public abstract class AbstractJavaMultiRelationshipMapping<T extends RelationshipMappingAnnotation> + extends AbstractJavaRelationshipMapping<T> implements MultiRelationshipMapping { protected String mappedBy; @@ -45,13 +48,13 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping protected boolean isCustomOrdering; //TODO should this be null if this is the non-owning side of the relationship?? - protected final IJavaJoinTable joinTable; + protected final JavaJoinTable joinTable; protected String mapKey; - protected JavaMultiRelationshipMapping(IJavaPersistentAttribute parent) { + protected AbstractJavaMultiRelationshipMapping(JavaPersistentAttribute parent) { super(parent); - this.joinTable = jpaFactory().createJavaJoinTable(this); + this.joinTable = jpaFactory().buildJavaJoinTable(this); } public String getMappedBy() { @@ -62,7 +65,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping String oldMappedBy = this.mappedBy; this.mappedBy = newMappedBy; this.setMappedByOnResourceModel(newMappedBy); - firePropertyChanged(INonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); + firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); } protected abstract void setMappedByOnResourceModel(String mappedBy); @@ -85,13 +88,13 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping } orderByResource().setValue(newOrderBy); } - firePropertyChanged(IMultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy); + firePropertyChanged(MultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy); } protected void setOrderBy_(String newOrderBy) { String oldOrderBy = this.orderBy; this.orderBy = newOrderBy; - firePropertyChanged(IMultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy); + firePropertyChanged(MultiRelationshipMapping.ORDER_BY_PROPERTY, oldOrderBy, newOrderBy); } protected OrderBy orderByResource() { @@ -174,10 +177,10 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping } public FetchType getDefaultFetch() { - return IMultiRelationshipMapping.DEFAULT_FETCH_TYPE; + return MultiRelationshipMapping.DEFAULT_FETCH_TYPE; } - public IJavaJoinTable getJoinTable() { + public JavaJoinTable getJoinTable() { return this.joinTable; } @@ -210,13 +213,13 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping mapKeyResource(this.persistentAttributeResource).setName(newMapKey); } } - firePropertyChanged(IMultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey); + firePropertyChanged(MultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey); } protected void setMapKey_(String newMapKey) { String oldMapKey = this.mapKey; this.mapKey = newMapKey; - firePropertyChanged(IMultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey); + firePropertyChanged(MultiRelationshipMapping.MAP_KEY_PROPERTY, oldMapKey, newMapKey); } //TODO default orderBy - this wasn't supported in 1.0 either @@ -236,7 +239,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping // } @Override - protected String defaultTargetEntity(JavaPersistentAttributeResource persistentAttributeResource) { + protected String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource) { if (!persistentAttributeResource.typeIsContainer()) { return null; } @@ -252,7 +255,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping return false; } - protected MapKey mapKeyResource(JavaPersistentAttributeResource persistentAttributeResource) { + protected MapKey mapKeyResource(JavaResourcePersistentAttribute persistentAttributeResource) { return (MapKey) persistentAttributeResource.annotation(MapKey.ANNOTATION_NAME); } @@ -288,7 +291,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); MapKey mapKey = this.mapKeyResource(persistentAttributeResource); if (mapKey != null) { @@ -320,7 +323,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.updateMapKey(persistentAttributeResource); this.updateOrderBy(this.orderByResource()); @@ -333,7 +336,7 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping this.setMappedBy(this.mappedBy(relationshipMapping)); } - protected void updateMapKey(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateMapKey(JavaResourcePersistentAttribute persistentAttributeResource) { MapKey mapKey = this.mapKeyResource(persistentAttributeResource); if (mapKey != null) { setMapKey_(mapKey.getName()); @@ -381,16 +384,16 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping } protected void addJoinTableMessages(List<IMessage> messages, CompilationUnit astRoot) { - IJavaJoinTable joinTable = this.getJoinTable(); + JavaJoinTable joinTable = this.getJoinTable(); boolean doContinue = joinTable.isConnected(); String schema = joinTable.getSchema(); if (doContinue && ! joinTable.hasResolvedSchema()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_TABLE_UNRESOLVED_SCHEMA, + JpaValidationMessages.JOIN_TABLE_UNRESOLVED_SCHEMA, new String[] {schema, joinTable.getName()}, joinTable, joinTable.schemaTextRange(astRoot)) ); @@ -399,23 +402,23 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (doContinue && ! joinTable.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_TABLE_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_TABLE_UNRESOLVED_NAME, new String[] {joinTable.getName()}, joinTable, joinTable.nameTextRange(astRoot)) ); doContinue = false; } - for (Iterator<IJavaJoinColumn> stream = joinTable.joinColumns(); stream.hasNext(); ) { - IJavaJoinColumn joinColumn = stream.next(); + for (Iterator<JavaJoinColumn> stream = joinTable.joinColumns(); stream.hasNext(); ) { + JavaJoinColumn joinColumn = stream.next(); if (doContinue && ! joinColumn.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, joinColumn, joinColumn.nameTextRange(astRoot)) ); @@ -423,23 +426,23 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (doContinue && ! joinColumn.isReferencedColumnResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) ); } } - for (Iterator<IJavaJoinColumn> stream = joinTable.inverseJoinColumns(); stream.hasNext(); ) { - IJavaJoinColumn joinColumn = stream.next(); + for (Iterator<JavaJoinColumn> stream = joinTable.inverseJoinColumns(); stream.hasNext(); ) { + JavaJoinColumn joinColumn = stream.next(); if (doContinue && ! joinColumn.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, joinColumn, joinColumn.nameTextRange(astRoot)) ); @@ -447,9 +450,9 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (doContinue && ! joinColumn.isReferencedColumnResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) ); @@ -462,28 +465,28 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (this.isJoinTableSpecified()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE, + JpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE, this.getJoinTable(), this.getJoinTable().validationTextRange(astRoot)) ); } - IEntity targetEntity = this.getResolvedTargetEntity(); + Entity targetEntity = this.getResolvedTargetEntity(); if (targetEntity == null) { // already have validation messages for that return; } - IPersistentAttribute attribute = targetEntity.persistentType().resolveAttribute(mappedBy); + PersistentAttribute attribute = targetEntity.persistentType().resolveAttribute(mappedBy); if (attribute == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY, + JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY, new String[] {mappedBy}, this, this.mappedByTextRange(astRoot)) ); @@ -492,18 +495,18 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (! this.mappedByIsValid(attribute.getMapping())) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_INVALID_MAPPED_BY, + JpaValidationMessages.MAPPING_INVALID_MAPPED_BY, new String[] {mappedBy}, this, this.mappedByTextRange(astRoot)) ); return; } - INonOwningMapping mappedByMapping; + NonOwningMapping mappedByMapping; try { - mappedByMapping = (INonOwningMapping) attribute.getMapping(); + mappedByMapping = (NonOwningMapping) attribute.getMapping(); } catch (ClassCastException cce) { // there is no error then return; @@ -511,9 +514,9 @@ public abstract class JavaMultiRelationshipMapping<T extends RelationshipMapping if (mappedByMapping.getMappedBy() != null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES, + JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES, this, this.mappedByTextRange(astRoot)) ); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java index 3112ad316e..a92a724923 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java @@ -11,9 +11,11 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.resource.java.NamedColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaNamedColumn; +import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.Filter; @@ -22,8 +24,8 @@ import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContextModel - implements IJavaNamedColumn +public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> extends JavaContextModel + implements JavaNamedColumn { protected Owner owner; @@ -34,7 +36,7 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext protected String columnDefinition; - protected JavaNamedColumn(IJavaJpaContextNode parent, Owner owner) { + protected AbstractJavaNamedColumn(JavaJpaContextNode parent, Owner owner) { super(parent); this.owner = owner; } @@ -64,7 +66,7 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; columnResource().setName(newSpecifiedName); - firePropertyChanged(INamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); + firePropertyChanged(NamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } /** @@ -76,7 +78,7 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext protected void setSpecifiedName_(String newSpecifiedName) { String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; - firePropertyChanged(INamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); + firePropertyChanged(NamedColumn.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } public String getDefaultName() { @@ -86,7 +88,7 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext protected void setDefaultName(String newDefaultName) { String oldDefaultName = this.defaultName; this.defaultName = newDefaultName; - firePropertyChanged(INamedColumn.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); + firePropertyChanged(NamedColumn.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); } public String getColumnDefinition() { @@ -97,7 +99,7 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext String oldColumnDefinition = this.columnDefinition; this.columnDefinition = newColumnDefinition; columnResource().setColumnDefinition(newColumnDefinition); - firePropertyChanged(INamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); + firePropertyChanged(NamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); } /** @@ -109,15 +111,15 @@ public abstract class JavaNamedColumn<T extends NamedColumn> extends JavaContext protected void setColumnDefinition_(String newColumnDefinition) { String oldColumnDefinition = this.columnDefinition; this.columnDefinition = newColumnDefinition; - firePropertyChanged(INamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); + firePropertyChanged(NamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); } public Owner owner() { return this.owner; } - public ITextRange nameTextRange(CompilationUnit astRoot) { - ITextRange textRange = this.columnResource().nameTextRange(astRoot); + public TextRange nameTextRange(CompilationUnit astRoot) { + TextRange textRange = this.columnResource().nameTextRange(astRoot); return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java index 6d0b3b2a6a..357c1e680f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java @@ -13,28 +13,31 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IQuery; -import org.eclipse.jpt.core.internal.context.base.IQueryHint; -import org.eclipse.jpt.core.internal.resource.java.Query; -import org.eclipse.jpt.core.internal.resource.java.QueryHint; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Query; +import org.eclipse.jpt.core.context.QueryHint; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.resource.java.QueryAnnotation; +import org.eclipse.jpt.core.resource.java.QueryHintAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public abstract class AbstractJavaQuery<E extends Query> extends JavaContextModel implements IJavaQuery<E> +public abstract class AbstractJavaQuery<E extends QueryAnnotation> extends JavaContextModel implements JavaQuery<E> { protected String name; protected String query; - protected final List<IJavaQueryHint> hints; + protected final List<JavaQueryHint> hints; protected E queryResource; - protected AbstractJavaQuery(IJavaJpaContextNode parent) { + protected AbstractJavaQuery(JavaJpaContextNode parent) { super(parent); - this.hints = new ArrayList<IJavaQueryHint>(); + this.hints = new ArrayList<JavaQueryHint>(); } protected E query() { @@ -49,7 +52,7 @@ public abstract class AbstractJavaQuery<E extends Query> extends JavaContextMode String oldName = this.name; this.name = newName; this.queryResource.setName(newName); - firePropertyChanged(IQuery.NAME_PROPERTY, oldName, newName); + firePropertyChanged(Query.NAME_PROPERTY, oldName, newName); } public String getQuery() { @@ -60,47 +63,47 @@ public abstract class AbstractJavaQuery<E extends Query> extends JavaContextMode String oldQuery = this.query; this.query = newQuery; this.queryResource.setQuery(newQuery); - firePropertyChanged(IQuery.QUERY_PROPERTY, oldQuery, newQuery); + firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery); } - public ListIterator<IJavaQueryHint> hints() { - return new CloneListIterator<IJavaQueryHint>(this.hints); + public ListIterator<JavaQueryHint> hints() { + return new CloneListIterator<JavaQueryHint>(this.hints); } public int hintsSize() { return this.hints.size(); } - public IJavaQueryHint addHint(int index) { - IJavaQueryHint hint = jpaFactory().createJavaQueryHint(this); + public JavaQueryHint addHint(int index) { + JavaQueryHint hint = jpaFactory().buildJavaQueryHint(this); this.hints.add(index, hint); this.query().addHint(index); - this.fireItemAdded(IQuery.HINTS_LIST, index, hint); + this.fireItemAdded(Query.HINTS_LIST, index, hint); return hint; } - protected void addHint(int index, IJavaQueryHint hint) { - addItemToList(index, hint, this.hints, IQuery.HINTS_LIST); + protected void addHint(int index, JavaQueryHint hint) { + addItemToList(index, hint, this.hints, Query.HINTS_LIST); } - public void removeHint(IQueryHint queryHint) { + public void removeHint(QueryHint queryHint) { removeHint(this.hints.indexOf(queryHint)); } public void removeHint(int index) { - IJavaQueryHint removedHint = this.hints.remove(index); + JavaQueryHint removedHint = this.hints.remove(index); this.query().removeHint(index); - fireItemRemoved(IQuery.HINTS_LIST, index, removedHint); + fireItemRemoved(Query.HINTS_LIST, index, removedHint); } - protected void removeHint_(IJavaQueryHint hint) { - removeItemFromList(hint, this.hints, IQuery.HINTS_LIST); + protected void removeHint_(JavaQueryHint hint) { + removeItemFromList(hint, this.hints, Query.HINTS_LIST); } public void moveHint(int targetIndex, int sourceIndex) { CollectionTools.move(this.hints, targetIndex, sourceIndex); this.query().moveHint(targetIndex, sourceIndex); - fireItemMoved(IQuery.HINTS_LIST, targetIndex, sourceIndex); + fireItemMoved(Query.HINTS_LIST, targetIndex, sourceIndex); } public void initializeFromResource(E queryResource) { @@ -118,18 +121,18 @@ public abstract class AbstractJavaQuery<E extends Query> extends JavaContextMode } protected void initializeQueryHints(E queryResource) { - ListIterator<QueryHint> annotations = queryResource.hints(); + ListIterator<QueryHintAnnotation> annotations = queryResource.hints(); while(annotations.hasNext()) { this.hints.add(createQueryHint(annotations.next())); } } protected void updateQueryHints(E queryResource) { - ListIterator<IJavaQueryHint> hints = hints(); - ListIterator<QueryHint> resourceHints = queryResource.hints(); + ListIterator<JavaQueryHint> hints = hints(); + ListIterator<QueryHintAnnotation> resourceHints = queryResource.hints(); while (hints.hasNext()) { - IJavaQueryHint hint = hints.next(); + JavaQueryHint hint = hints.next(); if (resourceHints.hasNext()) { hint.update(resourceHints.next()); } @@ -143,13 +146,13 @@ public abstract class AbstractJavaQuery<E extends Query> extends JavaContextMode } } - protected IJavaQueryHint createQueryHint(QueryHint hintResource) { - IJavaQueryHint queryHint = jpaFactory().createJavaQueryHint(this); + protected JavaQueryHint createQueryHint(QueryHintAnnotation hintResource) { + JavaQueryHint queryHint = jpaFactory().buildJavaQueryHint(this); queryHint.initializeFromResource(hintResource); return queryHint; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java index 79a805f5a9..d959191b13 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -10,35 +10,37 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.RelationshipMappingTools; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.RelationshipMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaRelationshipMapping; +import org.eclipse.jpt.core.internal.context.RelationshipMappingTools; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public abstract class JavaRelationshipMapping<T extends RelationshipMapping> extends JavaAttributeMapping - implements IJavaRelationshipMapping +public abstract class AbstractJavaRelationshipMapping<T extends RelationshipMappingAnnotation> extends AbstractJavaAttributeMapping + implements JavaRelationshipMapping { protected String specifiedTargetEntity; protected String defaultTargetEntity; - protected IEntity resolvedTargetEntity; + protected Entity resolvedTargetEntity; protected final JavaCascade cascade; protected FetchType specifiedFetch; - protected JavaRelationshipMapping(IJavaPersistentAttribute parent) { + protected AbstractJavaRelationshipMapping(JavaPersistentAttribute parent) { super(parent); this.cascade = new JavaCascade(this); } @@ -57,7 +59,7 @@ public abstract class JavaRelationshipMapping<T extends RelationshipMapping> ext String oldSpecifiedTargetEntity = this.specifiedTargetEntity; this.specifiedTargetEntity = newSpecifiedTargetEntity; this.relationshipMapping().setTargetEntity(newSpecifiedTargetEntity); - firePropertyChanged(IRelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity); + firePropertyChanged(RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY, oldSpecifiedTargetEntity, newSpecifiedTargetEntity); } public String getDefaultTargetEntity() { @@ -67,17 +69,17 @@ public abstract class JavaRelationshipMapping<T extends RelationshipMapping> ext protected void setDefaultTargetEntity(String newDefaultTargetEntity) { String oldDefaultTargetEntity = this.defaultTargetEntity; this.defaultTargetEntity = newDefaultTargetEntity; - firePropertyChanged(IRelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY, oldDefaultTargetEntity, newDefaultTargetEntity); + firePropertyChanged(RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY, oldDefaultTargetEntity, newDefaultTargetEntity); } - public IEntity getResolvedTargetEntity() { + public Entity getResolvedTargetEntity() { return this.resolvedTargetEntity; } - protected void setResolvedTargetEntity(IEntity newResolvedTargetEntity) { - IEntity oldResolvedTargetEntity = this.resolvedTargetEntity; + protected void setResolvedTargetEntity(Entity newResolvedTargetEntity) { + Entity oldResolvedTargetEntity = this.resolvedTargetEntity; this.resolvedTargetEntity = newResolvedTargetEntity; - firePropertyChanged(IRelationshipMapping.RESOLVED_TARGET_ENTITY_PROPERTY, oldResolvedTargetEntity, newResolvedTargetEntity); + firePropertyChanged(RelationshipMapping.RESOLVED_TARGET_ENTITY_PROPERTY, oldResolvedTargetEntity, newResolvedTargetEntity); } public JavaCascade getCascade() { @@ -96,18 +98,18 @@ public abstract class JavaRelationshipMapping<T extends RelationshipMapping> ext FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; this.relationshipMapping().setFetch(FetchType.toJavaResourceModel(newSpecifiedFetch)); - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.defaultTargetEntity = this.defaultTargetEntity(persistentAttributeResource); initialize(this.relationshipMapping()); } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.setDefaultTargetEntity(this.defaultTargetEntity(persistentAttributeResource)); this.update(this.relationshipMapping()); @@ -135,9 +137,9 @@ public abstract class JavaRelationshipMapping<T extends RelationshipMapping> ext return relationshipMapping.getTargetEntity(); } - protected abstract String defaultTargetEntity(JavaPersistentAttributeResource persistentAttributeResource); + protected abstract String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource); - protected IEntity resolveTargetEntity(T relationshipMapping) { + protected Entity resolveTargetEntity(T relationshipMapping) { String qualifiedTargetEntity = getDefaultTargetEntity(); if (getSpecifiedTargetEntity() != null) { qualifiedTargetEntity = relationshipMapping.getFullyQualifiedTargetEntity(); @@ -145,22 +147,22 @@ public abstract class JavaRelationshipMapping<T extends RelationshipMapping> ext if (qualifiedTargetEntity == null) { return null; } - IPersistentType persistentType = persistenceUnit().persistentType(qualifiedTargetEntity); - if (persistentType != null && persistentType.mappingKey() == IMappingKeys.ENTITY_TYPE_MAPPING_KEY) { - return (IEntity) persistentType.getMapping(); + PersistentType persistentType = persistenceUnit().persistentType(qualifiedTargetEntity); + if (persistentType != null && persistentType.mappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { + return (Entity) persistentType.getMapping(); } return null; } - public IEntity getEntity() { - if (typeMapping() instanceof IEntity) { - return (IEntity) typeMapping(); + public Entity getEntity() { + if (typeMapping() instanceof Entity) { + return (Entity) typeMapping(); } return null; } public Iterator<String> allTargetEntityAttributeNames() { - IEntity targetEntity = this.getResolvedTargetEntity(); + Entity targetEntity = this.getResolvedTargetEntity(); return (targetEntity == null) ? EmptyIterator.<String> instance() : targetEntity.persistentType().allAttributeNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index a49464772e..38af18975a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -14,23 +14,26 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ISingleRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; -import org.eclipse.jpt.core.internal.resource.java.JoinColumn; -import org.eclipse.jpt.core.internal.resource.java.JoinColumns; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.SingleRelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaSingleRelationshipMapping; import org.eclipse.jpt.core.internal.resource.java.NullJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.RelationshipMapping; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JoinColumns; +import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; @@ -40,27 +43,27 @@ import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public abstract class JavaSingleRelationshipMapping<T extends RelationshipMapping> - extends JavaRelationshipMapping<T> implements IJavaSingleRelationshipMapping +public abstract class AbstractJavaSingleRelationshipMapping<T extends RelationshipMappingAnnotation> + extends AbstractJavaRelationshipMapping<T> implements JavaSingleRelationshipMapping { - protected final List<IJavaJoinColumn> specifiedJoinColumns; + protected final List<JavaJoinColumn> specifiedJoinColumns; - protected IJavaJoinColumn defaultJoinColumn; + protected JavaJoinColumn defaultJoinColumn; protected Boolean specifiedOptional; - protected JavaSingleRelationshipMapping(IJavaPersistentAttribute parent) { + protected AbstractJavaSingleRelationshipMapping(JavaPersistentAttribute parent) { super(parent); - this.specifiedJoinColumns = new ArrayList<IJavaJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>(); } public FetchType getDefaultFetch() { - return ISingleRelationshipMapping.DEFAULT_FETCH_TYPE; + return SingleRelationshipMapping.DEFAULT_FETCH_TYPE; } //***************** ISingleRelationshipMapping implementation ***************** - public ListIterator<IJavaJoinColumn> joinColumns() { + public ListIterator<JavaJoinColumn> joinColumns() { return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumns() : this.defaultJoinColumns(); } @@ -68,19 +71,19 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumnsSize() : this.defaultJoinColumnsSize(); } - public IJavaJoinColumn getDefaultJoinColumn() { + public JavaJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(IJavaJoinColumn newJoinColumn) { - IJavaJoinColumn oldJoinColumn = this.defaultJoinColumn; + protected void setDefaultJoinColumn(JavaJoinColumn newJoinColumn) { + JavaJoinColumn oldJoinColumn = this.defaultJoinColumn; this.defaultJoinColumn = newJoinColumn; - firePropertyChanged(ISingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn); + firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn); } - protected ListIterator<IJavaJoinColumn> defaultJoinColumns() { + protected ListIterator<JavaJoinColumn> defaultJoinColumns() { if (this.defaultJoinColumn != null) { - return new SingleElementListIterator<IJavaJoinColumn>(this.defaultJoinColumn); + return new SingleElementListIterator<JavaJoinColumn>(this.defaultJoinColumn); } return EmptyListIterator.instance(); } @@ -89,8 +92,8 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return (this.defaultJoinColumn == null) ? 0 : 1; } - public ListIterator<IJavaJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<IJavaJoinColumn>(this.specifiedJoinColumns); + public ListIterator<JavaJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { @@ -101,8 +104,8 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return !this.specifiedJoinColumns.isEmpty(); } - public IJavaJoinColumn addSpecifiedJoinColumn(int index) { - IJoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn(); + public JavaJoinColumn addSpecifiedJoinColumn(int index) { + JoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn(); if (oldDefaultJoinColumn != null) { //null the default join column now if one already exists. //if one does not exist, there is already a specified join column. @@ -110,49 +113,49 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin //cause change notifications to be sent to the UI in the wrong order this.defaultJoinColumn = null; } - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); - JoinColumn joinColumnResource = (JoinColumn) this.persistentAttributeResource.addAnnotation(index, JoinColumn.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + JoinColumnAnnotation joinColumnResource = (JoinColumnAnnotation) this.persistentAttributeResource.addAnnotation(index, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); joinColumn.initializeFromResource(joinColumnResource); - this.fireItemAdded(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); if (oldDefaultJoinColumn != null) { - this.firePropertyChanged(ISingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null); + this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null); } return joinColumn; } - protected void addSpecifiedJoinColumn(int index, IJavaJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); } - public void removeSpecifiedJoinColumn(IJoinColumn joinColumn) { + public void removeSpecifiedJoinColumn(JoinColumn joinColumn) { this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn)); } public void removeSpecifiedJoinColumn(int index) { - IJavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); if (!containsSpecifiedJoinColumns()) { //create the defaultJoinColumn now or this will happen during project update //after removing the join column from the resource model. That causes problems //in the UI because the change notifications end up in the wrong order. this.defaultJoinColumn = createJoinColumn(new NullJoinColumn(this.persistentAttributeResource)); } - this.persistentAttributeResource.removeAnnotation(index, JoinColumn.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); - fireItemRemoved(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); + this.persistentAttributeResource.removeAnnotation(index, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + fireItemRemoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); if (this.defaultJoinColumn != null) { //fire change notification if a defaultJoinColumn was created above - this.firePropertyChanged(ISingleRelationshipMapping.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn); + this.firePropertyChanged(SingleRelationshipMapping.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn); } } - protected void removeSpecifiedJoinColumn_(IJavaJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn_(JavaJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex); this.persistentAttributeResource.move(targetIndex, sourceIndex, JoinColumns.ANNOTATION_NAME); - fireItemMoved(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } public Boolean getOptional() { @@ -160,7 +163,7 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin } public Boolean getDefaultOptional() { - return INullable.DEFAULT_OPTIONAL; + return Nullable.DEFAULT_OPTIONAL; } public Boolean getSpecifiedOptional() { @@ -171,14 +174,14 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin Boolean oldSpecifiedOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; setOptionalOnResourceModel(newSpecifiedOptional); - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); } protected abstract void setOptionalOnResourceModel(Boolean newOptional); @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.initializeSpecifiedJoinColumns(persistentAttributeResource); this.initializeDefaultJoinColumn(persistentAttributeResource); @@ -190,11 +193,11 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin this.specifiedOptional = this.specifiedOptional(relationshipMapping); } - protected void initializeSpecifiedJoinColumns(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<JavaResource> annotations = persistentAttributeResource.annotations(JoinColumn.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + protected void initializeSpecifiedJoinColumns(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaResourceNode> annotations = persistentAttributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); while(annotations.hasNext()) { - this.specifiedJoinColumns.add(createJoinColumn((JoinColumn) annotations.next())); + this.specifiedJoinColumns.add(createJoinColumn((JoinColumnAnnotation) annotations.next())); } } @@ -202,17 +205,17 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return !containsSpecifiedJoinColumns() && isRelationshipOwner(); } - protected void initializeDefaultJoinColumn(JavaPersistentAttributeResource persistentAttributeResource) { + protected void initializeDefaultJoinColumn(JavaResourcePersistentAttribute persistentAttributeResource) { if (!shouldBuildDefaultJoinColumn()) { return; } - this.defaultJoinColumn = this.jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + this.defaultJoinColumn = this.jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.defaultJoinColumn.initializeFromResource(new NullJoinColumn(persistentAttributeResource)); } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.updateSpecifiedJoinColumns(persistentAttributeResource); this.updateDefaultJoinColumn(persistentAttributeResource); @@ -227,14 +230,14 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin protected abstract Boolean specifiedOptional(T relationshipMapping); - protected void updateSpecifiedJoinColumns(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<IJavaJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JavaResource> resourceJoinColumns = persistentAttributeResource.annotations(JoinColumn.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); + protected void updateSpecifiedJoinColumns(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<JavaResourceNode> resourceJoinColumns = persistentAttributeResource.annotations(JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); while (joinColumns.hasNext()) { - IJavaJoinColumn joinColumn = joinColumns.next(); + JavaJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { - joinColumn.update((JoinColumn) resourceJoinColumns.next()); + joinColumn.update((JoinColumnAnnotation) resourceJoinColumns.next()); } else { removeSpecifiedJoinColumn_(joinColumn); @@ -242,17 +245,17 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin } while (resourceJoinColumns.hasNext()) { - addSpecifiedJoinColumn(specifiedJoinColumnsSize(), createJoinColumn((JoinColumn) resourceJoinColumns.next())); + addSpecifiedJoinColumn(specifiedJoinColumnsSize(), createJoinColumn((JoinColumnAnnotation) resourceJoinColumns.next())); } } - protected void updateDefaultJoinColumn(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateDefaultJoinColumn(JavaResourcePersistentAttribute persistentAttributeResource) { if (!shouldBuildDefaultJoinColumn()) { setDefaultJoinColumn(null); return; } if (getDefaultJoinColumn() == null) { - IJavaJoinColumn joinColumn = this.jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = this.jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(new NullJoinColumn(persistentAttributeResource)); this.setDefaultJoinColumn(joinColumn); } @@ -261,13 +264,13 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin } } - protected IJavaJoinColumn createJoinColumn(JoinColumn joinColumnResource) { - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + protected JavaJoinColumn createJoinColumn(JoinColumnAnnotation joinColumnResource) { + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } - protected IJoinColumn.Owner createJoinColumnOwner() { + protected JoinColumn.Owner createJoinColumnOwner() { return new JoinColumnOwner(); } @@ -275,7 +278,7 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin * eliminate any "container" types */ @Override - protected String defaultTargetEntity(JavaPersistentAttributeResource persistentAttributeResource) { + protected String defaultTargetEntity(JavaResourcePersistentAttribute persistentAttributeResource) { if (persistentAttributeResource.typeIsContainer()) { return null; } @@ -288,7 +291,7 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin if (result != null) { return result; } - for (IJavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { + for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; @@ -314,16 +317,16 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin protected void addJoinColumnMessages(List<IMessage> messages, CompilationUnit astRoot) { - for (Iterator<IJavaJoinColumn> stream = this.joinColumns(); stream.hasNext();) { - IJavaJoinColumn joinColumn = stream.next(); + for (Iterator<JavaJoinColumn> stream = this.joinColumns(); stream.hasNext();) { + JavaJoinColumn joinColumn = stream.next(); String table = joinColumn.getTable(); boolean doContinue = joinColumn.isConnected(); if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE, + JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {table, joinColumn.getName()}, joinColumn, joinColumn.tableTextRange(astRoot)) ); @@ -332,9 +335,9 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin if (doContinue && ! joinColumn.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, joinColumn, joinColumn.nameTextRange(astRoot)) ); @@ -342,9 +345,9 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin if (doContinue && ! joinColumn.isReferencedColumnResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) ); @@ -353,7 +356,7 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin } - public class JoinColumnOwner implements IJoinColumn.Owner + public class JoinColumnOwner implements JoinColumn.Owner { public JoinColumnOwner() { @@ -364,23 +367,23 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return JavaSingleRelationshipMapping.this.typeMapping().tableName(); + return AbstractJavaSingleRelationshipMapping.this.typeMapping().tableName(); } - public IEntity targetEntity() { - return JavaSingleRelationshipMapping.this.getResolvedTargetEntity(); + public Entity targetEntity() { + return AbstractJavaSingleRelationshipMapping.this.getResolvedTargetEntity(); } public String attributeName() { - return JavaSingleRelationshipMapping.this.persistentAttribute().getName(); + return AbstractJavaSingleRelationshipMapping.this.persistentAttribute().getName(); } - public IRelationshipMapping relationshipMapping() { - return JavaSingleRelationshipMapping.this; + public RelationshipMapping relationshipMapping() { + return AbstractJavaSingleRelationshipMapping.this; } public boolean tableNameIsInvalid(String tableName) { - return JavaSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); + return AbstractJavaSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); } /** @@ -390,8 +393,8 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return true; } - public ITypeMapping typeMapping() { - return JavaSingleRelationshipMapping.this.typeMapping(); + public TypeMapping typeMapping() { + return AbstractJavaSingleRelationshipMapping.this.typeMapping(); } public Table dbTable(String tableName) { @@ -399,12 +402,12 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin } public Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaSingleRelationshipMapping.this.defaultJoinColumn == joinColumn; + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return AbstractJavaSingleRelationshipMapping.this.defaultJoinColumn == joinColumn; } public String defaultColumnName() { @@ -412,13 +415,13 @@ public abstract class JavaSingleRelationshipMapping<T extends RelationshipMappin return null; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub - return JavaSingleRelationshipMapping.this.validationTextRange(astRoot); + return AbstractJavaSingleRelationshipMapping.this.validationTextRange(astRoot); } public int joinColumnsSize() { - return JavaSingleRelationshipMapping.this.joinColumnsSize(); + return AbstractJavaSingleRelationshipMapping.this.joinColumnsSize(); } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java index 1c44012f94..0f0cc8425f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java @@ -11,9 +11,10 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.resource.java.Table; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.TableAnnotation; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.NameTools; @@ -36,11 +37,11 @@ public abstract class AbstractJavaTable extends JavaContextModel // protected EList<IUniqueConstraint> uniqueConstraints; - protected AbstractJavaTable(IJavaJpaContextNode parent) { + protected AbstractJavaTable(JavaJpaContextNode parent) { super(parent); } - protected void initializeFromResource(Table table) { + protected void initializeFromResource(TableAnnotation table) { this.defaultName = this.defaultName(); this.defaultSchema = this.defaultSchema(); this.defaultCatalog = this.defaultCatalog(); @@ -53,7 +54,7 @@ public abstract class AbstractJavaTable extends JavaContextModel * Return the java table resource, do not return null if the java annotation does not exist. * Use a null resource object instead of null. */ - protected abstract Table tableResource(); + protected abstract TableAnnotation tableResource(); /** * Return the fully qualified annotation name of the java table resource @@ -72,7 +73,7 @@ public abstract class AbstractJavaTable extends JavaContextModel String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; tableResource().setName(newSpecifiedName); - firePropertyChanged(ITable.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); + firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } /** @@ -84,7 +85,7 @@ public abstract class AbstractJavaTable extends JavaContextModel protected void setSpecifiedName_(String newSpecifiedName) { String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; - firePropertyChanged(ITable.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); + firePropertyChanged(Table.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } public String getDefaultName() { @@ -103,7 +104,7 @@ public abstract class AbstractJavaTable extends JavaContextModel String oldSpecifiedCatalog = this.specifiedCatalog; this.specifiedCatalog = newSpecifiedCatalog; tableResource().setCatalog(newSpecifiedCatalog); - firePropertyChanged(ITable.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog); + firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog); } /** @@ -115,7 +116,7 @@ public abstract class AbstractJavaTable extends JavaContextModel protected void setSpecifiedCatalog_(String newSpecifiedCatalog) { String oldSpecifiedCatalog = this.specifiedCatalog; this.specifiedCatalog = newSpecifiedCatalog; - firePropertyChanged(ITable.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog); + firePropertyChanged(Table.SPECIFIED_CATALOG_PROPERTY, oldSpecifiedCatalog, newSpecifiedCatalog); } public String getDefaultCatalog() { @@ -134,7 +135,7 @@ public abstract class AbstractJavaTable extends JavaContextModel String oldSpecifiedSchema = this.specifiedSchema; this.specifiedSchema = newSpecifiedSchema; tableResource().setSchema(newSpecifiedSchema); - firePropertyChanged(ITable.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema); + firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema); } /** @@ -146,7 +147,7 @@ public abstract class AbstractJavaTable extends JavaContextModel protected void setSpecifiedSchema_(String newSpecifiedSchema) { String oldSpecifiedSchema = this.specifiedSchema; this.specifiedSchema = newSpecifiedSchema; - firePropertyChanged(ITable.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema); + firePropertyChanged(Table.SPECIFIED_SCHEMA_PROPERTY, oldSpecifiedSchema, newSpecifiedSchema); } public String getDefaultSchema() { @@ -164,8 +165,8 @@ public abstract class AbstractJavaTable extends JavaContextModel // ********** ITable implementation ********** - public ITextRange nameTextRange(CompilationUnit astRoot) { - ITextRange textRange = tableResource().nameTextRange(astRoot); + public TextRange nameTextRange(CompilationUnit astRoot) { + TextRange textRange = tableResource().nameTextRange(astRoot); return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); } @@ -173,8 +174,8 @@ public abstract class AbstractJavaTable extends JavaContextModel return tableResource().nameTouches(pos, astRoot); } - public ITextRange schemaTextRange(CompilationUnit astRoot) { - ITextRange textRange = tableResource().schemaTextRange(astRoot); + public TextRange schemaTextRange(CompilationUnit astRoot) { + TextRange textRange = tableResource().schemaTextRange(astRoot); return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); } @@ -182,7 +183,7 @@ public abstract class AbstractJavaTable extends JavaContextModel return tableResource().schemaTouches(pos, astRoot); } - public ITextRange catalogTextRange(CompilationUnit astRoot) { + public TextRange catalogTextRange(CompilationUnit astRoot) { return tableResource().catalogTextRange(astRoot); } @@ -193,19 +194,19 @@ public abstract class AbstractJavaTable extends JavaContextModel protected void setDefaultName(String newDefaultName) { String oldDefaultName = this.defaultName; this.defaultName = newDefaultName; - firePropertyChanged(ITable.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); + firePropertyChanged(Table.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); } protected void setDefaultCatalog(String newDefaultCatalog) { String oldDefaultCatalog = this.defaultCatalog; this.defaultCatalog = newDefaultCatalog; - firePropertyChanged(ITable.DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog); + firePropertyChanged(Table.DEFAULT_CATALOG_PROPERTY, oldDefaultCatalog, newDefaultCatalog); } protected void setDefaultSchema(String newDefaultSchema) { String oldDefaultSchema = this.defaultSchema; this.defaultSchema = newDefaultSchema; - firePropertyChanged(ITable.DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema); + firePropertyChanged(Table.DEFAULT_SCHEMA_PROPERTY, oldDefaultSchema, newDefaultSchema); } // public IUniqueConstraint createUniqueConstraint(int index) { @@ -216,7 +217,7 @@ public abstract class AbstractJavaTable extends JavaContextModel - protected void update(Table table) { + protected void update(TableAnnotation table) { this.setSpecifiedName_(table.getName()); this.setSpecifiedSchema_(table.getSchema()); this.setSpecifiedCatalog_(table.getCatalog()); @@ -286,12 +287,12 @@ public abstract class AbstractJavaTable extends JavaContextModel // } @Override - public IJavaJpaContextNode parent() { - return (IJavaJpaContextNode) super.parent(); + public JavaJpaContextNode parent() { + return (JavaJpaContextNode) super.parent(); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = tableResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = tableResource().textRange(astRoot); return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java index 4236a5a53e..ac72924b32 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java @@ -11,44 +11,45 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -public abstract class JavaTypeMapping extends JavaContextModel - implements IJavaTypeMapping +public abstract class AbstractJavaTypeMapping extends JavaContextModel + implements JavaTypeMapping { - protected JavaPersistentTypeResource persistentTypeResource; + protected JavaResourcePersistentType persistentTypeResource; - protected JavaTypeMapping(IJavaPersistentType parent) { + protected AbstractJavaTypeMapping(JavaPersistentType parent) { super(parent); } - protected JavaResource mappingResource() { + protected JavaResourceNode mappingResource() { return this.persistentTypeResource.mappingAnnotation(annotationName()); } //***************** ITypeMapping implementation ***************** - public IJavaPersistentType persistentType() { - return (IJavaPersistentType) parent(); + public JavaPersistentType persistentType() { + return (JavaPersistentType) parent(); } public String tableName() { return null; } - public Table primaryDbTable() { + public org.eclipse.jpt.db.internal.Table primaryDbTable() { return null; } - public Table dbTable(String tableName) { + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { return null; } @@ -60,7 +61,7 @@ public abstract class JavaTypeMapping extends JavaContextModel return true; } - public Iterator<ITable> associatedTables() { + public Iterator<Table> associatedTables() { return EmptyIterator.instance(); } @@ -68,7 +69,7 @@ public abstract class JavaTypeMapping extends JavaContextModel return EmptyIterator.instance(); } - public Iterator<ITable> associatedTablesIncludingInherited() { + public Iterator<Table> associatedTablesIncludingInherited() { return EmptyIterator.instance(); } @@ -93,18 +94,18 @@ public abstract class JavaTypeMapping extends JavaContextModel } //******************** updatating ********************* - public void initializeFromResource(JavaPersistentTypeResource persistentTypeResource) { + public void initializeFromResource(JavaResourcePersistentType persistentTypeResource) { this.persistentTypeResource = persistentTypeResource; } - public void update(JavaPersistentTypeResource persistentTypeResource) { + public void update(JavaResourcePersistentType persistentTypeResource) { this.persistentTypeResource = persistentTypeResource; } //******************** validation ********************* - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = this.mappingResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = this.mappingResource().textRange(astRoot); return (textRange != null) ? textRange : this.persistentType().validationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java index 7a7d6437b5..dc8eb4aa97 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java @@ -14,41 +14,44 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.java.JoinColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaAssociationOverride; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class JavaAssociationOverride extends JavaOverride<AssociationOverride> - implements IJavaAssociationOverride +public class GenericJavaAssociationOverride extends JavaOverride<AssociationOverrideAnnotation> + implements JavaAssociationOverride { - protected final List<IJavaJoinColumn> specifiedJoinColumns; + protected final List<JavaJoinColumn> specifiedJoinColumns; - protected final List<IJavaJoinColumn> defaultJoinColumns; + protected final List<JavaJoinColumn> defaultJoinColumns; - public JavaAssociationOverride(IJavaJpaContextNode parent, IAssociationOverride.Owner owner) { + public GenericJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner) { super(parent, owner); - this.specifiedJoinColumns = new ArrayList<IJavaJoinColumn>(); - this.defaultJoinColumns = new ArrayList<IJavaJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>(); + this.defaultJoinColumns = new ArrayList<JavaJoinColumn>(); } @Override - public IAssociationOverride.Owner owner() { - return (IAssociationOverride.Owner) super.owner(); + public AssociationOverride.Owner owner() { + return (AssociationOverride.Owner) super.owner(); } - public ListIterator<IJavaJoinColumn> joinColumns() { + public ListIterator<JavaJoinColumn> joinColumns() { return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns(); } @@ -56,52 +59,52 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize(); } - public ListIterator<IJavaJoinColumn> defaultJoinColumns() { - return new CloneListIterator<IJavaJoinColumn>(this.defaultJoinColumns); + public ListIterator<JavaJoinColumn> defaultJoinColumns() { + return new CloneListIterator<JavaJoinColumn>(this.defaultJoinColumns); } public int defaultJoinColumnsSize() { return this.defaultJoinColumns.size(); } - public ListIterator<IJavaJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<IJavaJoinColumn>(this.specifiedJoinColumns); + public ListIterator<JavaJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { return this.specifiedJoinColumns.size(); } - public IJavaJoinColumn addSpecifiedJoinColumn(int index) { - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + public JavaJoinColumn addSpecifiedJoinColumn(int index) { + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); - JoinColumn joinColumnResource = this.overrideResource.addJoinColumn(index); + JoinColumnAnnotation joinColumnResource = this.overrideResource.addJoinColumn(index); joinColumn.initializeFromResource(joinColumnResource); - this.fireItemAdded(IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } - protected IJoinColumn.Owner createJoinColumnOwner() { + protected JoinColumn.Owner createJoinColumnOwner() { return new JoinColumnOwner(); } - protected void addSpecifiedJoinColumn(int index, IJavaJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public void removeSpecifiedJoinColumn(int index) { - IJavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); this.overrideResource.removeJoinColumn(index); - fireItemRemoved(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn); } - protected void removeSpecifiedJoinColumn(IJavaJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn(JavaJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { this.overrideResource.moveJoinColumn(targetIndex, sourceIndex); - moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public boolean containsSpecifiedJoinColumns() { @@ -120,7 +123,7 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> if (result != null) { return result; } - for (IJavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { + for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; @@ -130,14 +133,14 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> } @Override - public void initializeFromResource(AssociationOverride associationOverride) { + public void initializeFromResource(AssociationOverrideAnnotation associationOverride) { super.initializeFromResource(associationOverride); this.name = associationOverride.getName(); initializeSpecifiedJoinColumns(associationOverride); } - protected void initializeSpecifiedJoinColumns(AssociationOverride associationOverride) { - ListIterator<JoinColumn> annotations = associationOverride.joinColumns(); + protected void initializeSpecifiedJoinColumns(AssociationOverrideAnnotation associationOverride) { + ListIterator<JoinColumnAnnotation> annotations = associationOverride.joinColumns(); while(annotations.hasNext()) { this.specifiedJoinColumns.add(createJoinColumn(annotations.next())); @@ -145,17 +148,17 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> } @Override - public void update(AssociationOverride associationOverride) { + public void update(AssociationOverrideAnnotation associationOverride) { super.update(associationOverride); updateSpecifiedJoinColumns(associationOverride); } - protected void updateSpecifiedJoinColumns(AssociationOverride associationOverride) { - ListIterator<IJavaJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = associationOverride.joinColumns(); + protected void updateSpecifiedJoinColumns(AssociationOverrideAnnotation associationOverride) { + ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<JoinColumnAnnotation> resourceJoinColumns = associationOverride.joinColumns(); while (joinColumns.hasNext()) { - IJavaJoinColumn joinColumn = joinColumns.next(); + JavaJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -170,13 +173,13 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> } - protected IJavaJoinColumn createJoinColumn(JoinColumn joinColumnResource) { - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + protected JavaJoinColumn createJoinColumn(JoinColumnAnnotation joinColumnResource) { + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } - public class JoinColumnOwner implements IJoinColumn.Owner + public class JoinColumnOwner implements JoinColumn.Owner { public JoinColumnOwner() { @@ -187,24 +190,24 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return JavaAssociationOverride.this.owner.typeMapping().tableName(); + return GenericJavaAssociationOverride.this.owner.typeMapping().tableName(); } public String defaultColumnName() { return null; } - public IEntity targetEntity() { - IRelationshipMapping relationshipMapping = relationshipMapping(); + public Entity targetEntity() { + RelationshipMapping relationshipMapping = relationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity(); } public String attributeName() { - return JavaAssociationOverride.this.getName(); + return GenericJavaAssociationOverride.this.getName(); } - public IRelationshipMapping relationshipMapping() { - return JavaAssociationOverride.this.owner().relationshipMapping(JavaAssociationOverride.this.getName()); + public RelationshipMapping relationshipMapping() { + return GenericJavaAssociationOverride.this.owner().relationshipMapping(GenericJavaAssociationOverride.this.getName()); } public boolean tableNameIsInvalid(String tableName) { @@ -218,13 +221,13 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> return true; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITypeMapping typeMapping() { - return JavaAssociationOverride.this.owner.typeMapping(); + public TypeMapping typeMapping() { + return GenericJavaAssociationOverride.this.owner.typeMapping(); } public Table dbTable(String tableName) { @@ -232,16 +235,16 @@ public class JavaAssociationOverride extends JavaOverride<AssociationOverride> } public Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaAssociationOverride.this.defaultJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericJavaAssociationOverride.this.defaultJoinColumns.contains(joinColumn); } public int joinColumnsSize() { - return JavaAssociationOverride.this.joinColumnsSize(); + return GenericJavaAssociationOverride.this.joinColumnsSize(); } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java index 1a32759cba..129fac769f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java @@ -11,38 +11,41 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.java.Column; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.Filter; -public class JavaAttributeOverride extends JavaOverride<AttributeOverride> - implements IJavaAttributeOverride +public class GenericJavaAttributeOverride extends JavaOverride<AttributeOverrideAnnotation> + implements JavaAttributeOverride { - protected final IJavaColumn column; + protected final JavaColumn column; - public JavaAttributeOverride(IJavaJpaContextNode parent, IAttributeOverride.Owner owner) { + public GenericJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner) { super(parent, owner); - this.column = jpaFactory().createJavaColumn(this, this); + this.column = jpaFactory().buildJavaColumn(this, this); } @Override - public IAttributeOverride.Owner owner() { - return (IAttributeOverride.Owner) super.owner(); + public AttributeOverride.Owner owner() { + return (AttributeOverride.Owner) super.owner(); } - public Column columnResource() { + public ColumnAnnotation columnResource() { return this.getOverrideResource().getNonNullColumn(); } public String defaultColumnName() { - IColumnMapping columnMapping = columnMapping(); + ColumnMapping columnMapping = columnMapping(); if (columnMapping == null) { return null; } @@ -50,7 +53,7 @@ public class JavaAttributeOverride extends JavaOverride<AttributeOverride> } public String defaultTableName() { - IColumnMapping columnMapping = columnMapping(); + ColumnMapping columnMapping = columnMapping(); if (columnMapping == null) { return null; } @@ -61,12 +64,12 @@ public class JavaAttributeOverride extends JavaOverride<AttributeOverride> return owner().typeMapping().tableName(); } - protected IColumnMapping columnMapping() { + protected ColumnMapping columnMapping() { return owner().columnMapping(getName()); } //************* IColumn.Owner implementation ************** - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return this.owner().typeMapping(); } @@ -76,7 +79,7 @@ public class JavaAttributeOverride extends JavaOverride<AttributeOverride> //************* IAttributeOverride implementation ************** - public IJavaColumn getColumn() { + public JavaColumn getColumn() { return this.column; } @@ -89,13 +92,13 @@ public class JavaAttributeOverride extends JavaOverride<AttributeOverride> //************* java resource model -> java context model ************** @Override - public void initializeFromResource(AttributeOverride attributeOverrideResource) { + public void initializeFromResource(AttributeOverrideAnnotation attributeOverrideResource) { super.initializeFromResource(attributeOverrideResource); this.column.initializeFromResource(this.columnResource()); } @Override - public void update(AttributeOverride attributeOverrideResource) { + public void update(AttributeOverrideAnnotation attributeOverrideResource) { super.update(attributeOverrideResource); this.column.update(this.columnResource()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java index 28751ff517..ea50dd7117 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java @@ -13,29 +13,32 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.EnumType; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.java.Basic; -import org.eclipse.jpt.core.internal.resource.java.Column; -import org.eclipse.jpt.core.internal.resource.java.Enumerated; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.Lob; -import org.eclipse.jpt.core.internal.resource.java.Temporal; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EnumType; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.Enumerated; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.Lob; +import org.eclipse.jpt.core.resource.java.Temporal; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasicMapping +public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping implements JavaBasicMapping { protected FetchType specifiedFetch; @@ -43,23 +46,23 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic protected EnumType specifiedEnumerated; - protected final IJavaColumn column; + protected final JavaColumn column; protected boolean lob; protected TemporalType temporal; - public JavaBasicMapping(IJavaPersistentAttribute parent) { + public GenericJavaBasicMapping(JavaPersistentAttribute parent) { super(parent); this.column = createJavaColumn(); } - protected IJavaColumn createJavaColumn() { - return jpaFactory().createJavaColumn(this, this); + protected JavaColumn createJavaColumn() { + return jpaFactory().buildJavaColumn(this, this); } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.column.initializeFromResource(this.columnResource()); Basic basicResource = this.mappingResource(); @@ -83,13 +86,13 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic return (Temporal) this.persistentAttributeResource.nonNullAnnotation(Temporal.ANNOTATION_NAME); } - public Column columnResource() { - return (Column) this.persistentAttributeResource.nonNullAnnotation(Column.ANNOTATION_NAME); + public ColumnAnnotation columnResource() { + return (ColumnAnnotation) this.persistentAttributeResource.nonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME); } //************** IJavaAttributeMapping implementation *************** public String getKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -114,7 +117,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic //************** IBasicMapping implementation *************** - public IJavaColumn getColumn() { + public JavaColumn getColumn() { return this.column; } @@ -123,7 +126,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic } public FetchType getDefaultFetch() { - return IBasicMapping.DEFAULT_FETCH_TYPE; + return BasicMapping.DEFAULT_FETCH_TYPE; } public FetchType getSpecifiedFetch() { @@ -134,7 +137,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; this.mappingResource().setFetch(FetchType.toJavaResourceModel(newSpecifiedFetch)); - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } /** @@ -146,7 +149,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) { FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } public Boolean getOptional() { @@ -154,7 +157,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic } public Boolean getDefaultOptional() { - return INullable.DEFAULT_OPTIONAL; + return Nullable.DEFAULT_OPTIONAL; } public Boolean getSpecifiedOptional() { @@ -165,7 +168,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic Boolean oldOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; this.mappingResource().setOptional(newSpecifiedOptional); - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); } @@ -186,7 +189,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic this.persistentAttributeResource.removeAnnotation(Lob.ANNOTATION_NAME); } } - firePropertyChanged(IBasicMapping.LOB_PROPERTY, oldLob, newLob); + firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob); } public TemporalType getTemporal() { @@ -197,7 +200,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.temporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } /** @@ -209,7 +212,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic protected void setTemporal_(TemporalType newTemporal) { TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } public EnumType getEnumerated() { @@ -217,7 +220,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic } public EnumType getDefaultEnumerated() { - return IBasicMapping.DEFAULT_ENUMERATED; + return BasicMapping.DEFAULT_ENUMERATED; } public EnumType getSpecifiedEnumerated() { @@ -228,7 +231,7 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic EnumType oldEnumerated = this.specifiedEnumerated; this.specifiedEnumerated = newSpecifiedEnumerated; this.enumeratedResource().setValue(EnumType.toJavaResourceModel(newSpecifiedEnumerated)); - firePropertyChanged(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); + firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); } /** @@ -240,11 +243,11 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic protected void setSpecifiedEnumerated_(EnumType newSpecifiedEnumerated) { EnumType oldEnumerated = this.specifiedEnumerated; this.specifiedEnumerated = newSpecifiedEnumerated; - firePropertyChanged(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); + firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.column.update(this.columnResource()); Basic basicResource = this.mappingResource(); @@ -268,11 +271,11 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic return EnumType.fromJavaResourceModel(enumerated.getValue()); } - protected boolean lob(JavaPersistentAttributeResource persistentAttributeResource) { + protected boolean lob(JavaResourcePersistentAttribute persistentAttributeResource) { return lobResource(persistentAttributeResource) != null; } - protected Lob lobResource(JavaPersistentAttributeResource persistentAttributeResource) { + protected Lob lobResource(JavaResourcePersistentAttribute persistentAttributeResource) { return (Lob) persistentAttributeResource.annotation(Lob.ANNOTATION_NAME); } @@ -309,15 +312,15 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic } protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) { - IJavaColumn column = this.getColumn(); + JavaColumn column = this.getColumn(); String table = column.getTable(); boolean doContinue = entityOwned() && column.isConnected(); if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_TABLE, + JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, column.tableTextRange(astRoot)) ); @@ -326,9 +329,9 @@ public class JavaBasicMapping extends JavaAttributeMapping implements IJavaBasic if (doContinue && ! column.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, column.nameTextRange(astRoot)) ); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java index adab09b64c..9ddf12aa12 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java @@ -10,11 +10,13 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.resource.java.Column; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColumn +public class GenericJavaColumn extends AbstractJavaColumn<ColumnAnnotation> implements JavaColumn { protected Integer specifiedLength; @@ -23,12 +25,12 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum protected Integer specifiedScale; - public JavaColumn(IJavaJpaContextNode parent, IJavaColumn.Owner owner) { + public GenericJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner) { super(parent, owner); } @Override - public void initializeFromResource(Column column) { + public void initializeFromResource(ColumnAnnotation column) { super.initializeFromResource(column); this.specifiedLength = this.specifiedLength(column); this.specifiedPrecision = this.specifiedPrecision(column); @@ -36,12 +38,12 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum } @Override - public IJavaColumn.Owner owner() { - return (IJavaColumn.Owner) super.owner(); + public JavaColumn.Owner owner() { + return (JavaColumn.Owner) super.owner(); } @Override - protected Column columnResource() { + protected ColumnAnnotation columnResource() { return this.owner().columnResource(); } @@ -50,7 +52,7 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum } public Integer getDefaultLength() { - return IColumn.DEFAULT_LENGTH; + return Column.DEFAULT_LENGTH; } public Integer getSpecifiedLength() { @@ -69,7 +71,7 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum } public Integer getDefaultPrecision() { - return IColumn.DEFAULT_PRECISION; + return Column.DEFAULT_PRECISION; } public Integer getSpecifiedPrecision() { @@ -88,7 +90,7 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum } public Integer getDefaultScale() { - return IColumn.DEFAULT_SCALE; + return Column.DEFAULT_SCALE; } public Integer getSpecifiedScale() { @@ -107,28 +109,28 @@ public class JavaColumn extends AbstractJavaColumn<Column> implements IJavaColum return true; } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = columnResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = columnResource().textRange(astRoot); return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); } @Override - public void update(Column column) { + public void update(ColumnAnnotation column) { super.update(column); this.setSpecifiedLength(this.specifiedLength(column)); this.setSpecifiedPrecision(this.specifiedPrecision(column)); this.setSpecifiedScale(this.specifiedScale(column)); } - protected Integer specifiedLength(Column column) { + protected Integer specifiedLength(ColumnAnnotation column) { return column.getLength(); } - protected Integer specifiedPrecision(Column column) { + protected Integer specifiedPrecision(ColumnAnnotation column) { return column.getPrecision(); } - protected Integer specifiedScale(Column column) { + protected Integer specifiedScale(ColumnAnnotation column) { return column.getScale(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java index 7ba970bd8b..a7d7fd35b7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java @@ -10,46 +10,48 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.DiscriminatorType; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.resource.java.DiscriminatorColumn; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentResource; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.DiscriminatorType; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn> - implements IJavaDiscriminatorColumn +public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<DiscriminatorColumnAnnotation> + implements JavaDiscriminatorColumn { protected DiscriminatorType specifiedDiscriminatorType; protected Integer specifiedLength; - protected JavaPersistentResource persistenceResource; + protected JavaResourcePersistentMember persistenceResource; - public JavaDiscriminatorColumn(IJavaEntity parent, INamedColumn.Owner owner) { + public GenericJavaDiscriminatorColumn(JavaEntity parent, NamedColumn.Owner owner) { super(parent, owner); } - public void initializeFromResource(JavaPersistentResource persistentResource) { + public void initializeFromResource(JavaResourcePersistentMember persistentResource) { this.persistenceResource = persistentResource; this.initializeFromResource(this.columnResource()); } @Override - public void initializeFromResource(DiscriminatorColumn column) { + public void initializeFromResource(DiscriminatorColumnAnnotation column) { super.initializeFromResource(column); this.specifiedDiscriminatorType = this.discriminatorType(column); this.specifiedLength = this.length(column); } - protected IJavaEntity javaEntity() { - return (IJavaEntity) super.parent(); + protected JavaEntity javaEntity() { + return (JavaEntity) super.parent(); } @Override - protected DiscriminatorColumn columnResource() { - return (DiscriminatorColumn) this.persistenceResource.nonNullAnnotation(DiscriminatorColumn.ANNOTATION_NAME); + protected DiscriminatorColumnAnnotation columnResource() { + return (DiscriminatorColumnAnnotation) this.persistenceResource.nonNullAnnotation(DiscriminatorColumnAnnotation.ANNOTATION_NAME); } public DiscriminatorType getDiscriminatorType() { @@ -57,7 +59,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn } public DiscriminatorType getDefaultDiscriminatorType() { - return IDiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE; + return DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE; } public DiscriminatorType getSpecifiedDiscriminatorType() { @@ -68,7 +70,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType; this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType; columnResource().setDiscriminatorType(DiscriminatorType.toJavaResourceModel(newSpecifiedDiscriminatorType)); - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); } /** @@ -80,7 +82,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn protected void setSpecifiedDiscriminatorType_(DiscriminatorType newSpecifiedDiscriminatorType) { DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType; this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType; - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); } public Integer getLength() { @@ -88,7 +90,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn } public Integer getDefaultLength() { - return IDiscriminatorColumn.DEFAULT_LENGTH; + return DiscriminatorColumn.DEFAULT_LENGTH; } public Integer getSpecifiedLength() { @@ -99,7 +101,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn Integer oldSpecifiedLength = this.specifiedLength; this.specifiedLength = newSpecifiedLength; columnResource().setLength(newSpecifiedLength); - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength); } /** @@ -111,7 +113,7 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn protected void setSpecifiedLength_(Integer newSpecifiedLength) { Integer oldSpecifiedLength = this.specifiedLength; this.specifiedLength = newSpecifiedLength; - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY, oldSpecifiedLength, newSpecifiedLength); } @Override @@ -119,31 +121,31 @@ public class JavaDiscriminatorColumn extends JavaNamedColumn<DiscriminatorColumn return javaEntity().tableName(); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = columnResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = columnResource().textRange(astRoot); return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); } // ********** java annotations -> persistence model ********** - public void update(JavaPersistentResource persistentResource) { + public void update(JavaResourcePersistentMember persistentResource) { this.persistenceResource = persistentResource; this.update(this.columnResource()); } @Override - public void update(DiscriminatorColumn discriminatorColumn) { + public void update(DiscriminatorColumnAnnotation discriminatorColumn) { super.update(discriminatorColumn); this.setSpecifiedDiscriminatorType_(this.discriminatorType(discriminatorColumn)); this.setSpecifiedLength_(this.length(discriminatorColumn)); } - protected DiscriminatorType discriminatorType(DiscriminatorColumn discriminatorColumn) { + protected DiscriminatorType discriminatorType(DiscriminatorColumnAnnotation discriminatorColumn) { return DiscriminatorType.fromJavaResourceModel(discriminatorColumn.getDiscriminatorType()); } - protected Integer length(DiscriminatorColumn discriminatorColumn) { + protected Integer length(DiscriminatorColumnAnnotation discriminatorColumn) { return discriminatorColumn.getLength(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java index a37b48eea0..81059f310f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java @@ -10,23 +10,25 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.resource.java.Embeddable; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaEmbeddable; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.resource.java.EmbeddableAnnotation; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -public class JavaEmbeddable extends JavaTypeMapping implements IJavaEmbeddable +public class GenericJavaEmbeddable extends AbstractJavaTypeMapping implements JavaEmbeddable { - public JavaEmbeddable(IJavaPersistentType parent) { + public GenericJavaEmbeddable(JavaPersistentType parent) { super(parent); } public String getKey() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } public String annotationName() { - return Embeddable.ANNOTATION_NAME; + return EmbeddableAnnotation.ANNOTATION_NAME; } public Iterator<String> correspondingAnnotationNames() { @@ -39,6 +41,6 @@ public class JavaEmbeddable extends JavaTypeMapping implements IJavaEmbeddable @Override public boolean attributeMappingKeyAllowed(String attributeMappingKey) { - return attributeMappingKey == IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return attributeMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java index 95d6cedd22..f99aee515c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java @@ -15,21 +15,24 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverrides; -import org.eclipse.jpt.core.internal.resource.java.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.resource.java.NullAttributeOverride; import org.eclipse.jpt.core.internal.resource.java.NullColumn; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.EmbeddedId; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -41,25 +44,25 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaEmbeddedIdMapping extends JavaAttributeMapping - implements IJavaEmbeddedIdMapping +public class GenericJavaEmbeddedIdMapping extends AbstractJavaAttributeMapping + implements JavaEmbeddedIdMapping { - protected final List<IJavaAttributeOverride> specifiedAttributeOverrides; + protected final List<JavaAttributeOverride> specifiedAttributeOverrides; - protected final List<IJavaAttributeOverride> defaultAttributeOverrides; + protected final List<JavaAttributeOverride> defaultAttributeOverrides; - private IEmbeddable embeddable; + private Embeddable embeddable; - public JavaEmbeddedIdMapping(IJavaPersistentAttribute parent) { + public GenericJavaEmbeddedIdMapping(JavaPersistentAttribute parent) { super(parent); - this.specifiedAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); + this.specifiedAttributeOverrides = new ArrayList<JavaAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<JavaAttributeOverride>(); } //****************** IJavaAttributeMapping implemenation ******************* public String getKey() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -78,11 +81,11 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping } //****************** IOverride.Owner implemenation ******************* - public IColumnMapping columnMapping(String attributeName) { - return JavaEmbeddedMapping.columnMapping(attributeName, embeddable()); + public ColumnMapping columnMapping(String attributeName) { + return GenericJavaEmbeddedMapping.columnMapping(attributeName, embeddable()); } - public boolean isVirtual(IOverride override) { + public boolean isVirtual(BaseOverride override) { return this.defaultAttributeOverrides.contains(override); } @@ -90,54 +93,54 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping //****************** IEmbeddedMapping implemenation ******************* @SuppressWarnings("unchecked") - public ListIterator<IJavaAttributeOverride> attributeOverrides() { - return new CompositeListIterator<IJavaAttributeOverride>(this.specifiedAttributeOverrides(), this.defaultAttributeOverrides()); + public ListIterator<JavaAttributeOverride> attributeOverrides() { + return new CompositeListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides(), this.defaultAttributeOverrides()); } public int attributeOverridesSize() { return this.specifiedAttributeOverridesSize() + this.defaultAttributeOverridesSize(); } - public ListIterator<IJavaAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<JavaAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { return this.defaultAttributeOverrides.size(); } - public ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<JavaAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public IJavaAttributeOverride addSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); + public JavaAttributeOverride addSpecifiedAttributeOverride(int index) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); this.specifiedAttributeOverrides.add(index, attributeOverride); - AttributeOverride attributeOverrideResource = (AttributeOverride) this.persistentAttributeResource.addAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.persistentAttributeResource.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); attributeOverride.initializeFromResource(attributeOverrideResource); - this.fireItemAdded(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected void addSpecifiedAttributeOverride(int index, IJavaAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, JavaAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + JavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); //add the default attribute override so that I can control the order that change notification is sent. //otherwise when we remove the annotation from java we will get an update and add the attribute override //during the udpate. This causes the UI to be flaky, since change notification might not occur in the correct order - IJavaAttributeOverride defaultAttributeOverride = null; + JavaAttributeOverride defaultAttributeOverride = null; if (removedAttributeOverride.getName() != null) { if (CollectionTools.contains(allOverridableAttributeNames(), removedAttributeOverride.getName())) { defaultAttributeOverride = createAttributeOverride(new NullAttributeOverride(this.persistentAttributeResource, removedAttributeOverride.getName())); @@ -145,34 +148,34 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping } } - this.persistentAttributeResource.removeAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); - fireItemRemoved(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + this.persistentAttributeResource.removeAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + fireItemRemoved(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); if (defaultAttributeOverride != null) { - fireItemAdded(IEmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); + fireItemAdded(EmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); } } - protected void removeSpecifiedAttributeOverride_(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.persistentAttributeResource.move(targetIndex, sourceIndex, AttributeOverrides.ANNOTATION_NAME); - fireItemMoved(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } - protected void addDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - addItemToList(attributeOverride, this.defaultAttributeOverrides, IEmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void addDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + addItemToList(attributeOverride, this.defaultAttributeOverrides, EmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - protected void removeDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.defaultAttributeOverrides, IEmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void removeDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.defaultAttributeOverrides, EmbeddedIdMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - public IJavaAttributeOverride attributeOverrideNamed(String name) { - return (IJavaAttributeOverride) overrideNamed(name, attributeOverrides()); + public JavaAttributeOverride attributeOverrideNamed(String name) { + return (JavaAttributeOverride) overrideNamed(name, attributeOverrides()); } public boolean containsAttributeOverride(String name) { @@ -187,8 +190,8 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping return containsOverride(name, specifiedAttributeOverrides()); } - private IOverride overrideNamed(String name, ListIterator<? extends IOverride> overrides) { - for (IOverride override : CollectionTools.iterable(overrides)) { + private BaseOverride overrideNamed(String name, ListIterator<? extends BaseOverride> overrides) { + for (BaseOverride override : CollectionTools.iterable(overrides)) { String overrideName = override.getName(); if (overrideName == null && name == null) { return override; @@ -200,59 +203,59 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping return null; } - private boolean containsOverride(String name, ListIterator<? extends IOverride> overrides) { + private boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) { return overrideNamed(name, overrides) != null; } - public IEmbeddable embeddable() { + public Embeddable embeddable() { return this.embeddable; } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.initializeAttributeOverrides(persistentAttributeResource); this.initializeDefaultAttributeOverrides(persistentAttributeResource); this.embeddable = embeddableFor(persistentAttribute()); } - protected void initializeAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<JavaResource> annotations = persistentAttributeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void initializeAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaResourceNode> annotations = persistentAttributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while(annotations.hasNext()) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); - attributeOverride.initializeFromResource((AttributeOverride) annotations.next()); + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); + attributeOverride.initializeFromResource((AttributeOverrideAnnotation) annotations.next()); this.specifiedAttributeOverrides.add(attributeOverride); } } - protected void initializeDefaultAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { + protected void initializeDefaultAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { attributeOverride = createAttributeOverride(new NullAttributeOverride(persistentAttributeResource, attributeName)); this.defaultAttributeOverrides.add(attributeOverride); } } } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.embeddable = embeddableFor(persistentAttribute()); this.updateSpecifiedAttributeOverrides(persistentAttributeResource); this.updateDefaultAttributeOverrides(persistentAttributeResource); } - protected void updateSpecifiedAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<IJavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<JavaResource> resourceAttributeOverrides = persistentAttributeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void updateSpecifiedAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<JavaResourceNode> resourceAttributeOverrides = persistentAttributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while (attributeOverrides.hasNext()) { - IJavaAttributeOverride attributeOverride = attributeOverrides.next(); + JavaAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { - attributeOverride.update((AttributeOverride) resourceAttributeOverrides.next()); + attributeOverride.update((AttributeOverrideAnnotation) resourceAttributeOverrides.next()); } else { removeSpecifiedAttributeOverride_(attributeOverride); @@ -260,20 +263,20 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping } while (resourceAttributeOverrides.hasNext()) { - addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverride) resourceAttributeOverrides.next())); + addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverrideAnnotation) resourceAttributeOverrides.next())); } } - protected IJavaAttributeOverride createAttributeOverride(AttributeOverride attributeOverrideResource) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); + protected JavaAttributeOverride createAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); attributeOverride.initializeFromResource(attributeOverrideResource); return attributeOverride; } - protected void updateDefaultAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateDefaultAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { attributeOverride = createAttributeOverride(new NullAttributeOverride(persistentAttributeResource, attributeName)); addDefaultAttributeOverride(attributeOverride); @@ -286,7 +289,7 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping Collection<String> attributeNames = CollectionTools.collection(allOverridableAttributeNames()); //remove any default mappings that are not included in the attributeNames collection - for (IJavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { + for (JavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { if (!attributeNames.contains(attributeOverride.getName()) || containsSpecifiedAttributeOverride(attributeOverride.getName())) { removeDefaultAttributeOverride(attributeOverride); @@ -296,21 +299,21 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping public Iterator<String> allOverridableAttributeNames() { - return new TransformationIterator<IPersistentAttribute, String>(this.allOverridableAttributes()) { + return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - public Iterator<IPersistentAttribute> allOverridableAttributes() { + public Iterator<PersistentAttribute> allOverridableAttributes() { if (this.embeddable() == null) { return EmptyIterator.instance(); } - return new FilteringIterator<IPersistentAttribute, IPersistentAttribute>(this.embeddable().persistentType().attributes()) { + return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.embeddable().persistentType().attributes()) { @Override - protected boolean accept(IPersistentAttribute o) { + protected boolean accept(PersistentAttribute o) { return o.isOverridableAttribute(); } }; @@ -322,8 +325,8 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping if (result != null) { return result; } - for (IAttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { - result = ((IJavaAttributeOverride) override).javaCompletionProposals(pos, filter, astRoot); + for (AttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { + result = ((JavaAttributeOverride) override).javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -340,8 +343,8 @@ public class JavaEmbeddedIdMapping extends JavaAttributeMapping //******* static methods ********* - protected static IEmbeddable embeddableFor(IJavaPersistentAttribute persistentAttribute) { - return JavaEmbeddedMapping.embeddableFor(persistentAttribute); + protected static Embeddable embeddableFor(JavaPersistentAttribute persistentAttribute) { + return GenericJavaEmbeddedMapping.embeddableFor(persistentAttribute); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java index 950948db8b..3ba5d95374 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java @@ -15,21 +15,24 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverrides; -import org.eclipse.jpt.core.internal.resource.java.Embedded; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.resource.java.NullAttributeOverride; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.Embedded; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -41,42 +44,42 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEmbeddedMapping +public class GenericJavaEmbeddedMapping extends AbstractJavaAttributeMapping implements JavaEmbeddedMapping { - protected final List<IJavaAttributeOverride> specifiedAttributeOverrides; + protected final List<JavaAttributeOverride> specifiedAttributeOverrides; - protected final List<IJavaAttributeOverride> defaultAttributeOverrides; + protected final List<JavaAttributeOverride> defaultAttributeOverrides; - private IEmbeddable embeddable; + private Embeddable embeddable; - public JavaEmbeddedMapping(IJavaPersistentAttribute parent) { + public GenericJavaEmbeddedMapping(JavaPersistentAttribute parent) { super(parent); - this.specifiedAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); + this.specifiedAttributeOverrides = new ArrayList<JavaAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<JavaAttributeOverride>(); } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.embeddable = embeddableFor(persistentAttribute()); this.initializeSpecifiedAttributeOverrides(persistentAttributeResource); this.initializeDefaultAttributeOverrides(persistentAttributeResource); } - protected void initializeSpecifiedAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<JavaResource> annotations = persistentAttributeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void initializeSpecifiedAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaResourceNode> annotations = persistentAttributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while(annotations.hasNext()) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); - attributeOverride.initializeFromResource((AttributeOverride) annotations.next()); + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); + attributeOverride.initializeFromResource((AttributeOverrideAnnotation) annotations.next()); this.specifiedAttributeOverrides.add(attributeOverride); } } - protected void initializeDefaultAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { + protected void initializeDefaultAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { attributeOverride = createAttributeOverride(new NullAttributeOverride(persistentAttributeResource, attributeName)); this.defaultAttributeOverrides.add(attributeOverride); @@ -84,18 +87,18 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm } } //****************** IOverride.Owner implemenation ******************* - public IColumnMapping columnMapping(String attributeName) { + public ColumnMapping columnMapping(String attributeName) { return columnMapping(attributeName, embeddable()); } - public boolean isVirtual(IOverride override) { + public boolean isVirtual(BaseOverride override) { return this.defaultAttributeOverrides.contains(override); } //****************** IJavaAttributeMapping implemenation ******************* public String getKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -116,54 +119,54 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm //****************** IEmbeddedMapping implemenation ******************* @SuppressWarnings("unchecked") - public ListIterator<IJavaAttributeOverride> attributeOverrides() { - return new CompositeListIterator<IJavaAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); + public ListIterator<JavaAttributeOverride> attributeOverrides() { + return new CompositeListIterator<JavaAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); } public int attributeOverridesSize() { return this.specifiedAttributeOverridesSize() + this.defaultAttributeOverridesSize(); } - public ListIterator<IJavaAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<JavaAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { return this.defaultAttributeOverrides.size(); } - public ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<JavaAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public IJavaAttributeOverride addSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); + public JavaAttributeOverride addSpecifiedAttributeOverride(int index) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); this.specifiedAttributeOverrides.add(index, attributeOverride); - AttributeOverride attributeOverrideResource = (AttributeOverride) this.persistentAttributeResource.addAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.persistentAttributeResource.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); attributeOverride.initializeFromResource(attributeOverrideResource); - this.fireItemAdded(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected void addSpecifiedAttributeOverride(int index, IJavaAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, JavaAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + JavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); //add the default attribute override so that I can control the order that change notification is sent. //otherwise when we remove the annotation from java we will get an update and add the attribute override //during the udpate. This causes the UI to be flaky, since change notification might not occur in the correct order - IJavaAttributeOverride defaultAttributeOverride = null; + JavaAttributeOverride defaultAttributeOverride = null; if (removedAttributeOverride.getName() != null) { if (CollectionTools.contains(allOverridableAttributeNames(), removedAttributeOverride.getName())) { defaultAttributeOverride = createAttributeOverride(new NullAttributeOverride(this.persistentAttributeResource, removedAttributeOverride.getName())); @@ -171,34 +174,34 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm } } - this.persistentAttributeResource.removeAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); - fireItemRemoved(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + this.persistentAttributeResource.removeAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + fireItemRemoved(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); if (defaultAttributeOverride != null) { - fireItemAdded(IEmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); + fireItemAdded(EmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); } } - protected void removeSpecifiedAttributeOverride_(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.persistentAttributeResource.move(targetIndex, sourceIndex, AttributeOverrides.ANNOTATION_NAME); - fireItemMoved(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } - protected void addDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - addItemToList(attributeOverride, this.defaultAttributeOverrides, IEmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void addDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + addItemToList(attributeOverride, this.defaultAttributeOverrides, EmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - protected void removeDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.defaultAttributeOverrides, IEmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void removeDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.defaultAttributeOverrides, EmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - public IJavaAttributeOverride attributeOverrideNamed(String name) { - return (IJavaAttributeOverride) overrideNamed(name, attributeOverrides()); + public JavaAttributeOverride attributeOverrideNamed(String name) { + return (JavaAttributeOverride) overrideNamed(name, attributeOverrides()); } public boolean containsAttributeOverride(String name) { @@ -213,8 +216,8 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm return containsOverride(name, specifiedAttributeOverrides()); } - private IOverride overrideNamed(String name, ListIterator<? extends IOverride> overrides) { - for (IOverride override : CollectionTools.iterable(overrides)) { + private BaseOverride overrideNamed(String name, ListIterator<? extends BaseOverride> overrides) { + for (BaseOverride override : CollectionTools.iterable(overrides)) { String overrideName = override.getName(); if (overrideName == null && name == null) { return override; @@ -226,30 +229,30 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm return null; } - private boolean containsOverride(String name, ListIterator<? extends IOverride> overrides) { + private boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) { return overrideNamed(name, overrides) != null; } - public IEmbeddable embeddable() { + public Embeddable embeddable() { return this.embeddable; } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.embeddable = embeddableFor(persistentAttribute()); this.updateSpecifiedAttributeOverrides(persistentAttributeResource); this.updateDefaultAttributeOverrides(persistentAttributeResource); } - protected void updateSpecifiedAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { - ListIterator<IJavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<JavaResource> resourceAttributeOverrides = persistentAttributeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void updateSpecifiedAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { + ListIterator<JavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<JavaResourceNode> resourceAttributeOverrides = persistentAttributeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while (attributeOverrides.hasNext()) { - IJavaAttributeOverride attributeOverride = attributeOverrides.next(); + JavaAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { - attributeOverride.update((AttributeOverride) resourceAttributeOverrides.next()); + attributeOverride.update((AttributeOverrideAnnotation) resourceAttributeOverrides.next()); } else { removeSpecifiedAttributeOverride_(attributeOverride); @@ -257,20 +260,20 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm } while (resourceAttributeOverrides.hasNext()) { - addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverride) resourceAttributeOverrides.next())); + addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverrideAnnotation) resourceAttributeOverrides.next())); } } - protected IJavaAttributeOverride createAttributeOverride(AttributeOverride attributeOverrideResource) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, this); + protected JavaAttributeOverride createAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); attributeOverride.initializeFromResource(attributeOverrideResource); return attributeOverride; } - protected void updateDefaultAttributeOverrides(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateDefaultAttributeOverrides(JavaResourcePersistentAttribute persistentAttributeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { attributeOverride = createAttributeOverride(new NullAttributeOverride(persistentAttributeResource, attributeName)); addDefaultAttributeOverride(attributeOverride); @@ -283,7 +286,7 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm Collection<String> attributeNames = CollectionTools.collection(allOverridableAttributeNames()); //remove any default mappings that are not included in the attributeNames collection - for (IJavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { + for (JavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { if (!attributeNames.contains(attributeOverride.getName()) || containsSpecifiedAttributeOverride(attributeOverride.getName())) { removeDefaultAttributeOverride(attributeOverride); @@ -292,21 +295,21 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm } public Iterator<String> allOverridableAttributeNames() { - return new TransformationIterator<IPersistentAttribute, String>(this.allOverridableAttributes()) { + return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - public Iterator<IPersistentAttribute> allOverridableAttributes() { + public Iterator<PersistentAttribute> allOverridableAttributes() { if (this.embeddable() == null) { return EmptyIterator.instance(); } - return new FilteringIterator<IPersistentAttribute, IPersistentAttribute>(this.embeddable().persistentType().attributes()) { + return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.embeddable().persistentType().attributes()) { @Override - protected boolean accept(IPersistentAttribute o) { + protected boolean accept(PersistentAttribute o) { return o.isOverridableAttribute(); } }; @@ -318,8 +321,8 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm if (result != null) { return result; } - for (IAttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { - result = ((IJavaAttributeOverride) override).javaCompletionProposals(pos, filter, astRoot); + for (AttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { + result = ((JavaAttributeOverride) override).javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } @@ -334,36 +337,36 @@ public class JavaEmbeddedMapping extends JavaAttributeMapping implements IJavaEm public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) { super.addToMessages(messages, astRoot); - for (Iterator<IJavaAttributeOverride> stream = attributeOverrides(); stream.hasNext();) { + for (Iterator<JavaAttributeOverride> stream = attributeOverrides(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } } //******* static methods ********* - public static IEmbeddable embeddableFor(IJavaPersistentAttribute persistentAttribute) { + public static Embeddable embeddableFor(JavaPersistentAttribute persistentAttribute) { String qualifiedTypeName = persistentAttribute.getPersistentAttributeResource().getQualifiedTypeName(); if (qualifiedTypeName == null) { return null; } - IPersistentType persistentType = persistentAttribute.persistenceUnit().persistentType(qualifiedTypeName); + PersistentType persistentType = persistentAttribute.persistenceUnit().persistentType(qualifiedTypeName); if (persistentType != null) { - if (persistentType.mappingKey() == IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) { - return (IEmbeddable) persistentType.getMapping(); + if (persistentType.mappingKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) { + return (Embeddable) persistentType.getMapping(); } } return null; } - public static IColumnMapping columnMapping(String attributeName, IEmbeddable embeddable) { + public static ColumnMapping columnMapping(String attributeName, Embeddable embeddable) { if (attributeName == null || embeddable == null) { return null; } - for (Iterator<IPersistentAttribute> stream = embeddable.persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute persAttribute = stream.next(); + for (Iterator<PersistentAttribute> stream = embeddable.persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute persAttribute = stream.next(); if (attributeName.equals(persAttribute.getName())) { - if (persAttribute.getMapping() instanceof IColumnMapping) { - return (IColumnMapping) persAttribute.getMapping(); + if (persAttribute.getMapping() instanceof ColumnMapping) { + return (ColumnMapping) persAttribute.getMapping(); } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java index b38212f59c..1767a8ab61 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java @@ -15,56 +15,67 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.DiscriminatorType; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.INamedNativeQuery; -import org.eclipse.jpt.core.internal.context.base.INamedQuery; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.java.AssociationOverrides; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverrides; -import org.eclipse.jpt.core.internal.resource.java.DiscriminatorValue; -import org.eclipse.jpt.core.internal.resource.java.Entity; -import org.eclipse.jpt.core.internal.resource.java.IdClass; -import org.eclipse.jpt.core.internal.resource.java.Inheritance; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaResource; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQueries; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.java.NamedQueries; -import org.eclipse.jpt.core.internal.resource.java.NamedQuery; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.DiscriminatorType; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.NamedNativeQuery; +import org.eclipse.jpt.core.context.NamedQuery; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.InheritanceType; +import org.eclipse.jpt.core.context.java.JavaAssociationOverride; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; +import org.eclipse.jpt.core.context.java.JavaNamedQuery; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.java.JavaSecondaryTable; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.context.java.JavaTable; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; import org.eclipse.jpt.core.internal.resource.java.NullAssociationOverride; import org.eclipse.jpt.core.internal.resource.java.NullAttributeOverride; import org.eclipse.jpt.core.internal.resource.java.NullColumn; import org.eclipse.jpt.core.internal.resource.java.NullPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumns; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTable; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTables; -import org.eclipse.jpt.core.internal.resource.java.SequenceGenerator; -import org.eclipse.jpt.core.internal.resource.java.TableGenerator; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AssociationOverrides; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.DiscriminatorValue; +import org.eclipse.jpt.core.resource.java.EntityAnnotation; +import org.eclipse.jpt.core.resource.java.IdClass; +import org.eclipse.jpt.core.resource.java.Inheritance; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedNativeQueries; +import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; +import org.eclipse.jpt.core.resource.java.NamedQueries; +import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns; +import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; +import org.eclipse.jpt.core.resource.java.SecondaryTables; +import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; +import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; @@ -78,21 +89,21 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaEntity extends JavaTypeMapping implements IJavaEntity +public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEntity { - protected Entity entityResource; + protected EntityAnnotation entityResource; protected String specifiedName; protected String defaultName; - protected final IJavaTable table; + protected final JavaTable table; - protected final List<IJavaSecondaryTable> specifiedSecondaryTables; + protected final List<JavaSecondaryTable> specifiedSecondaryTables; - protected final List<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; + protected final List<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; - protected IJavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; + protected JavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; protected InheritanceType specifiedInheritanceStrategy; @@ -104,73 +115,73 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity protected String specifiedDiscriminatorValue; - protected final IJavaDiscriminatorColumn discriminatorColumn; + protected final JavaDiscriminatorColumn discriminatorColumn; - protected IJavaSequenceGenerator sequenceGenerator; + protected JavaSequenceGenerator sequenceGenerator; - protected IJavaTableGenerator tableGenerator; + protected JavaTableGenerator tableGenerator; - protected final List<IJavaAttributeOverride> specifiedAttributeOverrides; + protected final List<JavaAttributeOverride> specifiedAttributeOverrides; - protected final List<IJavaAttributeOverride> defaultAttributeOverrides; + protected final List<JavaAttributeOverride> defaultAttributeOverrides; - protected final List<IJavaAssociationOverride> specifiedAssociationOverrides; + protected final List<JavaAssociationOverride> specifiedAssociationOverrides; - protected final List<IJavaAssociationOverride> defaultAssociationOverrides; + protected final List<JavaAssociationOverride> defaultAssociationOverrides; - protected final List<IJavaNamedQuery> namedQueries; + protected final List<JavaNamedQuery> namedQueries; - protected final List<IJavaNamedNativeQuery> namedNativeQueries; + protected final List<JavaNamedNativeQuery> namedNativeQueries; protected String idClass; - public JavaEntity(IJavaPersistentType parent) { + public GenericJavaEntity(JavaPersistentType parent) { super(parent); - this.table = jpaFactory().createJavaTable(this); + this.table = jpaFactory().buildJavaTable(this); this.discriminatorColumn = createJavaDiscriminatorColumn(); - this.specifiedSecondaryTables = new ArrayList<IJavaSecondaryTable>(); - this.specifiedPrimaryKeyJoinColumns = new ArrayList<IJavaPrimaryKeyJoinColumn>(); - this.specifiedAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<IJavaAttributeOverride>(); - this.namedQueries = new ArrayList<IJavaNamedQuery>(); - this.namedNativeQueries = new ArrayList<IJavaNamedNativeQuery>(); - this.specifiedAssociationOverrides = new ArrayList<IJavaAssociationOverride>(); - this.defaultAssociationOverrides = new ArrayList<IJavaAssociationOverride>(); + this.specifiedSecondaryTables = new ArrayList<JavaSecondaryTable>(); + this.specifiedPrimaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>(); + this.specifiedAttributeOverrides = new ArrayList<JavaAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<JavaAttributeOverride>(); + this.namedQueries = new ArrayList<JavaNamedQuery>(); + this.namedNativeQueries = new ArrayList<JavaNamedNativeQuery>(); + this.specifiedAssociationOverrides = new ArrayList<JavaAssociationOverride>(); + this.defaultAssociationOverrides = new ArrayList<JavaAssociationOverride>(); } - protected IAbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { + protected AbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } - protected IJavaDiscriminatorColumn createJavaDiscriminatorColumn() { - return jpaFactory().createJavaDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); + protected JavaDiscriminatorColumn createJavaDiscriminatorColumn() { + return jpaFactory().buildJavaDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); } - protected INamedColumn.Owner buildDiscriminatorColumnOwner() { - return new INamedColumn.Owner(){ - public Table dbTable(String tableName) { - return JavaEntity.this.dbTable(tableName); + protected NamedColumn.Owner buildDiscriminatorColumnOwner() { + return new NamedColumn.Owner(){ + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + return GenericJavaEntity.this.dbTable(tableName); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - return JavaEntity.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericJavaEntity.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return JavaEntity.this; + public TypeMapping typeMapping() { + return GenericJavaEntity.this; } public String defaultColumnName() { - return IDiscriminatorColumn.DEFAULT_NAME; + return DiscriminatorColumn.DEFAULT_NAME; } }; } @Override - public void initializeFromResource(JavaPersistentTypeResource persistentTypeResource) { + public void initializeFromResource(JavaResourcePersistentType persistentTypeResource) { super.initializeFromResource(persistentTypeResource); - this.entityResource = (Entity) persistentTypeResource.mappingAnnotation(Entity.ANNOTATION_NAME); + this.entityResource = (EntityAnnotation) persistentTypeResource.mappingAnnotation(EntityAnnotation.ANNOTATION_NAME); this.specifiedName = this.specifiedName(this.entityResource); this.defaultName = this.defaultName(persistentTypeResource); @@ -195,33 +206,33 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity this.initializeIdClass(persistentTypeResource); } - protected void initializeSecondaryTables(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(SecondaryTable.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + protected void initializeSecondaryTables(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); while(annotations.hasNext()) { - this.specifiedSecondaryTables.add(createSecondaryTable((SecondaryTable) annotations.next())); + this.specifiedSecondaryTables.add(createSecondaryTable((SecondaryTableAnnotation) annotations.next())); } } - protected void initializeTableGenerator(JavaPersistentTypeResource persistentTypeResource) { - TableGenerator tableGeneratorResource = tableGenerator(persistentTypeResource); + protected void initializeTableGenerator(JavaResourcePersistentType persistentTypeResource) { + TableGeneratorAnnotation tableGeneratorResource = tableGenerator(persistentTypeResource); if (tableGeneratorResource != null) { this.tableGenerator = createTableGenerator(tableGeneratorResource); } } - protected void initializeSequenceGenerator(JavaPersistentTypeResource persistentTypeResource) { - SequenceGenerator sequenceGeneratorResource = sequenceGenerator(persistentTypeResource); + protected void initializeSequenceGenerator(JavaResourcePersistentType persistentTypeResource) { + SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(persistentTypeResource); if (sequenceGeneratorResource != null) { this.sequenceGenerator = createSequenceGenerator(sequenceGeneratorResource); } } - protected void initializePrimaryKeyJoinColumns(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(PrimaryKeyJoinColumn.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); + protected void initializePrimaryKeyJoinColumns(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); while(annotations.hasNext()) { - this.specifiedPrimaryKeyJoinColumns.add(createPrimaryKeyJoinColumn((PrimaryKeyJoinColumn) annotations.next())); + this.specifiedPrimaryKeyJoinColumns.add(createPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) annotations.next())); } } @@ -229,44 +240,44 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return !containsSpecifiedPrimaryKeyJoinColumns(); } - protected void initializeDefaultPrimaryKeyJoinColumn(JavaPersistentTypeResource persistentTypeResource) { + protected void initializeDefaultPrimaryKeyJoinColumn(JavaResourcePersistentType persistentTypeResource) { if (!shouldBuildDefaultPrimaryKeyJoinColumn()) { return; } - this.defaultPrimaryKeyJoinColumn = this.jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + this.defaultPrimaryKeyJoinColumn = this.jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.defaultPrimaryKeyJoinColumn.initializeFromResource(new NullPrimaryKeyJoinColumn(persistentTypeResource)); } - protected void initializeSpecifiedAttributeOverrides(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void initializeSpecifiedAttributeOverrides(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while(annotations.hasNext()) { - this.specifiedAttributeOverrides.add(createAttributeOverride((AttributeOverride) annotations.next())); + this.specifiedAttributeOverrides.add(createAttributeOverride((AttributeOverrideAnnotation) annotations.next())); } } - protected void initializeDefaultAttributeOverrides(JavaPersistentTypeResource persistentTypeResource) { + protected void initializeDefaultAttributeOverrides(JavaResourcePersistentType persistentTypeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { this.defaultAttributeOverrides.add(createAttributeOverride(new NullAttributeOverride(persistentTypeResource, attributeName))); } } } - protected void initializeSpecifiedAssociationOverrides(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(AssociationOverride.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + protected void initializeSpecifiedAssociationOverrides(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); while(annotations.hasNext()) { - this.specifiedAssociationOverrides.add(createAssociationOverride((AssociationOverride) annotations.next())); + this.specifiedAssociationOverrides.add(createAssociationOverride((AssociationOverrideAnnotation) annotations.next())); } } - protected void initializeDefaultAssociationOverrides(JavaPersistentTypeResource persistentTypeResource) { + protected void initializeDefaultAssociationOverrides(JavaResourcePersistentType persistentTypeResource) { for (Iterator<String> i = allOverridableAssociationNames(); i.hasNext(); ) { String associationName = i.next(); - IJavaAssociationOverride associationOverride = associationOverrideNamed(associationName); + JavaAssociationOverride associationOverride = associationOverrideNamed(associationName); if (associationOverride == null) { associationOverride = createAssociationOverride(new NullAssociationOverride(persistentTypeResource, associationName)); this.defaultAssociationOverrides.add(associationOverride); @@ -274,19 +285,19 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected void initializeNamedQueries(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(NamedQuery.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + protected void initializeNamedQueries(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); while(annotations.hasNext()) { - this.namedQueries.add(createNamedQuery((NamedQuery) annotations.next())); + this.namedQueries.add(createNamedQuery((NamedQueryAnnotation) annotations.next())); } } - protected void initializeNamedNativeQueries(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<JavaResource> annotations = persistentTypeResource.annotations(NamedNativeQuery.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + protected void initializeNamedNativeQueries(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaResourceNode> annotations = persistentTypeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); while(annotations.hasNext()) { - this.namedNativeQueries.add(createNamedNativeQuery((NamedNativeQuery) annotations.next())); + this.namedNativeQueries.add(createNamedNativeQuery((NamedNativeQueryAnnotation) annotations.next())); } } @@ -302,7 +313,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return (DiscriminatorValue) this.persistentTypeResource.nonNullAnnotation(DiscriminatorValue.ANNOTATION_NAME); } - protected void initializeIdClass(JavaPersistentTypeResource typeResource) { + protected void initializeIdClass(JavaResourcePersistentType typeResource) { IdClass idClassResource = (IdClass) typeResource.annotation(IdClass.ANNOTATION_NAME); if (idClassResource != null) { this.idClass = idClassResource.getValue(); @@ -312,7 +323,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity //****************** ITypeMapping implemenation ******************* public String getKey() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } public boolean isMapped() { @@ -325,14 +336,14 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } @Override - public Table primaryDbTable() { + public org.eclipse.jpt.db.internal.Table primaryDbTable() { return getTable().dbTable(); } @Override - public Table dbTable(String tableName) { - for (Iterator<ITable> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { - Table dbTable = stream.next().dbTable(); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { + org.eclipse.jpt.db.internal.Table dbTable = stream.next().dbTable(); if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) { return dbTable; } @@ -349,7 +360,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity //****************** IJavaTypeMapping implemenation ******************* public String annotationName() { - return Entity.ANNOTATION_NAME; + return EntityAnnotation.ANNOTATION_NAME; } public Iterator<String> correspondingAnnotationNames() { @@ -400,7 +411,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; this.entityResource.setName(newSpecifiedName); - firePropertyChanged(IEntity.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); + firePropertyChanged(Entity.SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } public String getDefaultName() { @@ -410,55 +421,55 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity protected/*private-protected*/ void setDefaultName(String newDefaultName) { String oldDefaultName = this.defaultName; this.defaultName = newDefaultName; - firePropertyChanged(IEntity.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); + firePropertyChanged(Entity.DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); } - public IJavaTable getTable() { + public JavaTable getTable() { return this.table; } - public ListIterator<IJavaSecondaryTable> specifiedSecondaryTables() { - return new CloneListIterator<IJavaSecondaryTable>(this.specifiedSecondaryTables); + public ListIterator<JavaSecondaryTable> specifiedSecondaryTables() { + return new CloneListIterator<JavaSecondaryTable>(this.specifiedSecondaryTables); } public int specifiedSecondaryTablesSize() { return this.specifiedSecondaryTables.size(); } - public IJavaSecondaryTable addSpecifiedSecondaryTable(int index) { - IJavaSecondaryTable secondaryTable = jpaFactory().createJavaSecondaryTable(this); + public JavaSecondaryTable addSpecifiedSecondaryTable(int index) { + JavaSecondaryTable secondaryTable = jpaFactory().buildJavaSecondaryTable(this); this.specifiedSecondaryTables.add(index, secondaryTable); - SecondaryTable secondaryTableResource = (SecondaryTable) this.persistentTypeResource.addAnnotation(index, SecondaryTable.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) this.persistentTypeResource.addAnnotation(index, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); secondaryTable.initializeFromResource(secondaryTableResource); - fireItemAdded(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable); + fireItemAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable); return secondaryTable; } - protected void addSpecifiedSecondaryTable(int index, IJavaSecondaryTable secondaryTable) { - addItemToList(index, secondaryTable, this.specifiedSecondaryTables, IEntity.SPECIFIED_SECONDARY_TABLES_LIST); + protected void addSpecifiedSecondaryTable(int index, JavaSecondaryTable secondaryTable) { + addItemToList(index, secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST); } - public void removeSpecifiedSecondaryTable(ISecondaryTable secondaryTable) { + public void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable) { this.removeSpecifiedSecondaryTable(this.specifiedSecondaryTables.indexOf(secondaryTable)); } public void removeSpecifiedSecondaryTable(int index) { - IJavaSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index); - this.persistentTypeResource.removeAnnotation(index, SecondaryTable.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); - fireItemRemoved(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable); + JavaSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index); + this.persistentTypeResource.removeAnnotation(index, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + fireItemRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable); } - protected void removeSpecifiedSecondaryTable_(IJavaSecondaryTable secondaryTable) { - removeItemFromList(secondaryTable, this.specifiedSecondaryTables, IEntity.SPECIFIED_SECONDARY_TABLES_LIST); + protected void removeSpecifiedSecondaryTable_(JavaSecondaryTable secondaryTable) { + removeItemFromList(secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST); } public void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedSecondaryTables, targetIndex, sourceIndex); this.persistentTypeResource.move(targetIndex, sourceIndex, SecondaryTables.ANNOTATION_NAME); - fireItemMoved(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex); } - public ListIterator<IJavaSecondaryTable> secondaryTables() { + public ListIterator<JavaSecondaryTable> secondaryTables() { return specifiedSecondaryTables(); } @@ -521,7 +532,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity firePropertyChanged(SPECIFIED_INHERITANCE_STRATEGY_PROPERTY, oldInheritanceType, newInheritanceType); } - public IJavaDiscriminatorColumn getDiscriminatorColumn() { + public JavaDiscriminatorColumn getDiscriminatorColumn() { return this.discriminatorColumn; } @@ -569,15 +580,15 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity protected void setDiscriminatorValueAllowed(boolean newDiscriminatorValueAllowed) { boolean oldDiscriminatorValueAllowed = this.discriminatorValueAllowed; this.discriminatorValueAllowed = newDiscriminatorValueAllowed; - firePropertyChanged(IEntity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed); + firePropertyChanged(Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed); } - public IJavaTableGenerator addTableGenerator() { + public JavaTableGenerator addTableGenerator() { if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().createJavaTableGenerator(this); - TableGenerator tableGeneratorResource = (TableGenerator) this.persistentTypeResource.addAnnotation(TableGenerator.ANNOTATION_NAME); + this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); + TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) this.persistentTypeResource.addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); this.tableGenerator.initializeFromResource(tableGeneratorResource); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; @@ -587,28 +598,28 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity if (getTableGenerator() == null) { throw new IllegalStateException("tableGenerator does not exist, cannot be removed"); } - IJavaTableGenerator oldTableGenerator = this.tableGenerator; + JavaTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = null; - this.persistentTypeResource.removeAnnotation(TableGenerator.ANNOTATION_NAME); + this.persistentTypeResource.removeAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null); } - public IJavaTableGenerator getTableGenerator() { + public JavaTableGenerator getTableGenerator() { return this.tableGenerator; } - protected void setTableGenerator(IJavaTableGenerator newTableGenerator) { - IJavaTableGenerator oldTableGenerator = this.tableGenerator; + protected void setTableGenerator(JavaTableGenerator newTableGenerator) { + JavaTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = newTableGenerator; firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator); } - public IJavaSequenceGenerator addSequenceGenerator() { + public JavaSequenceGenerator addSequenceGenerator() { if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().createJavaSequenceGenerator(this); - SequenceGenerator sequenceGeneratorResource = (SequenceGenerator) this.persistentTypeResource.addAnnotation(SequenceGenerator.ANNOTATION_NAME); + this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) this.persistentTypeResource.addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; @@ -618,23 +629,23 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity if (getSequenceGenerator() == null) { throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed"); } - IJavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = null; - this.persistentTypeResource.removeAnnotation(SequenceGenerator.ANNOTATION_NAME); + this.persistentTypeResource.removeAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator,null); } - public IJavaSequenceGenerator getSequenceGenerator() { + public JavaSequenceGenerator getSequenceGenerator() { return this.sequenceGenerator; } - protected void setSequenceGenerator(IJavaSequenceGenerator newSequenceGenerator) { - IJavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + protected void setSequenceGenerator(JavaSequenceGenerator newSequenceGenerator) { + JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = newSequenceGenerator; firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator); } - public ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() { + public ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() { return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumns() : this.defaultPrimaryKeyJoinColumns(); } @@ -642,8 +653,8 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumnsSize() : this.defaultPrimaryKeyJoinColumnsSize(); } - public ListIterator<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { - return new CloneListIterator<IJavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); + public ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { + return new CloneListIterator<JavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); } public int specifiedPrimaryKeyJoinColumnsSize() { @@ -654,19 +665,19 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return !this.specifiedPrimaryKeyJoinColumns.isEmpty(); } - public IJavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { + public JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { return this.defaultPrimaryKeyJoinColumn; } - protected void setDefaultPrimaryKeyJoinColumn(IJavaPrimaryKeyJoinColumn newPkJoinColumn) { - IJavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn; + protected void setDefaultPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn newPkJoinColumn) { + JavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn; this.defaultPrimaryKeyJoinColumn = newPkJoinColumn; - firePropertyChanged(IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn); + firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn); } - protected ListIterator<IJavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { + protected ListIterator<JavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { if (this.defaultPrimaryKeyJoinColumn != null) { - return new SingleElementListIterator<IJavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn); + return new SingleElementListIterator<JavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn); } return EmptyListIterator.instance(); } @@ -675,8 +686,8 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return (this.defaultPrimaryKeyJoinColumn == null) ? 0 : 1; } - public IPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { - IJavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn(); + public PrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { + JavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn(); if (oldDefaultPkJoinColumn != null) { //null the default join column now if one already exists. //if one does not exist, there is already a specified join column. @@ -684,103 +695,103 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity //cause change notifications to be sent to the UI in the wrong order this.defaultPrimaryKeyJoinColumn = null; } - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); - PrimaryKeyJoinColumn pkJoinColumnResource = (PrimaryKeyJoinColumn) this.persistentTypeResource.addAnnotation(index, PrimaryKeyJoinColumn.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) this.persistentTypeResource.addAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource); - this.fireItemAdded(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); + this.fireItemAdded(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); if (oldDefaultPkJoinColumn != null) { - this.firePropertyChanged(IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null); + this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null); } return primaryKeyJoinColumn; } - protected void addSpecifiedPrimaryKeyJoinColumn(int index, IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { - addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void addSpecifiedPrimaryKeyJoinColumn(int index, JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { + addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } - public void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn primaryKeyJoinColumn) { + public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) { removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(primaryKeyJoinColumn)); } public void removeSpecifiedPrimaryKeyJoinColumn(int index) { - IJavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); + JavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); if (!containsSpecifiedPrimaryKeyJoinColumns()) { //create the defaultJoinColumn now or this will happen during project update //after removing the join column from the resource model. That causes problems //in the UI because the change notifications end up in the wrong order. this.defaultPrimaryKeyJoinColumn = createPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(this.persistentTypeResource)); } - this.persistentTypeResource.removeAnnotation(index, PrimaryKeyJoinColumn.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); - fireItemRemoved(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); + this.persistentTypeResource.removeAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); + fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); if (this.defaultPrimaryKeyJoinColumn != null) { //fire change notification if a defaultJoinColumn was created above - this.firePropertyChanged(IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn); + this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn); } } - protected void removeSpecifiedPrimaryKeyJoinColumn_(IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { - removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void removeSpecifiedPrimaryKeyJoinColumn_(JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { + removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) { this.persistentTypeResource.move(targetIndex, sourceIndex, PrimaryKeyJoinColumns.ANNOTATION_NAME); - moveItemInList(targetIndex, sourceIndex, this.specifiedPrimaryKeyJoinColumns, IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + moveItemInList(targetIndex, sourceIndex, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } @SuppressWarnings("unchecked") - public ListIterator<IJavaAttributeOverride> attributeOverrides() { - return new CompositeListIterator<IJavaAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); + public ListIterator<JavaAttributeOverride> attributeOverrides() { + return new CompositeListIterator<JavaAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); } public int attributeOverridesSize() { return this.specifiedAttributeOverridesSize() + this.defaultAttributeOverridesSize(); } - public ListIterator<IJavaAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<JavaAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { return this.defaultAttributeOverrides.size(); } - public ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<IJavaAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<JavaAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<JavaAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public IJavaAttributeOverride addSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, createAttributeOverrideOwner()); + public JavaAttributeOverride addSpecifiedAttributeOverride(int index) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); this.specifiedAttributeOverrides.add(index, attributeOverride); - AttributeOverride attributeOverrideResource = (AttributeOverride) this.persistentTypeResource.addAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.persistentTypeResource.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); attributeOverride.initializeFromResource(attributeOverrideResource); - this.fireItemAdded(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected IAttributeOverride.Owner createAttributeOverrideOwner() { + protected AttributeOverride.Owner createAttributeOverrideOwner() { return new AttributeOverrideOwner(); } - protected void addSpecifiedAttributeOverride(int index, IJavaAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, JavaAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - IJavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + JavaAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); //add the default attribute override so that I can control the order that change notification is sent. //otherwise when we remove the annotation from java we will get an update and add the attribute override //during the udpate. This causes the UI to be flaky, since change notification might not occur in the correct order - IJavaAttributeOverride defaultAttributeOverride = null; + JavaAttributeOverride defaultAttributeOverride = null; if (removedAttributeOverride.getName() != null) { if (CollectionTools.contains(allOverridableAttributeNames(), removedAttributeOverride.getName())) { defaultAttributeOverride = createAttributeOverride(new NullAttributeOverride(this.persistentTypeResource, removedAttributeOverride.getName())); @@ -788,34 +799,34 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - this.persistentTypeResource.removeAnnotation(index, AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); - fireItemRemoved(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + this.persistentTypeResource.removeAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + fireItemRemoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); if (defaultAttributeOverride != null) { - fireItemAdded(IEntity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); + fireItemAdded(Entity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST, defaultAttributeOverridesSize() - 1, defaultAttributeOverride); } } - protected void removeSpecifiedAttributeOverride_(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.persistentTypeResource.move(targetIndex, sourceIndex, AttributeOverrides.ANNOTATION_NAME); - fireItemMoved(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } - protected void addDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - addItemToList(attributeOverride, this.defaultAttributeOverrides, IEntity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void addDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + addItemToList(attributeOverride, this.defaultAttributeOverrides, Entity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - protected void removeDefaultAttributeOverride(IJavaAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.defaultAttributeOverrides, IEntity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); + protected void removeDefaultAttributeOverride(JavaAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.defaultAttributeOverrides, Entity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST); } - public IJavaAttributeOverride attributeOverrideNamed(String name) { - return (IJavaAttributeOverride) overrideNamed(name, attributeOverrides()); + public JavaAttributeOverride attributeOverrideNamed(String name) { + return (JavaAttributeOverride) overrideNamed(name, attributeOverrides()); } public boolean containsAttributeOverride(String name) { @@ -830,8 +841,8 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return containsOverride(name, specifiedAttributeOverrides()); } - public IJavaAssociationOverride associationOverrideNamed(String name) { - return (IJavaAssociationOverride) overrideNamed(name, associationOverrides()); + public JavaAssociationOverride associationOverrideNamed(String name) { + return (JavaAssociationOverride) overrideNamed(name, associationOverrides()); } public boolean containsAssociationOverride(String name) { @@ -846,8 +857,8 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return containsOverride(name, defaultAssociationOverrides()); } - private IOverride overrideNamed(String name, ListIterator<? extends IOverride> overrides) { - for (IOverride override : CollectionTools.iterable(overrides)) { + private BaseOverride overrideNamed(String name, ListIterator<? extends BaseOverride> overrides) { + for (BaseOverride override : CollectionTools.iterable(overrides)) { String overrideName = override.getName(); if (overrideName == null && name == null) { return override; @@ -859,60 +870,60 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return null; } - private boolean containsOverride(String name, ListIterator<? extends IOverride> overrides) { + private boolean containsOverride(String name, ListIterator<? extends BaseOverride> overrides) { return overrideNamed(name, overrides) != null; } @SuppressWarnings("unchecked") - public ListIterator<IJavaAssociationOverride> associationOverrides() { - return new CompositeListIterator<IJavaAssociationOverride>(specifiedAssociationOverrides(), defaultAssociationOverrides()); + public ListIterator<JavaAssociationOverride> associationOverrides() { + return new CompositeListIterator<JavaAssociationOverride>(specifiedAssociationOverrides(), defaultAssociationOverrides()); } public int associationOverridesSize() { return this.specifiedAssociationOverridesSize() + this.defaultAssociationOverridesSize(); } - public ListIterator<IJavaAssociationOverride> defaultAssociationOverrides() { - return new CloneListIterator<IJavaAssociationOverride>(this.defaultAssociationOverrides); + public ListIterator<JavaAssociationOverride> defaultAssociationOverrides() { + return new CloneListIterator<JavaAssociationOverride>(this.defaultAssociationOverrides); } public int defaultAssociationOverridesSize() { return this.defaultAssociationOverrides.size(); } - public ListIterator<IJavaAssociationOverride> specifiedAssociationOverrides() { - return new CloneListIterator<IJavaAssociationOverride>(this.specifiedAssociationOverrides); + public ListIterator<JavaAssociationOverride> specifiedAssociationOverrides() { + return new CloneListIterator<JavaAssociationOverride>(this.specifiedAssociationOverrides); } public int specifiedAssociationOverridesSize() { return this.specifiedAssociationOverrides.size(); } - public IJavaAssociationOverride addSpecifiedAssociationOverride(int index) { - IJavaAssociationOverride associationOverride = jpaFactory().createJavaAssociationOverride(this, createAssociationOverrideOwner()); + public JavaAssociationOverride addSpecifiedAssociationOverride(int index) { + JavaAssociationOverride associationOverride = jpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); this.specifiedAssociationOverrides.add(index, associationOverride); - AssociationOverride associationOverrideResource = (AssociationOverride) this.persistentTypeResource.addAnnotation(index, AssociationOverride.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) this.persistentTypeResource.addAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); associationOverride.initializeFromResource(associationOverrideResource); - this.fireItemAdded(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride); + this.fireItemAdded(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride); return associationOverride; } - protected IAssociationOverride.Owner createAssociationOverrideOwner() { + protected AssociationOverride.Owner createAssociationOverrideOwner() { return new AssociationOverrideOwner(); } - protected void addSpecifiedAssociationOverride(int index, IJavaAssociationOverride associationOverride) { - addItemToList(index, associationOverride, this.specifiedAssociationOverrides, IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); + protected void addSpecifiedAssociationOverride(int index, JavaAssociationOverride associationOverride) { + addItemToList(index, associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); } - public void removeSpecifiedAssociationOverride(IAssociationOverride associationOverride) { + public void removeSpecifiedAssociationOverride(AssociationOverride associationOverride) { removeSpecifiedAssociationOverride(this.specifiedAssociationOverrides.indexOf(associationOverride)); } public void removeSpecifiedAssociationOverride(int index) { - IJavaAssociationOverride removedAssociationOverride = this.specifiedAssociationOverrides.remove(index); - IJavaAssociationOverride defaultAssociationOverride = null; + JavaAssociationOverride removedAssociationOverride = this.specifiedAssociationOverrides.remove(index); + JavaAssociationOverride defaultAssociationOverride = null; //add the default association override so that I can control the order that change notification is sent. //otherwise when we remove the annotation from java we will get an update and add the association override @@ -923,110 +934,110 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity this.defaultAssociationOverrides.add(defaultAssociationOverride); } } - this.persistentTypeResource.removeAnnotation(index, AssociationOverride.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); - fireItemRemoved(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, removedAssociationOverride); + this.persistentTypeResource.removeAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + fireItemRemoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, removedAssociationOverride); if (defaultAssociationOverride != null) { - fireItemAdded(IEntity.DEFAULT_ASSOCIATION_OVERRIDES_LIST, defaultAssociationOverridesSize() - 1, defaultAssociationOverride); + fireItemAdded(Entity.DEFAULT_ASSOCIATION_OVERRIDES_LIST, defaultAssociationOverridesSize() - 1, defaultAssociationOverride); } } - protected void removeSpecifiedAssociationOverride_(IJavaAssociationOverride associationOverride) { - removeItemFromList(associationOverride, this.specifiedAssociationOverrides, IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); + protected void removeSpecifiedAssociationOverride_(JavaAssociationOverride associationOverride) { + removeItemFromList(associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); } public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex); this.persistentTypeResource.move(targetIndex, sourceIndex, AssociationOverrides.ANNOTATION_NAME); - fireItemMoved(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex); } - protected void addDefaultAssociationOverride(IJavaAssociationOverride associationOverride) { - addItemToList(associationOverride, this.defaultAssociationOverrides, IEntity.DEFAULT_ASSOCIATION_OVERRIDES_LIST); + protected void addDefaultAssociationOverride(JavaAssociationOverride associationOverride) { + addItemToList(associationOverride, this.defaultAssociationOverrides, Entity.DEFAULT_ASSOCIATION_OVERRIDES_LIST); } - protected void removeDefaultAssociationOverride(IJavaAssociationOverride associationOverride) { - removeItemFromList(associationOverride, this.defaultAssociationOverrides, IEntity.DEFAULT_ASSOCIATION_OVERRIDES_LIST); + protected void removeDefaultAssociationOverride(JavaAssociationOverride associationOverride) { + removeItemFromList(associationOverride, this.defaultAssociationOverrides, Entity.DEFAULT_ASSOCIATION_OVERRIDES_LIST); } - public ListIterator<IJavaNamedQuery> namedQueries() { - return new CloneListIterator<IJavaNamedQuery>(this.namedQueries); + public ListIterator<JavaNamedQuery> namedQueries() { + return new CloneListIterator<JavaNamedQuery>(this.namedQueries); } public int namedQueriesSize() { return this.namedQueries.size(); } - public IJavaNamedQuery addNamedQuery(int index) { - IJavaNamedQuery namedQuery = jpaFactory().createJavaNamedQuery(this); + public JavaNamedQuery addNamedQuery(int index) { + JavaNamedQuery namedQuery = jpaFactory().buildJavaNamedQuery(this); this.namedQueries.add(index, namedQuery); - this.persistentTypeResource.addAnnotation(index, NamedQuery.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); - fireItemAdded(IEntity.NAMED_QUERIES_LIST, index, namedQuery); + this.persistentTypeResource.addAnnotation(index, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + fireItemAdded(Entity.NAMED_QUERIES_LIST, index, namedQuery); return namedQuery; } - protected void addNamedQuery(int index, IJavaNamedQuery namedQuery) { - addItemToList(index, namedQuery, this.namedQueries, IEntity.NAMED_QUERIES_LIST); + protected void addNamedQuery(int index, JavaNamedQuery namedQuery) { + addItemToList(index, namedQuery, this.namedQueries, Entity.NAMED_QUERIES_LIST); } - public void removeNamedQuery(INamedQuery namedQuery) { + public void removeNamedQuery(NamedQuery namedQuery) { removeNamedQuery(this.namedQueries.indexOf(namedQuery)); } public void removeNamedQuery(int index) { - IJavaNamedQuery removedNamedQuery = this.namedQueries.remove(index); - this.persistentTypeResource.removeAnnotation(index, NamedQuery.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); - fireItemRemoved(IEntity.NAMED_QUERIES_LIST, index, removedNamedQuery); + JavaNamedQuery removedNamedQuery = this.namedQueries.remove(index); + this.persistentTypeResource.removeAnnotation(index, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + fireItemRemoved(Entity.NAMED_QUERIES_LIST, index, removedNamedQuery); } - protected void removeNamedQuery_(IJavaNamedQuery namedQuery) { - removeItemFromList(namedQuery, this.namedQueries, IEntity.NAMED_QUERIES_LIST); + protected void removeNamedQuery_(JavaNamedQuery namedQuery) { + removeItemFromList(namedQuery, this.namedQueries, Entity.NAMED_QUERIES_LIST); } public void moveNamedQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedQueries, targetIndex, sourceIndex); this.persistentTypeResource.move(targetIndex, sourceIndex, NamedQueries.ANNOTATION_NAME); - fireItemMoved(IEntity.NAMED_QUERIES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.NAMED_QUERIES_LIST, targetIndex, sourceIndex); } - public ListIterator<IJavaNamedNativeQuery> namedNativeQueries() { - return new CloneListIterator<IJavaNamedNativeQuery>(this.namedNativeQueries); + public ListIterator<JavaNamedNativeQuery> namedNativeQueries() { + return new CloneListIterator<JavaNamedNativeQuery>(this.namedNativeQueries); } public int namedNativeQueriesSize() { return this.namedNativeQueries.size(); } - public IJavaNamedNativeQuery addNamedNativeQuery(int index) { - IJavaNamedNativeQuery namedNativeQuery = jpaFactory().createJavaNamedNativeQuery(this); + public JavaNamedNativeQuery addNamedNativeQuery(int index) { + JavaNamedNativeQuery namedNativeQuery = jpaFactory().buildJavaNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); - this.persistentTypeResource.addAnnotation(index, NamedNativeQuery.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); - fireItemAdded(IEntity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); + this.persistentTypeResource.addAnnotation(index, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + fireItemAdded(Entity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); return namedNativeQuery; } - protected void addNamedNativeQuery(int index, IJavaNamedNativeQuery namedNativeQuery) { - addItemToList(index, namedNativeQuery, this.namedNativeQueries, IEntity.NAMED_NATIVE_QUERIES_LIST); + protected void addNamedNativeQuery(int index, JavaNamedNativeQuery namedNativeQuery) { + addItemToList(index, namedNativeQuery, this.namedNativeQueries, Entity.NAMED_NATIVE_QUERIES_LIST); } - public void removeNamedNativeQuery(INamedNativeQuery namedNativeQuery) { + public void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery) { this.removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery)); } public void removeNamedNativeQuery(int index) { - IJavaNamedNativeQuery removedNamedNativeQuery = this.namedNativeQueries.remove(index); - this.persistentTypeResource.removeAnnotation(index, NamedNativeQuery.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); - fireItemRemoved(IEntity.NAMED_NATIVE_QUERIES_LIST, index, removedNamedNativeQuery); + JavaNamedNativeQuery removedNamedNativeQuery = this.namedNativeQueries.remove(index); + this.persistentTypeResource.removeAnnotation(index, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + fireItemRemoved(Entity.NAMED_NATIVE_QUERIES_LIST, index, removedNamedNativeQuery); } - protected void removeNamedNativeQuery_(IJavaNamedNativeQuery namedNativeQuery) { - removeItemFromList(namedNativeQuery, this.namedNativeQueries, IEntity.NAMED_NATIVE_QUERIES_LIST); + protected void removeNamedNativeQuery_(JavaNamedNativeQuery namedNativeQuery) { + removeItemFromList(namedNativeQuery, this.namedNativeQueries, Entity.NAMED_NATIVE_QUERIES_LIST); } public void moveNamedNativeQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex); this.persistentTypeResource.move(targetIndex, sourceIndex, NamedNativeQueries.ANNOTATION_NAME); - fireItemMoved(IEntity.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex); } public String getIdClass() { @@ -1047,13 +1058,13 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity removeIdClassResource(); } } - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected void setIdClass_(String newIdClass) { String oldIdClass = this.idClass; this.idClass = newIdClass; - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected IdClass idClassResource() { @@ -1068,22 +1079,22 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity this.persistentTypeResource.removeAnnotation(IdClass.ANNOTATION_NAME); } - public IEntity parentEntity() { - for (Iterator<IPersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { - ITypeMapping typeMapping = i.next().getMapping(); - if (typeMapping != this && typeMapping instanceof IEntity) { - return (IEntity) typeMapping; + public Entity parentEntity() { + for (Iterator<PersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { + TypeMapping typeMapping = i.next().getMapping(); + if (typeMapping != this && typeMapping instanceof Entity) { + return (Entity) typeMapping; } } return this; } - public IEntity rootEntity() { - IEntity rootEntity = this; - for (Iterator<IPersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { - IPersistentType persistentType = i.next(); - if (persistentType.getMapping() instanceof IEntity) { - rootEntity = (IEntity) persistentType.getMapping(); + public Entity rootEntity() { + Entity rootEntity = this; + for (Iterator<PersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { + PersistentType persistentType = i.next(); + if (persistentType.getMapping() instanceof Entity) { + rootEntity = (Entity) persistentType.getMapping(); } } return rootEntity; @@ -1093,10 +1104,10 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return primaryKeyColumnName(persistentType().allAttributes()); } - public static String primaryKeyColumnName(Iterator<IPersistentAttribute> attributes) { + public static String primaryKeyColumnName(Iterator<PersistentAttribute> attributes) { String pkColumnName = null; - for (Iterator<IPersistentAttribute> stream = attributes; stream.hasNext();) { - IPersistentAttribute attribute = stream.next(); + for (Iterator<PersistentAttribute> stream = attributes; stream.hasNext();) { + PersistentAttribute attribute = stream.next(); String name = attribute.primaryKeyColumnName(); if (pkColumnName == null) { pkColumnName = name; @@ -1136,18 +1147,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } @Override - public Iterator<ITable> associatedTables() { - return new CompositeIterator<ITable>(this.getTable(), this.secondaryTables()); + public Iterator<Table> associatedTables() { + return new CompositeIterator<Table>(this.getTable(), this.secondaryTables()); } @Override - public Iterator<ITable> associatedTablesIncludingInherited() { - return new CompositeIterator<ITable>(new TransformationIterator<ITypeMapping, Iterator<ITable>>(this.inheritanceHierarchy()) { + public Iterator<Table> associatedTablesIncludingInherited() { + return new CompositeIterator<Table>(new TransformationIterator<TypeMapping, Iterator<Table>>(this.inheritanceHierarchy()) { @Override - protected Iterator<ITable> transform(ITypeMapping mapping) { - return new FilteringIterator<ITable, ITable>(mapping.associatedTables()) { + protected Iterator<Table> transform(TypeMapping mapping) { + return new FilteringIterator<Table, Table>(mapping.associatedTables()) { @Override - protected boolean accept(ITable o) { + protected boolean accept(Table o) { return true; //TODO //filtering these out so as to avoid the duplicate table, root and children share the same table @@ -1163,7 +1174,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return this.nonNullTableNames(this.associatedTablesIncludingInherited()); } - protected Iterator<String> nonNullTableNames(Iterator<ITable> tables) { + protected Iterator<String> nonNullTableNames(Iterator<Table> tables) { return new FilteringIterator<String, String>(this.tableNames(tables)) { @Override protected boolean accept(String o) { @@ -1172,10 +1183,10 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity }; } - protected Iterator<String> tableNames(Iterator<ITable> tables) { - return new TransformationIterator<ITable, String>(tables) { + protected Iterator<String> tableNames(Iterator<Table> tables) { + return new TransformationIterator<Table, String>(tables) { @Override - protected String transform(ITable t) { + protected String transform(Table t) { return t.getName(); } }; @@ -1185,10 +1196,10 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity * Return an iterator of Entities, each which inherits from the one before, * and terminates at the root entity (or at the point of cyclicity). */ - protected Iterator<ITypeMapping> inheritanceHierarchy() { - return new TransformationIterator<IPersistentType, ITypeMapping>(persistentType().inheritanceHierarchy()) { + protected Iterator<TypeMapping> inheritanceHierarchy() { + return new TransformationIterator<PersistentType, TypeMapping>(persistentType().inheritanceHierarchy()) { @Override - protected ITypeMapping transform(IPersistentType type) { + protected TypeMapping transform(PersistentType type) { return type.getMapping(); } }; @@ -1196,9 +1207,9 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity @Override public Iterator<String> allOverridableAttributeNames() { - return new CompositeIterator<String>(new TransformationIterator<ITypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { + return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { @Override - protected Iterator<String> transform(ITypeMapping mapping) { + protected Iterator<String> transform(TypeMapping mapping) { return mapping.overridableAttributeNames(); } }); @@ -1206,18 +1217,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity @Override public Iterator<String> allOverridableAssociationNames() { - return new CompositeIterator<String>(new TransformationIterator<ITypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { + return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { @Override - protected Iterator<String> transform(ITypeMapping mapping) { + protected Iterator<String> transform(TypeMapping mapping) { return mapping.overridableAssociationNames(); } }); } @Override - public void update(JavaPersistentTypeResource persistentTypeResource) { + public void update(JavaResourcePersistentType persistentTypeResource) { super.update(persistentTypeResource); - this.entityResource = (Entity) persistentTypeResource.mappingAnnotation(Entity.ANNOTATION_NAME); + this.entityResource = (EntityAnnotation) persistentTypeResource.mappingAnnotation(EntityAnnotation.ANNOTATION_NAME); this.setSpecifiedName(this.specifiedName(this.entityResource)); this.setDefaultName(this.defaultName(persistentTypeResource)); @@ -1241,15 +1252,15 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity this.updateIdClass(persistentTypeResource); } - protected String specifiedName(Entity entityResource) { + protected String specifiedName(EntityAnnotation entityResource) { return entityResource.getName(); } - protected String defaultName(JavaPersistentTypeResource persistentTypeResource) { + protected String defaultName(JavaResourcePersistentType persistentTypeResource) { return persistentTypeResource.getName(); } - protected void updateTable(JavaPersistentTypeResource persistentTypeResource) { + protected void updateTable(JavaResourcePersistentType persistentTypeResource) { getTable().update(persistentTypeResource); } @@ -1269,7 +1280,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return rootEntity().getInheritanceStrategy(); } - protected void updateDiscriminatorColumn(JavaPersistentTypeResource persistentTypeResource) { + protected void updateDiscriminatorColumn(JavaResourcePersistentType persistentTypeResource) { getDiscriminatorColumn().update(persistentTypeResource); } @@ -1278,18 +1289,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity this.setDefaultDiscriminatorValue(this.javaDefaultDiscriminatorValue()); } - protected boolean discriminatorValueIsAllowed(JavaPersistentTypeResource persistentTypeResource) { + protected boolean discriminatorValueIsAllowed(JavaResourcePersistentType persistentTypeResource) { return !persistentTypeResource.isAbstract(); } - protected void updateSecondaryTables(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaSecondaryTable> secondaryTables = specifiedSecondaryTables(); - ListIterator<JavaResource> resourceSecondaryTables = persistentTypeResource.annotations(SecondaryTable.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); + protected void updateSecondaryTables(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaSecondaryTable> secondaryTables = specifiedSecondaryTables(); + ListIterator<JavaResourceNode> resourceSecondaryTables = persistentTypeResource.annotations(SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); while (secondaryTables.hasNext()) { - IJavaSecondaryTable secondaryTable = secondaryTables.next(); + JavaSecondaryTable secondaryTable = secondaryTables.next(); if (resourceSecondaryTables.hasNext()) { - secondaryTable.update((SecondaryTable) resourceSecondaryTables.next()); + secondaryTable.update((SecondaryTableAnnotation) resourceSecondaryTables.next()); } else { removeSpecifiedSecondaryTable_(secondaryTable); @@ -1297,18 +1308,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourceSecondaryTables.hasNext()) { - addSpecifiedSecondaryTable(specifiedSecondaryTablesSize(), createSecondaryTable((SecondaryTable) resourceSecondaryTables.next())); + addSpecifiedSecondaryTable(specifiedSecondaryTablesSize(), createSecondaryTable((SecondaryTableAnnotation) resourceSecondaryTables.next())); } } - protected IJavaSecondaryTable createSecondaryTable(SecondaryTable secondaryTableResource) { - IJavaSecondaryTable secondaryTable = jpaFactory().createJavaSecondaryTable(this); + protected JavaSecondaryTable createSecondaryTable(SecondaryTableAnnotation secondaryTableResource) { + JavaSecondaryTable secondaryTable = jpaFactory().buildJavaSecondaryTable(this); secondaryTable.initializeFromResource(secondaryTableResource); return secondaryTable; } - protected void updateTableGenerator(JavaPersistentTypeResource persistentTypeResource) { - TableGenerator tableGeneratorResource = tableGenerator(persistentTypeResource); + protected void updateTableGenerator(JavaResourcePersistentType persistentTypeResource) { + TableGeneratorAnnotation tableGeneratorResource = tableGenerator(persistentTypeResource); if (tableGeneratorResource == null) { if (getTableGenerator() != null) { setTableGenerator(null); @@ -1324,18 +1335,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected IJavaTableGenerator createTableGenerator(TableGenerator tableGeneratorResource) { - IJavaTableGenerator tableGenerator = jpaFactory().createJavaTableGenerator(this); + protected JavaTableGenerator createTableGenerator(TableGeneratorAnnotation tableGeneratorResource) { + JavaTableGenerator tableGenerator = jpaFactory().buildJavaTableGenerator(this); tableGenerator.initializeFromResource(tableGeneratorResource); return tableGenerator; } - protected TableGenerator tableGenerator(JavaPersistentTypeResource persistentTypeResource) { - return (TableGenerator) persistentTypeResource.annotation(TableGenerator.ANNOTATION_NAME); + protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentType persistentTypeResource) { + return (TableGeneratorAnnotation) persistentTypeResource.annotation(TableGeneratorAnnotation.ANNOTATION_NAME); } - protected void updateSequenceGenerator(JavaPersistentTypeResource persistentTypeResource) { - SequenceGenerator sequenceGeneratorResource = sequenceGenerator(persistentTypeResource); + protected void updateSequenceGenerator(JavaResourcePersistentType persistentTypeResource) { + SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(persistentTypeResource); if (sequenceGeneratorResource == null) { if (getSequenceGenerator() != null) { setSequenceGenerator(null); @@ -1351,25 +1362,25 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected IJavaSequenceGenerator createSequenceGenerator(SequenceGenerator sequenceGeneratorResource) { - IJavaSequenceGenerator sequenceGenerator = jpaFactory().createJavaSequenceGenerator(this); + protected JavaSequenceGenerator createSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) { + JavaSequenceGenerator sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); sequenceGenerator.initializeFromResource(sequenceGeneratorResource); return sequenceGenerator; } - protected SequenceGenerator sequenceGenerator(JavaPersistentTypeResource persistentTypeResource) { - return (SequenceGenerator) persistentTypeResource.annotation(SequenceGenerator.ANNOTATION_NAME); + protected SequenceGeneratorAnnotation sequenceGenerator(JavaResourcePersistentType persistentTypeResource) { + return (SequenceGeneratorAnnotation) persistentTypeResource.annotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); } - protected void updateSpecifiedPrimaryKeyJoinColumns(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); - ListIterator<JavaResource> resourcePrimaryKeyJoinColumns = persistentTypeResource.annotations(PrimaryKeyJoinColumn.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); + protected void updateSpecifiedPrimaryKeyJoinColumns(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); + ListIterator<JavaResourceNode> resourcePrimaryKeyJoinColumns = persistentTypeResource.annotations(PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); while (primaryKeyJoinColumns.hasNext()) { - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); if (resourcePrimaryKeyJoinColumns.hasNext()) { - primaryKeyJoinColumn.update((PrimaryKeyJoinColumn) resourcePrimaryKeyJoinColumns.next()); + primaryKeyJoinColumn.update((PrimaryKeyJoinColumnAnnotation) resourcePrimaryKeyJoinColumns.next()); } else { removeSpecifiedPrimaryKeyJoinColumn_(primaryKeyJoinColumn); @@ -1377,17 +1388,17 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourcePrimaryKeyJoinColumns.hasNext()) { - addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), createPrimaryKeyJoinColumn((PrimaryKeyJoinColumn) resourcePrimaryKeyJoinColumns.next())); + addSpecifiedPrimaryKeyJoinColumn(specifiedPrimaryKeyJoinColumnsSize(), createPrimaryKeyJoinColumn((PrimaryKeyJoinColumnAnnotation) resourcePrimaryKeyJoinColumns.next())); } } - protected IJavaPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumnResource) { - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + protected JavaPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) { + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource); return primaryKeyJoinColumn; } - protected void updateDefaultPrimaryKeyJoinColumn(JavaPersistentTypeResource persistentTypeResource) { + protected void updateDefaultPrimaryKeyJoinColumn(JavaResourcePersistentType persistentTypeResource) { if (!shouldBuildDefaultPrimaryKeyJoinColumn()) { setDefaultPrimaryKeyJoinColumn(null); return; @@ -1400,14 +1411,14 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected void updateSpecifiedAttributeOverrides(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<JavaResource> resourceAttributeOverrides = persistentTypeResource.annotations(AttributeOverride.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); + protected void updateSpecifiedAttributeOverrides(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<JavaResourceNode> resourceAttributeOverrides = persistentTypeResource.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while (attributeOverrides.hasNext()) { - IJavaAttributeOverride attributeOverride = attributeOverrides.next(); + JavaAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { - attributeOverride.update((AttributeOverride) resourceAttributeOverrides.next()); + attributeOverride.update((AttributeOverrideAnnotation) resourceAttributeOverrides.next()); } else { removeSpecifiedAttributeOverride_(attributeOverride); @@ -1415,20 +1426,20 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourceAttributeOverrides.hasNext()) { - addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverride) resourceAttributeOverrides.next())); + addSpecifiedAttributeOverride(specifiedAttributeOverridesSize(), createAttributeOverride((AttributeOverrideAnnotation) resourceAttributeOverrides.next())); } } - protected IJavaAttributeOverride createAttributeOverride(AttributeOverride attributeOverrideResource) { - IJavaAttributeOverride attributeOverride = jpaFactory().createJavaAttributeOverride(this, createAttributeOverrideOwner()); + protected JavaAttributeOverride createAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) { + JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); attributeOverride.initializeFromResource(attributeOverrideResource); return attributeOverride; } - protected void updateDefaultAttributeOverrides(JavaPersistentTypeResource persistentTypeResource) { + protected void updateDefaultAttributeOverrides(JavaResourcePersistentType persistentTypeResource) { for (Iterator<String> i = allOverridableAttributeNames(); i.hasNext(); ) { String attributeName = i.next(); - IJavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); + JavaAttributeOverride attributeOverride = attributeOverrideNamed(attributeName); if (attributeOverride == null) { attributeOverride = createAttributeOverride(new NullAttributeOverride(persistentTypeResource, attributeName)); addDefaultAttributeOverride(attributeOverride); @@ -1441,7 +1452,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity Collection<String> attributeNames = CollectionTools.collection(allOverridableAttributeNames()); //remove any default mappings that are not included in the attributeNames collection - for (IJavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { + for (JavaAttributeOverride attributeOverride : CollectionTools.iterable(defaultAttributeOverrides())) { if (!attributeNames.contains(attributeOverride.getName()) || containsSpecifiedAttributeOverride(attributeOverride.getName())) { removeDefaultAttributeOverride(attributeOverride); @@ -1449,14 +1460,14 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected void updateSpecifiedAssociationOverrides(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaAssociationOverride> associationOverrides = specifiedAssociationOverrides(); - ListIterator<JavaResource> resourceAssociationOverrides = persistentTypeResource.annotations(AssociationOverride.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); + protected void updateSpecifiedAssociationOverrides(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaAssociationOverride> associationOverrides = specifiedAssociationOverrides(); + ListIterator<JavaResourceNode> resourceAssociationOverrides = persistentTypeResource.annotations(AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); while (associationOverrides.hasNext()) { - IJavaAssociationOverride associationOverride = associationOverrides.next(); + JavaAssociationOverride associationOverride = associationOverrides.next(); if (resourceAssociationOverrides.hasNext()) { - associationOverride.update((AssociationOverride) resourceAssociationOverrides.next()); + associationOverride.update((AssociationOverrideAnnotation) resourceAssociationOverrides.next()); } else { removeSpecifiedAssociationOverride_(associationOverride); @@ -1464,20 +1475,20 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourceAssociationOverrides.hasNext()) { - addSpecifiedAssociationOverride(specifiedAssociationOverridesSize(), createAssociationOverride((AssociationOverride) resourceAssociationOverrides.next())); + addSpecifiedAssociationOverride(specifiedAssociationOverridesSize(), createAssociationOverride((AssociationOverrideAnnotation) resourceAssociationOverrides.next())); } } - protected IJavaAssociationOverride createAssociationOverride(AssociationOverride associationOverrideResource) { - IJavaAssociationOverride associationOverride = jpaFactory().createJavaAssociationOverride(this, createAssociationOverrideOwner()); + protected JavaAssociationOverride createAssociationOverride(AssociationOverrideAnnotation associationOverrideResource) { + JavaAssociationOverride associationOverride = jpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); associationOverride.initializeFromResource(associationOverrideResource); return associationOverride; } - protected void updateDefaultAssociationOverrides(JavaPersistentTypeResource persistentTypeResource) { + protected void updateDefaultAssociationOverrides(JavaResourcePersistentType persistentTypeResource) { for (Iterator<String> i = allOverridableAssociationNames(); i.hasNext(); ) { String associationName = i.next(); - IJavaAssociationOverride associationOverride = associationOverrideNamed(associationName); + JavaAssociationOverride associationOverride = associationOverrideNamed(associationName); if (associationOverride == null) { associationOverride = createAssociationOverride(new NullAssociationOverride(persistentTypeResource, associationName)); addDefaultAssociationOverride(associationOverride); @@ -1491,7 +1502,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity Collection<String> associationNames = CollectionTools.collection(allOverridableAssociationNames()); //remove any default mappings that are not included in the associationNames collection - for (IJavaAssociationOverride associationOverride : CollectionTools.iterable(defaultAssociationOverrides())) { + for (JavaAssociationOverride associationOverride : CollectionTools.iterable(defaultAssociationOverrides())) { if (!associationNames.contains(associationOverride.getName()) || containsSpecifiedAssociationOverride(associationOverride.getName())) { removeDefaultAssociationOverride(associationOverride); @@ -1499,14 +1510,14 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } } - protected void updateNamedQueries(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaNamedQuery> namedQueries = namedQueries(); - ListIterator<JavaResource> resourceNamedQueries = persistentTypeResource.annotations(NamedQuery.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); + protected void updateNamedQueries(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaNamedQuery> namedQueries = namedQueries(); + ListIterator<JavaResourceNode> resourceNamedQueries = persistentTypeResource.annotations(NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); while (namedQueries.hasNext()) { - IJavaNamedQuery namedQuery = namedQueries.next(); + JavaNamedQuery namedQuery = namedQueries.next(); if (resourceNamedQueries.hasNext()) { - namedQuery.update((NamedQuery) resourceNamedQueries.next()); + namedQuery.update((NamedQueryAnnotation) resourceNamedQueries.next()); } else { removeNamedQuery_(namedQuery); @@ -1514,18 +1525,18 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourceNamedQueries.hasNext()) { - addNamedQuery(namedQueriesSize(), createNamedQuery((NamedQuery) resourceNamedQueries.next())); + addNamedQuery(namedQueriesSize(), createNamedQuery((NamedQueryAnnotation) resourceNamedQueries.next())); } } - protected void updateNamedNativeQueries(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaNamedNativeQuery> namedNativeQueries = namedNativeQueries(); - ListIterator<JavaResource> resourceNamedNativeQueries = persistentTypeResource.annotations(NamedNativeQuery.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); + protected void updateNamedNativeQueries(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaNamedNativeQuery> namedNativeQueries = namedNativeQueries(); + ListIterator<JavaResourceNode> resourceNamedNativeQueries = persistentTypeResource.annotations(NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); while (namedNativeQueries.hasNext()) { - IJavaNamedNativeQuery namedQuery = namedNativeQueries.next(); + JavaNamedNativeQuery namedQuery = namedNativeQueries.next(); if (resourceNamedNativeQueries.hasNext()) { - namedQuery.update((NamedNativeQuery) resourceNamedNativeQueries.next()); + namedQuery.update((NamedNativeQueryAnnotation) resourceNamedNativeQueries.next()); } else { removeNamedNativeQuery_(namedQuery); @@ -1533,24 +1544,24 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } while (resourceNamedNativeQueries.hasNext()) { - addNamedNativeQuery(namedQueriesSize(), createNamedNativeQuery((NamedNativeQuery) resourceNamedNativeQueries.next())); + addNamedNativeQuery(namedQueriesSize(), createNamedNativeQuery((NamedNativeQueryAnnotation) resourceNamedNativeQueries.next())); } } - protected IJavaNamedQuery createNamedQuery(NamedQuery namedQueryResource) { - IJavaNamedQuery namedQuery = jpaFactory().createJavaNamedQuery(this); + protected JavaNamedQuery createNamedQuery(NamedQueryAnnotation namedQueryResource) { + JavaNamedQuery namedQuery = jpaFactory().buildJavaNamedQuery(this); namedQuery.initializeFromResource(namedQueryResource); return namedQuery; } - protected IJavaNamedNativeQuery createNamedNativeQuery(NamedNativeQuery namedNativeQueryResource) { - IJavaNamedNativeQuery namedNativeQuery = jpaFactory().createJavaNamedNativeQuery(this); + protected JavaNamedNativeQuery createNamedNativeQuery(NamedNativeQueryAnnotation namedNativeQueryResource) { + JavaNamedNativeQuery namedNativeQuery = jpaFactory().buildJavaNamedNativeQuery(this); namedNativeQuery.initializeFromResource(namedNativeQueryResource); return namedNativeQuery; } - protected void updateIdClass(JavaPersistentTypeResource typeResource) { + protected void updateIdClass(JavaResourcePersistentType typeResource) { IdClass idClass = (IdClass) typeResource.annotation(IdClass.ANNOTATION_NAME); if (idClass != null) { setIdClass_(idClass.getValue()); @@ -1597,25 +1608,25 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity if (result != null) { return result; } - for (IJavaSecondaryTable sTable : CollectionTools.iterable(this.secondaryTables())) { + for (JavaSecondaryTable sTable : CollectionTools.iterable(this.secondaryTables())) { result = sTable.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - for (IJavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) { + for (JavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - for (IJavaAttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { + for (JavaAttributeOverride override : CollectionTools.iterable(this.attributeOverrides())) { result = override.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - for (IJavaAssociationOverride override : CollectionTools.iterable(this.associationOverrides())) { + for (JavaAssociationOverride override : CollectionTools.iterable(this.associationOverrides())) { result = override.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; @@ -1650,15 +1661,15 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity addTableMessages(messages, astRoot); addIdMessages(messages, astRoot); - for (IJavaSecondaryTable context : specifiedSecondaryTables) { + for (JavaSecondaryTable context : specifiedSecondaryTables) { context.addToMessages(messages, astRoot); } - for (Iterator<IJavaAttributeOverride> stream = this.attributeOverrides(); stream.hasNext();) { + for (Iterator<JavaAttributeOverride> stream = this.attributeOverrides(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } - for (Iterator<IJavaAssociationOverride> stream = this.associationOverrides(); stream.hasNext();) { + for (Iterator<JavaAssociationOverride> stream = this.associationOverrides(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } @@ -1670,9 +1681,9 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity if (doContinue && ! table.hasResolvedSchema()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.TABLE_UNRESOLVED_SCHEMA, + JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA, new String[] {schema, table.getName()}, table, table.schemaTextRange(astRoot)) ); @@ -1681,9 +1692,9 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity if (doContinue && ! table.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.TABLE_UNRESOLVED_NAME, + JpaValidationMessages.TABLE_UNRESOLVED_NAME, new String[] {table.getName()}, table, table.nameTextRange(astRoot)) ); @@ -1699,9 +1710,9 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity protected void addNoIdMessage(List<IMessage> messages, CompilationUnit astRoot) { if (entityHasNoId()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.ENTITY_NO_ID, + JpaValidationMessages.ENTITY_NO_ID, new String[] {this.getName()}, this, this.validationTextRange(astRoot)) ); @@ -1713,7 +1724,7 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity } private boolean entityHasId() { - for (Iterator<IPersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext(); ) { + for (Iterator<PersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext(); ) { if (stream.next().isIdAttribute()) { return true; } @@ -1721,99 +1732,99 @@ public class JavaEntity extends JavaTypeMapping implements IJavaEntity return false; } - class PrimaryKeyJoinColumnOwner implements IAbstractJoinColumn.Owner + class PrimaryKeyJoinColumnOwner implements AbstractJoinColumn.Owner { - public ITextRange validationTextRange(CompilationUnit astRoot) { - return JavaEntity.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericJavaEntity.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return JavaEntity.this; + public TypeMapping typeMapping() { + return GenericJavaEntity.this; } - public Table dbTable(String tableName) { - return JavaEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + return GenericJavaEntity.this.dbTable(tableName); } - public Table dbReferencedColumnTable() { - IEntity parentEntity = JavaEntity.this.parentEntity(); + public org.eclipse.jpt.db.internal.Table dbReferencedColumnTable() { + Entity parentEntity = GenericJavaEntity.this.parentEntity(); return (parentEntity == null) ? null : parentEntity.primaryDbTable(); } public int joinColumnsSize() { - return JavaEntity.this.primaryKeyJoinColumnsSize(); + return GenericJavaEntity.this.primaryKeyJoinColumnsSize(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaEntity.this.defaultPrimaryKeyJoinColumn == joinColumn; + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericJavaEntity.this.defaultPrimaryKeyJoinColumn == joinColumn; } public String defaultColumnName() { if (joinColumnsSize() != 1) { return null; } - return JavaEntity.this.parentEntity().primaryKeyColumnName(); + return GenericJavaEntity.this.parentEntity().primaryKeyColumnName(); } } - class AttributeOverrideOwner implements IAttributeOverride.Owner { + class AttributeOverrideOwner implements AttributeOverride.Owner { - public IColumnMapping columnMapping(String attributeName) { + public ColumnMapping columnMapping(String attributeName) { if (attributeName == null) { return null; } - for (Iterator<IPersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute persAttribute = stream.next(); + for (Iterator<PersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute persAttribute = stream.next(); if (attributeName.equals(persAttribute.getName())) { - if (persAttribute.getMapping() instanceof IColumnMapping) { - return (IColumnMapping) persAttribute.getMapping(); + if (persAttribute.getMapping() instanceof ColumnMapping) { + return (ColumnMapping) persAttribute.getMapping(); } } } return null; } - public boolean isVirtual(IOverride override) { - return JavaEntity.this.defaultAttributeOverrides.contains(override); + public boolean isVirtual(BaseOverride override) { + return GenericJavaEntity.this.defaultAttributeOverrides.contains(override); } - public ITypeMapping typeMapping() { - return JavaEntity.this; + public TypeMapping typeMapping() { + return GenericJavaEntity.this; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } } - class AssociationOverrideOwner implements IAssociationOverride.Owner { + class AssociationOverrideOwner implements AssociationOverride.Owner { - public IRelationshipMapping relationshipMapping(String attributeName) { + public RelationshipMapping relationshipMapping(String attributeName) { if (attributeName == null) { return null; } - for (Iterator<IPersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute persAttribute = stream.next(); + for (Iterator<PersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute persAttribute = stream.next(); if (attributeName.equals(persAttribute.getName())) { - if (persAttribute.getMapping() instanceof IRelationshipMapping) { - return (IRelationshipMapping) persAttribute.getMapping(); + if (persAttribute.getMapping() instanceof RelationshipMapping) { + return (RelationshipMapping) persAttribute.getMapping(); } } } return null; } - public boolean isVirtual(IOverride override) { - return JavaEntity.this.defaultAssociationOverrides.contains(override); + public boolean isVirtual(BaseOverride override) { + return GenericJavaEntity.this.defaultAssociationOverrides.contains(override); } - public ITypeMapping typeMapping() { - return JavaEntity.this; + public TypeMapping typeMapping() { + return GenericJavaEntity.this; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java index 5c4dd7e2a6..3b1890806e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java @@ -10,13 +10,15 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.GenerationType; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.resource.java.GeneratedValue; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.GenerationType; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaGeneratedValue; +import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; -public class JavaGeneratedValue extends JavaContextModel implements IJavaGeneratedValue +public class GenericJavaGeneratedValue extends JavaContextModel implements JavaGeneratedValue { protected GenerationType strategy; @@ -24,13 +26,13 @@ public class JavaGeneratedValue extends JavaContextModel implements IJavaGenerat protected String defaultGenerator; - protected GeneratedValue generatedValueResource; + protected GeneratedValueAnnotation generatedValueResource; - public JavaGeneratedValue(IJavaAttributeMapping parent) { + public GenericJavaGeneratedValue(JavaAttributeMapping parent) { super(parent); } - public void initializeFromResource(GeneratedValue generatedValue) { + public void initializeFromResource(GeneratedValueAnnotation generatedValue) { this.generatedValueResource = generatedValue; this.strategy = this.strategy(generatedValue); this.generator = this.generator(generatedValue); @@ -41,7 +43,7 @@ public class JavaGeneratedValue extends JavaContextModel implements IJavaGenerat } public GenerationType getDefaultStrategy() { - return IGeneratedValue.DEFAULT_STRATEGY; + return GeneratedValue.DEFAULT_STRATEGY; } public GenerationType getSpecifiedStrategy() { @@ -52,13 +54,13 @@ public class JavaGeneratedValue extends JavaContextModel implements IJavaGenerat GenerationType oldStrategy = this.strategy; this.strategy = newStrategy; this.generatedValueResource.setStrategy(GenerationType.toJavaResourceModel(newStrategy)); - firePropertyChanged(IGeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy); + firePropertyChanged(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy); } protected void setSpecifiedStrategy_(GenerationType newStrategy) { GenerationType oldStrategy = this.strategy; this.strategy = newStrategy; - firePropertyChanged(IGeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy); + firePropertyChanged(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY, oldStrategy, newStrategy); } public String getGenerator() { @@ -77,36 +79,36 @@ public class JavaGeneratedValue extends JavaContextModel implements IJavaGenerat String oldGenerator = this.generator; this.generator = newGenerator; this.generatedValueResource.setGenerator(newGenerator); - firePropertyChanged(IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator); + firePropertyChanged(GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator); } protected void setSpecifiedGenerator_(String newGenerator) { String oldGenerator = this.generator; this.generator = newGenerator; - firePropertyChanged(IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator); + firePropertyChanged(GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { return null;//TODO //this.member.annotationTextRange(DECLARATION_ANNOTATION_ADAPTER); } - public ITextRange generatorTextRange(CompilationUnit astRoot) { + public TextRange generatorTextRange(CompilationUnit astRoot) { return this.generatedValueResource.generatorTextRange(astRoot); } // ********** resource model -> java context model ********** - public void update(GeneratedValue generatedValue) { + public void update(GeneratedValueAnnotation generatedValue) { this.generatedValueResource = generatedValue; this.setSpecifiedStrategy_(this.strategy(generatedValue)); this.setSpecifiedGenerator_(this.generator(generatedValue)); } - protected GenerationType strategy(GeneratedValue generatedValue) { + protected GenerationType strategy(GeneratedValueAnnotation generatedValue) { return GenerationType.fromJavaResourceModel(generatedValue.getStrategy()); } - protected String generator(GeneratedValue generatedValue) { + protected String generator(GeneratedValueAnnotation generatedValue) { return generatedValue.getGenerator(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java index 6610550214..24161c2f16 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java @@ -13,47 +13,53 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.java.Column; -import org.eclipse.jpt.core.internal.resource.java.GeneratedValue; -import org.eclipse.jpt.core.internal.resource.java.Id; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.SequenceGenerator; -import org.eclipse.jpt.core.internal.resource.java.TableGenerator; -import org.eclipse.jpt.core.internal.resource.java.Temporal; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaGeneratedValue; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; +import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; +import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; +import org.eclipse.jpt.core.resource.java.Temporal; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMapping +public class GenericJavaIdMapping extends AbstractJavaAttributeMapping implements JavaIdMapping { - protected final IJavaColumn column; + protected final JavaColumn column; - protected IJavaGeneratedValue generatedValue; + protected JavaGeneratedValue generatedValue; protected TemporalType temporal; - protected IJavaTableGenerator tableGenerator; + protected JavaTableGenerator tableGenerator; - protected IJavaSequenceGenerator sequenceGenerator; + protected JavaSequenceGenerator sequenceGenerator; - public JavaIdMapping(IJavaPersistentAttribute parent) { + public GenericJavaIdMapping(JavaPersistentAttribute parent) { super(parent); this.column = createJavaColumn(); } - protected IJavaColumn createJavaColumn() { - return jpaFactory().createJavaColumn(this, this); + protected JavaColumn createJavaColumn() { + return jpaFactory().buildJavaColumn(this, this); } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.column.initializeFromResource(this.columnResource()); this.temporal = this.temporal(this.temporalResource()); @@ -62,26 +68,26 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin this.initializeGeneratedValue(persistentAttributeResource); } - protected void initializeTableGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - TableGenerator tableGeneratorResource = tableGenerator(persistentAttributeResource); + protected void initializeTableGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + TableGeneratorAnnotation tableGeneratorResource = tableGenerator(persistentAttributeResource); if (tableGeneratorResource != null) { - this.tableGenerator = jpaFactory().createJavaTableGenerator(this); + this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); this.tableGenerator.initializeFromResource(tableGeneratorResource); } } - protected void initializeSequenceGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - SequenceGenerator sequenceGeneratorResource = sequenceGenerator(persistentAttributeResource); + protected void initializeSequenceGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(persistentAttributeResource); if (sequenceGeneratorResource != null) { - this.sequenceGenerator = jpaFactory().createJavaSequenceGenerator(this); + this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); } } - protected void initializeGeneratedValue(JavaPersistentAttributeResource persistentAttributeResource) { - GeneratedValue generatedValueResource = generatedValue(persistentAttributeResource); + protected void initializeGeneratedValue(JavaResourcePersistentAttribute persistentAttributeResource) { + GeneratedValueAnnotation generatedValueResource = generatedValue(persistentAttributeResource); if (generatedValueResource != null) { - this.generatedValue = jpaFactory().createJavaGeneratedValue(this); + this.generatedValue = jpaFactory().buildJavaGeneratedValue(this); this.generatedValue.initializeFromResource(generatedValueResource); } } @@ -90,14 +96,14 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin return (Temporal) this.persistentAttributeResource.nonNullAnnotation(Temporal.ANNOTATION_NAME); } - public Column columnResource() { - return (Column) this.persistentAttributeResource.nonNullAnnotation(Column.ANNOTATION_NAME); + public ColumnAnnotation columnResource() { + return (ColumnAnnotation) this.persistentAttributeResource.nonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME); } //************** IJavaAttributeMapping implementation *************** public String getKey() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -123,7 +129,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin //************** IIdMapping implementation *************** - public IJavaColumn getColumn() { + public JavaColumn getColumn() { return this.column; } @@ -135,7 +141,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.temporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } /** @@ -147,15 +153,15 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin protected void setTemporal_(TemporalType newTemporal) { TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } - public IJavaGeneratedValue addGeneratedValue() { + public JavaGeneratedValue addGeneratedValue() { if (getGeneratedValue() != null) { throw new IllegalStateException("gemeratedValue already exists"); } - this.generatedValue = jpaFactory().createJavaGeneratedValue(this); - GeneratedValue generatedValueResource = (GeneratedValue) this.persistentAttributeResource.addAnnotation(GeneratedValue.ANNOTATION_NAME); + this.generatedValue = jpaFactory().buildJavaGeneratedValue(this); + GeneratedValueAnnotation generatedValueResource = (GeneratedValueAnnotation) this.persistentAttributeResource.addAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME); this.generatedValue.initializeFromResource(generatedValueResource); firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue); return this.generatedValue; @@ -165,28 +171,28 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin if (getGeneratedValue() == null) { throw new IllegalStateException("gemeratedValue does not exist, cannot be removed"); } - IJavaGeneratedValue oldGeneratedValue = this.generatedValue; + JavaGeneratedValue oldGeneratedValue = this.generatedValue; this.generatedValue = null; - this.persistentAttributeResource.removeAnnotation(GeneratedValue.ANNOTATION_NAME); + this.persistentAttributeResource.removeAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME); firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, null); } - public IJavaGeneratedValue getGeneratedValue() { + public JavaGeneratedValue getGeneratedValue() { return this.generatedValue; } - protected void setGeneratedValue(IJavaGeneratedValue newGeneratedValue) { - IJavaGeneratedValue oldGeneratedValue = this.generatedValue; + protected void setGeneratedValue(JavaGeneratedValue newGeneratedValue) { + JavaGeneratedValue oldGeneratedValue = this.generatedValue; this.generatedValue = newGeneratedValue; firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, newGeneratedValue); } - public IJavaTableGenerator addTableGenerator() { + public JavaTableGenerator addTableGenerator() { if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().createJavaTableGenerator(this); - TableGenerator tableGeneratorResource = (TableGenerator) this.persistentAttributeResource.addAnnotation(TableGenerator.ANNOTATION_NAME); + this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); + TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) this.persistentAttributeResource.addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); this.tableGenerator.initializeFromResource(tableGeneratorResource); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; @@ -196,29 +202,29 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin if (getTableGenerator() == null) { throw new IllegalStateException("tableGenerator does not exist, cannot be removed"); } - IJavaTableGenerator oldTableGenerator = this.tableGenerator; + JavaTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = null; - this.persistentAttributeResource.removeAnnotation(TableGenerator.ANNOTATION_NAME); + this.persistentAttributeResource.removeAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null); } - public IJavaTableGenerator getTableGenerator() { + public JavaTableGenerator getTableGenerator() { return this.tableGenerator; } - protected void setTableGenerator(IJavaTableGenerator newTableGenerator) { - IJavaTableGenerator oldTableGenerator = this.tableGenerator; + protected void setTableGenerator(JavaTableGenerator newTableGenerator) { + JavaTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = newTableGenerator; firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator); } - public IJavaSequenceGenerator addSequenceGenerator() { + public JavaSequenceGenerator addSequenceGenerator() { if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().createJavaSequenceGenerator(this); - SequenceGenerator sequenceGeneratorResource = (SequenceGenerator) this.persistentAttributeResource.addAnnotation(SequenceGenerator.ANNOTATION_NAME); + this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) this.persistentAttributeResource.addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; @@ -228,25 +234,25 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin if (getSequenceGenerator() == null) { throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed"); } - IJavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = null; - this.persistentAttributeResource.removeAnnotation(SequenceGenerator.ANNOTATION_NAME); + this.persistentAttributeResource.removeAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null); } - public IJavaSequenceGenerator getSequenceGenerator() { + public JavaSequenceGenerator getSequenceGenerator() { return this.sequenceGenerator; } - protected void setSequenceGenerator(IJavaSequenceGenerator newSequenceGenerator) { - IJavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + protected void setSequenceGenerator(JavaSequenceGenerator newSequenceGenerator) { + JavaSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = newSequenceGenerator; firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator); } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.column.update(this.columnResource()); this.setTemporal_(this.temporal(this.temporalResource())); @@ -259,8 +265,8 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin return TemporalType.fromJavaResourceModel(temporal.getValue()); } - protected void updateTableGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - TableGenerator tableGeneratorResource = tableGenerator(persistentAttributeResource); + protected void updateTableGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + TableGeneratorAnnotation tableGeneratorResource = tableGenerator(persistentAttributeResource); if (tableGeneratorResource == null) { if (getTableGenerator() != null) { setTableGenerator(null); @@ -268,7 +274,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } else { if (getTableGenerator() == null) { - setTableGenerator(jpaFactory().createJavaTableGenerator(this)); + setTableGenerator(jpaFactory().buildJavaTableGenerator(this)); getTableGenerator().initializeFromResource(tableGeneratorResource); } else { @@ -277,8 +283,8 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } } - protected void updateSequenceGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - SequenceGenerator sequenceGeneratorResource = sequenceGenerator(persistentAttributeResource); + protected void updateSequenceGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(persistentAttributeResource); if (sequenceGeneratorResource == null) { if (getSequenceGenerator() != null) { setSequenceGenerator(null); @@ -286,7 +292,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } else { if (getSequenceGenerator() == null) { - setSequenceGenerator(jpaFactory().createJavaSequenceGenerator(this)); + setSequenceGenerator(jpaFactory().buildJavaSequenceGenerator(this)); getSequenceGenerator().initializeFromResource(sequenceGeneratorResource); } else { @@ -295,8 +301,8 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } } - protected void updateGeneratedValue(JavaPersistentAttributeResource persistentAttributeResource) { - GeneratedValue generatedValueResource = generatedValue(persistentAttributeResource); + protected void updateGeneratedValue(JavaResourcePersistentAttribute persistentAttributeResource) { + GeneratedValueAnnotation generatedValueResource = generatedValue(persistentAttributeResource); if (generatedValueResource == null) { if (getGeneratedValue() != null) { setGeneratedValue(null); @@ -304,7 +310,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } else { if (getGeneratedValue() == null) { - setGeneratedValue(jpaFactory().createJavaGeneratedValue(this)); + setGeneratedValue(jpaFactory().buildJavaGeneratedValue(this)); getGeneratedValue().initializeFromResource(generatedValueResource); } else { @@ -313,16 +319,16 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } } - protected TableGenerator tableGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - return (TableGenerator) persistentAttributeResource.annotation(TableGenerator.ANNOTATION_NAME); + protected TableGeneratorAnnotation tableGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + return (TableGeneratorAnnotation) persistentAttributeResource.annotation(TableGeneratorAnnotation.ANNOTATION_NAME); } - protected SequenceGenerator sequenceGenerator(JavaPersistentAttributeResource persistentAttributeResource) { - return (SequenceGenerator) persistentAttributeResource.annotation(SequenceGenerator.ANNOTATION_NAME); + protected SequenceGeneratorAnnotation sequenceGenerator(JavaResourcePersistentAttribute persistentAttributeResource) { + return (SequenceGeneratorAnnotation) persistentAttributeResource.annotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); } - protected GeneratedValue generatedValue(JavaPersistentAttributeResource persistentAttributeResource) { - return (GeneratedValue) persistentAttributeResource.annotation(GeneratedValue.ANNOTATION_NAME); + protected GeneratedValueAnnotation generatedValue(JavaResourcePersistentAttribute persistentAttributeResource) { + return (GeneratedValueAnnotation) persistentAttributeResource.annotation(GeneratedValueAnnotation.ANNOTATION_NAME); } @@ -382,15 +388,15 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) { - IJavaColumn column = this.getColumn(); + JavaColumn column = this.getColumn(); String table = column.getTable(); boolean doContinue = entityOwned() && column.isConnected(); if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_TABLE, + JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, column.tableTextRange(astRoot)) ); @@ -399,9 +405,9 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin if (doContinue && ! column.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, column.nameTextRange(astRoot)) ); @@ -409,7 +415,7 @@ public class JavaIdMapping extends JavaAttributeMapping implements IJavaIdMappin } protected void addGeneratorMessages(List<IMessage> messages, CompilationUnit astRoot) { - IJavaGeneratedValue generatedValue = this.getGeneratedValue(); + JavaGeneratedValue generatedValue = this.getGeneratedValue(); if (generatedValue == null) { return; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java index afbcd82e6d..d8858459a1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java @@ -11,12 +11,14 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.java.JoinColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.Filter; @@ -25,21 +27,21 @@ import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJavaJoinColumn +public class GenericJavaJoinColumn extends AbstractJavaColumn<JoinColumnAnnotation> implements JavaJoinColumn { protected String specifiedReferencedColumnName; protected String defaultReferencedColumnName; - protected JoinColumn joinColumn; + protected JoinColumnAnnotation joinColumn; - public JavaJoinColumn(IJavaJpaContextNode parent, IJoinColumn.Owner owner) { + public GenericJavaJoinColumn(JavaJpaContextNode parent, JoinColumn.Owner owner) { super(parent, owner); } @Override - protected JoinColumn columnResource() { + protected JoinColumnAnnotation columnResource() { return this.joinColumn; } @@ -55,13 +57,13 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName; this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName; this.joinColumn.setReferencedColumnName(newSpecifiedReferencedColumnName); - firePropertyChanged(IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName); + firePropertyChanged(AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName); } protected void setSpecifiedReferencedColumnName_(String newSpecifiedReferencedColumnName) { String oldSpecifiedReferencedColumnName = this.specifiedReferencedColumnName; this.specifiedReferencedColumnName = newSpecifiedReferencedColumnName; - firePropertyChanged(IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName); + firePropertyChanged(AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, oldSpecifiedReferencedColumnName, newSpecifiedReferencedColumnName); } public String getDefaultReferencedColumnName() { @@ -71,13 +73,13 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ protected void setDefaultReferencedColumnName(String newDefaultReferencedColumnName) { String oldDefaultReferencedColumnName = this.defaultReferencedColumnName; this.defaultReferencedColumnName = newDefaultReferencedColumnName; - firePropertyChanged(IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName); + firePropertyChanged(AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY, oldDefaultReferencedColumnName, newDefaultReferencedColumnName); } @Override - public IJoinColumn.Owner owner() { - return (IJoinColumn.Owner) super.owner(); + public JoinColumn.Owner owner() { + return (JoinColumn.Owner) super.owner(); } public boolean isVirtual() { @@ -131,18 +133,18 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ return dbReferencedColumn() != null; } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { - ITextRange textRange = columnResource().referencedColumnNameTextRange(astRoot); + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + TextRange textRange = columnResource().referencedColumnNameTextRange(astRoot); return (textRange != null) ? textRange : owner().validationTextRange(astRoot); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @Override - public void initializeFromResource(JoinColumn joinColumn) { + public void initializeFromResource(JoinColumnAnnotation joinColumn) { this.joinColumn = joinColumn; super.initializeFromResource(joinColumn); this.specifiedReferencedColumnName = joinColumn.getReferencedColumnName(); @@ -150,7 +152,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ } @Override - public void update(JoinColumn joinColumn) { + public void update(JoinColumnAnnotation joinColumn) { this.joinColumn = joinColumn; super.update(joinColumn); this.setSpecifiedReferencedColumnName_(joinColumn.getReferencedColumnName()); @@ -159,7 +161,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ @Override protected String defaultName() { - IRelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = owner().relationshipMapping(); if (relationshipMapping == null) { return null; } @@ -170,7 +172,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ } protected String defaultReferencedColumnName() { - IRelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = owner().relationshipMapping(); if (relationshipMapping == null) { return null; } @@ -182,7 +184,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ @Override protected String defaultTable() { - IRelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = owner().relationshipMapping(); if (relationshipMapping == null) { return null; } @@ -228,7 +230,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ * return the name of the target entity */ protected String targetEntityName() { - IEntity targetEntity = owner().targetEntity(); + Entity targetEntity = owner().targetEntity(); return (targetEntity == null) ? null : targetEntity.getName(); } @@ -243,7 +245,7 @@ public class JavaJoinColumn extends AbstractJavaColumn<JoinColumn> implements IJ * return the name of the single primary key column of the target entity */ protected String targetPrimaryKeyColumnName() { - IEntity targetEntity = owner().targetEntity(); + Entity targetEntity = owner().targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryKeyColumnName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java index 2ee71068e1..8ae3ae18e2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java @@ -14,54 +14,57 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JoinColumn; -import org.eclipse.jpt.core.internal.resource.java.JoinTable; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.context.java.JavaRelationshipMapping; import org.eclipse.jpt.core.internal.resource.java.NullJoinColumn; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; -public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable +public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinTable { - protected final List<IJavaJoinColumn> specifiedJoinColumns; + protected final List<JavaJoinColumn> specifiedJoinColumns; - protected IJavaJoinColumn defaultJoinColumn; + protected JavaJoinColumn defaultJoinColumn; - protected final List<IJavaJoinColumn> specifiedInverseJoinColumns; + protected final List<JavaJoinColumn> specifiedInverseJoinColumns; - protected IJavaJoinColumn defaultInverseJoinColumn; + protected JavaJoinColumn defaultInverseJoinColumn; - protected JavaPersistentAttributeResource attributeResource; + protected JavaResourcePersistentAttribute attributeResource; - public JavaJoinTable(IJavaRelationshipMapping parent) { + public GenericJavaJoinTable(JavaRelationshipMapping parent) { super(parent); - this.specifiedJoinColumns = new ArrayList<IJavaJoinColumn>(); - this.specifiedInverseJoinColumns = new ArrayList<IJavaJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<JavaJoinColumn>(); + this.specifiedInverseJoinColumns = new ArrayList<JavaJoinColumn>(); } @Override - public IJavaRelationshipMapping parent() { - return (IJavaRelationshipMapping) super.parent(); + public JavaRelationshipMapping parent() { + return (JavaRelationshipMapping) super.parent(); } //******************* AbstractJavaTable implementation ***************** @Override protected String annotationName() { - return JoinTable.ANNOTATION_NAME; + return JoinTableAnnotation.ANNOTATION_NAME; } /** @@ -80,7 +83,7 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable if (owningTableName == null) { return null; } - IEntity targetEntity = relationshipMapping().getResolvedTargetEntity(); + Entity targetEntity = relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; } @@ -108,26 +111,26 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } @Override - protected JoinTable tableResource() { - return (JoinTable) this.attributeResource.nonNullAnnotation(JoinTable.ANNOTATION_NAME); + protected JoinTableAnnotation tableResource() { + return (JoinTableAnnotation) this.attributeResource.nonNullAnnotation(JoinTableAnnotation.ANNOTATION_NAME); } /** * Return the join table java resource, null if the annotation does not exist. * Use tableResource() if you want a non null implementation */ - protected JoinTable joinTableResource() { - return (JoinTable) this.attributeResource.annotation(JoinTable.ANNOTATION_NAME); + protected JoinTableAnnotation joinTableResource() { + return (JoinTableAnnotation) this.attributeResource.annotation(JoinTableAnnotation.ANNOTATION_NAME); } protected void addJoinTableResource() { - this.attributeResource.addAnnotation(JoinTable.ANNOTATION_NAME); + this.attributeResource.addAnnotation(JoinTableAnnotation.ANNOTATION_NAME); } //******************* IJoinTable implementation ***************** - public ListIterator<IJavaJoinColumn> joinColumns() { + public ListIterator<JavaJoinColumn> joinColumns() { return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumns() : this.defaultJoinColumns(); } @@ -135,19 +138,19 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return this.containsSpecifiedJoinColumns() ? this.specifiedJoinColumnsSize() : this.defaultJoinColumnsSize(); } - public IJavaJoinColumn getDefaultJoinColumn() { + public JavaJoinColumn getDefaultJoinColumn() { return this.defaultJoinColumn; } - protected void setDefaultJoinColumn(IJavaJoinColumn newJoinColumn) { - IJavaJoinColumn oldJoinColumn = this.defaultJoinColumn; + protected void setDefaultJoinColumn(JavaJoinColumn newJoinColumn) { + JavaJoinColumn oldJoinColumn = this.defaultJoinColumn; this.defaultJoinColumn = newJoinColumn; - firePropertyChanged(IJoinTable.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn); + firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, oldJoinColumn, newJoinColumn); } - protected ListIterator<IJavaJoinColumn> defaultJoinColumns() { + protected ListIterator<JavaJoinColumn> defaultJoinColumns() { if (this.defaultJoinColumn != null) { - return new SingleElementListIterator<IJavaJoinColumn>(this.defaultJoinColumn); + return new SingleElementListIterator<JavaJoinColumn>(this.defaultJoinColumn); } return EmptyListIterator.instance(); } @@ -156,8 +159,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return (this.defaultJoinColumn == null) ? 0 : 1; } - public ListIterator<IJavaJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<IJavaJoinColumn>(this.specifiedJoinColumns); + public ListIterator<JavaJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<JavaJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { @@ -168,8 +171,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return !this.specifiedJoinColumns.isEmpty(); } - public IJavaJoinColumn addSpecifiedJoinColumn(int index) { - IJoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn(); + public JavaJoinColumn addSpecifiedJoinColumn(int index) { + JoinColumn oldDefaultJoinColumn = this.getDefaultJoinColumn(); if (oldDefaultJoinColumn != null) { //null the default join column now if one already exists. //if one does not exist, there is already a specified join column. @@ -183,27 +186,27 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable //from the java resource model addJoinTableResource(); } - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); - JoinColumn joinColumnResource = this.tableResource().addJoinColumn(index); + JoinColumnAnnotation joinColumnResource = this.tableResource().addJoinColumn(index); joinColumn.initializeFromResource(joinColumnResource); - this.fireItemAdded(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); if (oldDefaultJoinColumn != null) { - this.firePropertyChanged(IJoinTable.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null); + this.firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, oldDefaultJoinColumn, null); } return joinColumn; } - protected void addSpecifiedJoinColumn(int index, IJavaJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, JavaJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST); } - public void removeSpecifiedJoinColumn(IJoinColumn joinColumn) { + public void removeSpecifiedJoinColumn(JoinColumn joinColumn) { this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn)); } public void removeSpecifiedJoinColumn(int index) { - IJavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + JavaJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); if (!containsSpecifiedJoinColumns()) { //create the defaultJoinColumn now or this will happen during project update //after removing the join column from the resource model. That causes problems @@ -211,24 +214,24 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable this.defaultJoinColumn = createJoinColumn(new NullJoinColumn(tableResource())); } this.tableResource().removeJoinColumn(index); - fireItemRemoved(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); if (this.defaultJoinColumn != null) { //fire change notification if a defaultJoinColumn was created above - this.firePropertyChanged(IJoinTable.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn); + this.firePropertyChanged(JoinTable.DEFAULT_JOIN_COLUMN, null, this.defaultJoinColumn); } } - protected void removeSpecifiedJoinColumn_(IJavaJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn_(JavaJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex); this.tableResource().moveJoinColumn(targetIndex, sourceIndex); - fireItemMoved(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } - public ListIterator<IJavaJoinColumn> inverseJoinColumns() { + public ListIterator<JavaJoinColumn> inverseJoinColumns() { return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumns() : this.defaultInverseJoinColumns(); } @@ -236,19 +239,19 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return this.containsSpecifiedInverseJoinColumns() ? this.specifiedInverseJoinColumnsSize() : this.defaultInverseJoinColumnsSize(); } - public IJavaJoinColumn getDefaultInverseJoinColumn() { + public JavaJoinColumn getDefaultInverseJoinColumn() { return this.defaultInverseJoinColumn; } - protected void setDefaultInverseJoinColumn(IJavaJoinColumn newInverseJoinColumn) { - IJavaJoinColumn oldInverseJoinColumn = this.defaultInverseJoinColumn; + protected void setDefaultInverseJoinColumn(JavaJoinColumn newInverseJoinColumn) { + JavaJoinColumn oldInverseJoinColumn = this.defaultInverseJoinColumn; this.defaultInverseJoinColumn = newInverseJoinColumn; - firePropertyChanged(IJoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldInverseJoinColumn, newInverseJoinColumn); + firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldInverseJoinColumn, newInverseJoinColumn); } - protected ListIterator<IJavaJoinColumn> defaultInverseJoinColumns() { + protected ListIterator<JavaJoinColumn> defaultInverseJoinColumns() { if (this.defaultInverseJoinColumn != null) { - return new SingleElementListIterator<IJavaJoinColumn>(this.defaultInverseJoinColumn); + return new SingleElementListIterator<JavaJoinColumn>(this.defaultInverseJoinColumn); } return EmptyListIterator.instance(); } @@ -257,8 +260,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return (this.defaultInverseJoinColumn == null) ? 0 : 1; } - public ListIterator<IJavaJoinColumn> specifiedInverseJoinColumns() { - return new CloneListIterator<IJavaJoinColumn>(this.specifiedInverseJoinColumns); + public ListIterator<JavaJoinColumn> specifiedInverseJoinColumns() { + return new CloneListIterator<JavaJoinColumn>(this.specifiedInverseJoinColumns); } public int specifiedInverseJoinColumnsSize() { @@ -269,8 +272,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return !this.specifiedInverseJoinColumns.isEmpty(); } - public IJavaJoinColumn addSpecifiedInverseJoinColumn(int index) { - IJoinColumn oldDefaultInverseJoinColumn = this.getDefaultInverseJoinColumn(); + public JavaJoinColumn addSpecifiedInverseJoinColumn(int index) { + JoinColumn oldDefaultInverseJoinColumn = this.getDefaultInverseJoinColumn(); if (oldDefaultInverseJoinColumn != null) { //null the default join column now if one already exists. //if one does not exist, there is already a specified join column. @@ -284,27 +287,27 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable //from the java resource model addJoinTableResource(); } - IJavaJoinColumn inverseJoinColumn = jpaFactory().createJavaJoinColumn(this, createInverseJoinColumnOwner()); + JavaJoinColumn inverseJoinColumn = jpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); this.specifiedInverseJoinColumns.add(index, inverseJoinColumn); - JoinColumn joinColumnResource = this.tableResource().addInverseJoinColumn(index); + JoinColumnAnnotation joinColumnResource = this.tableResource().addInverseJoinColumn(index); inverseJoinColumn.initializeFromResource(joinColumnResource); - this.fireItemAdded(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn); + this.fireItemAdded(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn); if (oldDefaultInverseJoinColumn != null) { - this.firePropertyChanged(IJoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldDefaultInverseJoinColumn, null); + this.firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, oldDefaultInverseJoinColumn, null); } return inverseJoinColumn; } - protected void addSpecifiedInverseJoinColumn(int index, IJavaJoinColumn inverseJoinColumn) { - addItemToList(index, inverseJoinColumn, this.specifiedInverseJoinColumns, IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); + protected void addSpecifiedInverseJoinColumn(int index, JavaJoinColumn inverseJoinColumn) { + addItemToList(index, inverseJoinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); } - public void removeSpecifiedInverseJoinColumn(IJoinColumn inverseJoinColumn) { + public void removeSpecifiedInverseJoinColumn(JoinColumn inverseJoinColumn) { this.removeSpecifiedInverseJoinColumn(this.specifiedInverseJoinColumns.indexOf(inverseJoinColumn)); } public void removeSpecifiedInverseJoinColumn(int index) { - IJavaJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index); + JavaJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index); if (!containsSpecifiedInverseJoinColumns()) { //create the defaultJoinColumn now or this will happen during project update //after removing the join column from the resource model. That causes problems @@ -312,26 +315,26 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable this.defaultInverseJoinColumn = createInverseJoinColumn(new NullJoinColumn(tableResource())); } this.tableResource().removeInverseJoinColumn(index); - fireItemRemoved(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn); if (this.defaultInverseJoinColumn != null) { //fire change notification if a defaultJoinColumn was created above - this.firePropertyChanged(IJoinTable.DEFAULT_INVERSE_JOIN_COLUMN, null, this.defaultInverseJoinColumn); + this.firePropertyChanged(JoinTable.DEFAULT_INVERSE_JOIN_COLUMN, null, this.defaultInverseJoinColumn); } } - protected void removeSpecifiedInverseJoinColumn_(IJavaJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); + protected void removeSpecifiedInverseJoinColumn_(JavaJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); } public void moveSpecifiedInverseJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedInverseJoinColumns, targetIndex, sourceIndex); this.tableResource().moveInverseJoinColumn(targetIndex, sourceIndex); - fireItemMoved(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } - public IRelationshipMapping relationshipMapping() { - return (IRelationshipMapping) this.parent(); + public RelationshipMapping relationshipMapping() { + return (RelationshipMapping) this.parent(); } public boolean isSpecified() { @@ -344,13 +347,13 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable if (result != null) { return result; } - for (IJavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { + for (JavaJoinColumn column : CollectionTools.iterable(this.joinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; } } - for (IJavaJoinColumn column : CollectionTools.iterable(this.inverseJoinColumns())) { + for (JavaJoinColumn column : CollectionTools.iterable(this.inverseJoinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; @@ -359,17 +362,17 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return null; } - protected IJoinColumn.Owner createJoinColumnOwner() { + protected JoinColumn.Owner createJoinColumnOwner() { return new JoinColumnOwner(); } - protected IJoinColumn.Owner createInverseJoinColumnOwner() { + protected JoinColumn.Owner createInverseJoinColumnOwner() { return new InverseJoinColumnOwner(); } - public void initializeFromResource(JavaPersistentAttributeResource attributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute attributeResource) { this.attributeResource = attributeResource; - JoinTable joinTable = tableResource(); + JoinTableAnnotation joinTable = tableResource(); this.initializeFromResource(joinTable); this.initializeSpecifiedJoinColumns(joinTable); this.initializeDefaultJoinColumn(joinTable); @@ -377,8 +380,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable this.initializeDefaultInverseJoinColumn(joinTable); } - protected void initializeSpecifiedJoinColumns(JoinTable joinTableResource) { - ListIterator<JoinColumn> annotations = joinTableResource.joinColumns(); + protected void initializeSpecifiedJoinColumns(JoinTableAnnotation joinTableResource) { + ListIterator<JoinColumnAnnotation> annotations = joinTableResource.joinColumns(); while(annotations.hasNext()) { this.specifiedJoinColumns.add(createJoinColumn(annotations.next())); @@ -389,16 +392,16 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return !containsSpecifiedJoinColumns() && relationshipMapping().isRelationshipOwner(); } - protected void initializeDefaultJoinColumn(JoinTable joinTable) { + protected void initializeDefaultJoinColumn(JoinTableAnnotation joinTable) { if (!shouldBuildDefaultJoinColumn()) { return; } - this.defaultJoinColumn = this.jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + this.defaultJoinColumn = this.jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.defaultJoinColumn.initializeFromResource(new NullJoinColumn(joinTable)); } - protected void initializeSpecifiedInverseJoinColumns(JoinTable joinTableResource) { - ListIterator<JoinColumn> annotations = joinTableResource.inverseJoinColumns(); + protected void initializeSpecifiedInverseJoinColumns(JoinTableAnnotation joinTableResource) { + ListIterator<JoinColumnAnnotation> annotations = joinTableResource.inverseJoinColumns(); while(annotations.hasNext()) { this.specifiedInverseJoinColumns.add(createInverseJoinColumn(annotations.next())); @@ -409,17 +412,17 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return !containsSpecifiedInverseJoinColumns() && relationshipMapping().isRelationshipOwner(); } - protected void initializeDefaultInverseJoinColumn(JoinTable joinTable) { + protected void initializeDefaultInverseJoinColumn(JoinTableAnnotation joinTable) { if (!shouldBuildDefaultInverseJoinColumn()) { return; } - this.defaultInverseJoinColumn = this.jpaFactory().createJavaJoinColumn(this, createInverseJoinColumnOwner()); + this.defaultInverseJoinColumn = this.jpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); this.defaultInverseJoinColumn.initializeFromResource(new NullJoinColumn(joinTable)); } - public void update(JavaPersistentAttributeResource attributeResource) { + public void update(JavaResourcePersistentAttribute attributeResource) { this.attributeResource = attributeResource; - JoinTable joinTable = tableResource(); + JoinTableAnnotation joinTable = tableResource(); this.update(joinTable); this.updateSpecifiedJoinColumns(joinTable); this.updateDefaultJoinColumn(joinTable); @@ -427,12 +430,12 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable this.updateDefaultInverseJoinColumn(joinTable); } - protected void updateSpecifiedJoinColumns(JoinTable joinTableResource) { - ListIterator<IJavaJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = joinTableResource.joinColumns(); + protected void updateSpecifiedJoinColumns(JoinTableAnnotation joinTableResource) { + ListIterator<JavaJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<JoinColumnAnnotation> resourceJoinColumns = joinTableResource.joinColumns(); while (joinColumns.hasNext()) { - IJavaJoinColumn joinColumn = joinColumns.next(); + JavaJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -446,13 +449,13 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } } - protected void updateDefaultJoinColumn(JoinTable joinTable) { + protected void updateDefaultJoinColumn(JoinTableAnnotation joinTable) { if (!shouldBuildDefaultJoinColumn()) { setDefaultJoinColumn(null); return; } if (getDefaultJoinColumn() == null) { - JoinColumn joinColumnResource = new NullJoinColumn(joinTable); + JoinColumnAnnotation joinColumnResource = new NullJoinColumn(joinTable); this.setDefaultJoinColumn(createJoinColumn(joinColumnResource)); } else { @@ -460,12 +463,12 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } } - protected void updateSpecifiedInverseJoinColumns(JoinTable joinTableResource) { - ListIterator<IJavaJoinColumn> joinColumns = specifiedInverseJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = joinTableResource.inverseJoinColumns(); + protected void updateSpecifiedInverseJoinColumns(JoinTableAnnotation joinTableResource) { + ListIterator<JavaJoinColumn> joinColumns = specifiedInverseJoinColumns(); + ListIterator<JoinColumnAnnotation> resourceJoinColumns = joinTableResource.inverseJoinColumns(); while (joinColumns.hasNext()) { - IJavaJoinColumn joinColumn = joinColumns.next(); + JavaJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -479,13 +482,13 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } } - protected void updateDefaultInverseJoinColumn(JoinTable joinTable) { + protected void updateDefaultInverseJoinColumn(JoinTableAnnotation joinTable) { if (!shouldBuildDefaultInverseJoinColumn()) { setDefaultInverseJoinColumn(null); return; } if (getDefaultInverseJoinColumn() == null) { - JoinColumn joinColumnResource = new NullJoinColumn(joinTable); + JoinColumnAnnotation joinColumnResource = new NullJoinColumn(joinTable); this.setDefaultInverseJoinColumn(createInverseJoinColumn(joinColumnResource)); } else { @@ -493,14 +496,14 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } } - protected IJavaJoinColumn createJoinColumn(JoinColumn joinColumnResource) { - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createJoinColumnOwner()); + protected JavaJoinColumn createJoinColumn(JoinColumnAnnotation joinColumnResource) { + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } - protected IJavaJoinColumn createInverseJoinColumn(JoinColumn joinColumnResource) { - IJavaJoinColumn joinColumn = jpaFactory().createJavaJoinColumn(this, createInverseJoinColumnOwner()); + protected JavaJoinColumn createInverseJoinColumn(JoinColumnAnnotation joinColumnResource) { + JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } @@ -510,18 +513,18 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable /** * just a little common behavior */ - abstract class AbstractJoinColumnOwner implements IJoinColumn.Owner + abstract class AbstractJoinColumnOwner implements JoinColumn.Owner { AbstractJoinColumnOwner() { super(); } - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return relationshipMapping().typeMapping(); } - public IRelationshipMapping relationshipMapping() { - return JavaJoinTable.this.relationshipMapping(); + public RelationshipMapping relationshipMapping() { + return GenericJavaJoinTable.this.relationshipMapping(); } /** @@ -540,10 +543,10 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { - if (JavaJoinTable.this.getName() == null) { + if (GenericJavaJoinTable.this.getName() == null) { return null; } - return (JavaJoinTable.this.getName().equals(tableName)) ? JavaJoinTable.this.dbTable() : null; + return (GenericJavaJoinTable.this.getName().equals(tableName)) ? GenericJavaJoinTable.this.dbTable() : null; } /** @@ -551,11 +554,11 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable * not sure whether it can be anywhere else... */ public String defaultTableName() { - return JavaJoinTable.this.getName(); + return GenericJavaJoinTable.this.getName(); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - return JavaJoinTable.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericJavaJoinTable.this.validationTextRange(astRoot); } } @@ -571,12 +574,12 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable super(); } - public IEntity targetEntity() { - return JavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); + public Entity targetEntity() { + return GenericJavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); } public String attributeName() { - return JavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); + return GenericJavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); } @Override @@ -585,17 +588,17 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable if (dbTable != null) { return dbTable; } - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.dbTable(tableName); } public org.eclipse.jpt.db.internal.Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaJoinTable.this.defaultInverseJoinColumn == joinColumn; + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericJavaJoinTable.this.defaultInverseJoinColumn == joinColumn; } public String defaultColumnName() { @@ -604,7 +607,7 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } public int joinColumnsSize() { - return JavaJoinTable.this.inverseJoinColumnsSize(); + return GenericJavaJoinTable.this.inverseJoinColumnsSize(); } } @@ -619,21 +622,21 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable super(); } - public IEntity targetEntity() { - return JavaJoinTable.this.relationshipMapping().getEntity(); + public Entity targetEntity() { + return GenericJavaJoinTable.this.relationshipMapping().getEntity(); } public String attributeName() { - IEntity targetEntity = JavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); + Entity targetEntity = GenericJavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; } - String attributeName = JavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); - for (Iterator<IPersistentAttribute> stream = targetEntity.persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute attribute = stream.next(); - IAttributeMapping mapping = attribute.getMapping(); - if (mapping instanceof INonOwningMapping) { - String mappedBy = ((INonOwningMapping) mapping).getMappedBy(); + String attributeName = GenericJavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); + for (Iterator<PersistentAttribute> stream = targetEntity.persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute attribute = stream.next(); + AttributeMapping mapping = attribute.getMapping(); + if (mapping instanceof NonOwningMapping) { + String mappedBy = ((NonOwningMapping) mapping).getMappedBy(); if ((mappedBy != null) && mappedBy.equals(attributeName)) { return attribute.getName(); } @@ -655,8 +658,8 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable return typeMapping().primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaJoinTable.this.defaultJoinColumn == joinColumn; + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericJavaJoinTable.this.defaultJoinColumn == joinColumn; } public String defaultColumnName() { @@ -665,7 +668,7 @@ public class JavaJoinTable extends AbstractJavaTable implements IJavaJoinTable } public int joinColumnsSize() { - return JavaJoinTable.this.joinColumnsSize(); + return GenericJavaJoinTable.this.joinColumnsSize(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java index 0fa529246d..21aaedb873 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java @@ -13,25 +13,27 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.ManyToMany; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.ManyToMany; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaManyToManyMapping extends JavaMultiRelationshipMapping<ManyToMany> - implements IJavaManyToManyMapping +public class GenericJavaManyToManyMapping extends AbstractJavaMultiRelationshipMapping<ManyToMany> + implements JavaManyToManyMapping { - public JavaManyToManyMapping(IJavaPersistentAttribute parent) { + public GenericJavaManyToManyMapping(JavaPersistentAttribute parent) { super(parent); } public String getKey() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -70,15 +72,16 @@ public class JavaManyToManyMapping extends JavaMultiRelationshipMapping<ManyToMa // ********** INonOwningMapping implementation ********** - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return this.relationshipMapping().mappedByTextRange(astRoot); } + @Override public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) { super.addToMessages(messages, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java index f78976663f..175e4a8576 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java @@ -14,17 +14,20 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.ManyToOne; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.ManyToOne; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaManyToOneMapping extends JavaSingleRelationshipMapping<ManyToOne> - implements IJavaManyToOneMapping +public class GenericJavaManyToOneMapping extends AbstractJavaSingleRelationshipMapping<ManyToOne> + implements JavaManyToOneMapping { - public JavaManyToOneMapping(IJavaPersistentAttribute parent) { + public GenericJavaManyToOneMapping(JavaPersistentAttribute parent) { super(parent); } @@ -40,7 +43,7 @@ public class JavaManyToOneMapping extends JavaSingleRelationshipMapping<ManyToOn } public String getKey() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } @Override @@ -77,21 +80,21 @@ public class JavaManyToOneMapping extends JavaSingleRelationshipMapping<ManyToOn @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> joinColumns() { + public ListIterator<JavaJoinColumn> joinColumns() { return super.joinColumns(); } @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> defaultJoinColumns() { + public ListIterator<JavaJoinColumn> defaultJoinColumns() { return super.defaultJoinColumns(); } @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> specifiedJoinColumns() { + public ListIterator<JavaJoinColumn> specifiedJoinColumns() { return super.specifiedJoinColumns(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java index 0b028bef6c..27049e9ac2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java @@ -10,23 +10,26 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.resource.java.IdClass; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; -import org.eclipse.jpt.core.internal.resource.java.MappedSuperclass; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.resource.java.IdClass; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -public class JavaMappedSuperclass extends JavaTypeMapping - implements IJavaMappedSuperclass +public class GenericJavaMappedSuperclass extends AbstractJavaTypeMapping + implements JavaMappedSuperclass { protected String idClass; - public JavaMappedSuperclass(IJavaPersistentType parent) { + public GenericJavaMappedSuperclass(JavaPersistentType parent) { super(parent); } @@ -35,11 +38,11 @@ public class JavaMappedSuperclass extends JavaTypeMapping } public String getKey() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } public String annotationName() { - return MappedSuperclass.ANNOTATION_NAME; + return MappedSuperclassAnnotation.ANNOTATION_NAME; } public Iterator<String> correspondingAnnotationNames() { return new ArrayIterator<String>( @@ -74,13 +77,13 @@ public class JavaMappedSuperclass extends JavaTypeMapping removeIdClassResource(); } } - firePropertyChanged(IMappedSuperclass.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(MappedSuperclass.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected void setIdClass_(String newIdClass) { String oldIdClass = this.idClass; this.idClass = newIdClass; - firePropertyChanged(IMappedSuperclass.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(MappedSuperclass.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected IdClass idClassResource() { @@ -100,10 +103,10 @@ public class JavaMappedSuperclass extends JavaTypeMapping return this.namesOf(this.overridableAttributes()); } - protected Iterator<IJavaPersistentAttribute> overridableAttributes() { - return new FilteringIterator<IJavaPersistentAttribute, IJavaPersistentAttribute>(this.persistentType().attributes()) { + protected Iterator<JavaPersistentAttribute> overridableAttributes() { + return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(this.persistentType().attributes()) { @Override - protected boolean accept(IJavaPersistentAttribute o) { + protected boolean accept(JavaPersistentAttribute o) { return o.isOverridableAttribute(); } }; @@ -114,31 +117,31 @@ public class JavaMappedSuperclass extends JavaTypeMapping return this.namesOf(this.overridableAssociations()); } - protected Iterator<IJavaPersistentAttribute> overridableAssociations() { - return new FilteringIterator<IJavaPersistentAttribute, IJavaPersistentAttribute>(this.persistentType().attributes()) { + protected Iterator<JavaPersistentAttribute> overridableAssociations() { + return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(this.persistentType().attributes()) { @Override - protected boolean accept(IJavaPersistentAttribute o) { + protected boolean accept(JavaPersistentAttribute o) { return o.isOverridableAssociation(); } }; } - protected Iterator<String> namesOf(Iterator<IJavaPersistentAttribute> attributes) { - return new TransformationIterator<IJavaPersistentAttribute, String>(attributes) { + protected Iterator<String> namesOf(Iterator<JavaPersistentAttribute> attributes) { + return new TransformationIterator<JavaPersistentAttribute, String>(attributes) { @Override - protected String transform(IJavaPersistentAttribute attribute) { + protected String transform(JavaPersistentAttribute attribute) { return attribute.getName(); } }; } @Override - public void initializeFromResource(JavaPersistentTypeResource persistentTypeResource) { + public void initializeFromResource(JavaResourcePersistentType persistentTypeResource) { super.initializeFromResource(persistentTypeResource); this.initializeIdClass(persistentTypeResource); } - protected void initializeIdClass(JavaPersistentTypeResource typeResource) { + protected void initializeIdClass(JavaResourcePersistentType typeResource) { IdClass idClassResource = (IdClass) typeResource.annotation(IdClass.ANNOTATION_NAME); if (idClassResource != null) { this.idClass = idClassResource.getValue(); @@ -146,12 +149,12 @@ public class JavaMappedSuperclass extends JavaTypeMapping } @Override - public void update(JavaPersistentTypeResource persistentTypeResource) { + public void update(JavaResourcePersistentType persistentTypeResource) { super.update(persistentTypeResource); this.updateIdClass(persistentTypeResource); } - protected void updateIdClass(JavaPersistentTypeResource typeResource) { + protected void updateIdClass(JavaResourcePersistentType typeResource) { IdClass idClass = (IdClass) typeResource.annotation(IdClass.ANNOTATION_NAME); if (idClass != null) { setIdClass_(idClass.getValue()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java index bdef569b44..8a2e3f3504 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedNativeQuery.java @@ -10,19 +10,22 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.INamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQuery; +import org.eclipse.jpt.core.context.NamedNativeQuery; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; -public class JavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQuery> - implements IJavaNamedNativeQuery +public class GenericJavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQueryAnnotation> + implements JavaNamedNativeQuery { protected String resultClass; protected String resultSetMapping; - public JavaNamedNativeQuery(IJavaJpaContextNode parent) { + public GenericJavaNamedNativeQuery(JavaJpaContextNode parent) { super(parent); } @@ -34,7 +37,7 @@ public class JavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQuery> String oldResultClass = this.resultClass; this.resultClass = newResultClass; query().setResultClass(newResultClass); - firePropertyChanged(INamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass); + firePropertyChanged(NamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass); } public String getResultSetMapping() { @@ -45,18 +48,18 @@ public class JavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQuery> String oldResultSetMapping = this.resultSetMapping; this.resultSetMapping = newResultSetMapping; query().setResultSetMapping(newResultSetMapping); - firePropertyChanged(INamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping); + firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping); } @Override - public void initializeFromResource(NamedNativeQuery queryResource) { + public void initializeFromResource(NamedNativeQueryAnnotation queryResource) { super.initializeFromResource(queryResource); this.resultClass = queryResource.getResultClass(); this.resultSetMapping = queryResource.getResultSetMapping(); } @Override - public void update(NamedNativeQuery queryResource) { + public void update(NamedNativeQueryAnnotation queryResource) { super.update(queryResource); this.setResultClass(queryResource.getResultClass()); this.setResultSetMapping(queryResource.getResultSetMapping()); @@ -65,7 +68,7 @@ public class JavaNamedNativeQuery extends AbstractJavaQuery<NamedNativeQuery> @SuppressWarnings("unchecked") @Override - public ListIterator<IJavaQueryHint> hints() { + public ListIterator<JavaQueryHint> hints() { return super.hints(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java index 30f506226a..226e217cab 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNamedQuery.java @@ -10,20 +10,23 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.resource.java.NamedQuery; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaNamedQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; -public class JavaNamedQuery extends AbstractJavaQuery<NamedQuery> implements IJavaNamedQuery +public class GenericJavaNamedQuery extends AbstractJavaQuery<NamedQueryAnnotation> implements JavaNamedQuery { - public JavaNamedQuery(IJavaJpaContextNode parent) { + public GenericJavaNamedQuery(JavaJpaContextNode parent) { super(parent); } @SuppressWarnings("unchecked") @Override - public ListIterator<IJavaQueryHint> hints() { + public ListIterator<JavaQueryHint> hints() { return super.hints(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java index 1d23d838f7..d77b80f3c9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java @@ -13,20 +13,21 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaNullAttributeMapping extends JavaAttributeMapping +public class GenericJavaNullAttributeMapping extends AbstractJavaAttributeMapping { - public JavaNullAttributeMapping(IJavaPersistentAttribute parent) { + public GenericJavaNullAttributeMapping(JavaPersistentAttribute parent) { super(parent); } public String getKey() { - return IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -37,6 +38,7 @@ public class JavaNullAttributeMapping extends JavaAttributeMapping return EmptyIterator.instance(); } + @Override public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) { super.addToMessages(messages, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java index 4d4e786c9e..5f7187ed03 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java @@ -13,20 +13,22 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.OneToMany; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.OneToMany; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaOneToManyMapping extends JavaMultiRelationshipMapping<OneToMany> - implements IJavaOneToManyMapping +public class GenericJavaOneToManyMapping extends AbstractJavaMultiRelationshipMapping<OneToMany> + implements JavaOneToManyMapping { - public JavaOneToManyMapping(IJavaPersistentAttribute parent) { + public GenericJavaOneToManyMapping(JavaPersistentAttribute parent) { super(parent); } @@ -41,7 +43,7 @@ public class JavaOneToManyMapping extends JavaMultiRelationshipMapping<OneToMany public String getKey() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -72,15 +74,16 @@ public class JavaOneToManyMapping extends JavaMultiRelationshipMapping<OneToMany // ********** INonOwningMapping implementation ********** - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return this.relationshipMapping().mappedByTextRange(astRoot); } + @Override public void addToMessages(List<IMessage> messages, CompilationUnit astRoot) { super.addToMessages(messages, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java index c96658ca37..dcb8d2d2f3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java @@ -13,26 +13,29 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.OneToOne; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.OneToOne; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> - implements IJavaOneToOneMapping +public class GenericJavaOneToOneMapping extends AbstractJavaSingleRelationshipMapping<OneToOne> + implements JavaOneToOneMapping { protected String mappedBy; - public JavaOneToOneMapping(IJavaPersistentAttribute parent) { + public GenericJavaOneToOneMapping(JavaPersistentAttribute parent) { super(parent); } @@ -50,7 +53,7 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> } public String getKey() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } @Override @@ -70,12 +73,12 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> String oldMappedBy = this.mappedBy; this.mappedBy = newMappedBy; this.relationshipMapping().setMappedBy(newMappedBy); - firePropertyChanged(INonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); + firePropertyChanged(NonOwningMapping.MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); } - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); } @Override @@ -83,7 +86,7 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> this.relationshipMapping().setOptional(newOptional); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return this.relationshipMapping().mappedByTextRange(astRoot); } @@ -138,20 +141,20 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> protected void addMappedByMessages(List<IMessage> messages, CompilationUnit astRoot) { String mappedBy = this.getMappedBy(); - IEntity targetEntity = this.getResolvedTargetEntity(); + Entity targetEntity = this.getResolvedTargetEntity(); if (targetEntity == null) { // already have validation messages for that return; } - IPersistentAttribute attribute = targetEntity.persistentType().resolveAttribute(mappedBy); + PersistentAttribute attribute = targetEntity.persistentType().resolveAttribute(mappedBy); if (attribute == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY, + JpaValidationMessages.MAPPING_UNRESOLVED_MAPPED_BY, new String[] {mappedBy}, this, this.mappedByTextRange(astRoot)) ); @@ -160,18 +163,18 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> if (! this.mappedByIsValid(attribute.getMapping())) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_INVALID_MAPPED_BY, + JpaValidationMessages.MAPPING_INVALID_MAPPED_BY, new String[] {mappedBy}, this, this.mappedByTextRange(astRoot)) ); return; } - INonOwningMapping mappedByMapping; + NonOwningMapping mappedByMapping; try { - mappedByMapping = (INonOwningMapping) attribute.getMapping(); + mappedByMapping = (NonOwningMapping) attribute.getMapping(); } catch (ClassCastException cce) { // there is no error then return; @@ -179,9 +182,9 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> if (mappedByMapping.getMappedBy() != null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES, + JpaValidationMessages.MAPPING_MAPPED_BY_ON_BOTH_SIDES, this, this.mappedByTextRange(astRoot)) ); } @@ -191,21 +194,21 @@ public class JavaOneToOneMapping extends JavaSingleRelationshipMapping<OneToOne> @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> joinColumns() { + public ListIterator<JavaJoinColumn> joinColumns() { return super.joinColumns(); } @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> defaultJoinColumns() { + public ListIterator<JavaJoinColumn> defaultJoinColumns() { return super.defaultJoinColumns(); } @Override @SuppressWarnings("unchecked") //overriding purely to suppress the warning you get at the class level - public ListIterator<IJavaJoinColumn> specifiedJoinColumns() { + public ListIterator<JavaJoinColumn> specifiedJoinColumns() { return super.specifiedJoinColumns(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java index 909346347f..0a95da0e26 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java @@ -13,60 +13,65 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.java.Annotation; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaStructureNodes; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaPersistentAttribute extends JavaContextModel - implements IJavaPersistentAttribute +public class GenericJavaPersistentAttribute extends JavaContextModel + implements JavaPersistentAttribute { protected String name; - protected IJavaAttributeMapping defaultMapping; + protected JavaAttributeMapping defaultMapping; - protected IJavaAttributeMapping specifiedMapping; + protected JavaAttributeMapping specifiedMapping; - protected JavaPersistentAttributeResource persistentAttributeResource; + protected JavaResourcePersistentAttribute persistentAttributeResource; - public JavaPersistentAttribute(IJavaPersistentType parent) { + public GenericJavaPersistentAttribute(JavaPersistentType parent) { super(parent); } public String getId() { - return IJavaStructureNodes.PERSISTENT_ATTRIBUTE_ID; + return JavaStructureNodes.PERSISTENT_ATTRIBUTE_ID; } - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { this.persistentAttributeResource = persistentAttributeResource; this.name = this.name(persistentAttributeResource); initializeDefaultMapping(persistentAttributeResource); initializeSpecifiedMapping(persistentAttributeResource); } - protected void initializeDefaultMapping(JavaPersistentAttributeResource persistentAttributeResource) { + protected void initializeDefaultMapping(JavaResourcePersistentAttribute persistentAttributeResource) { this.defaultMapping = createDefaultJavaAttributeMapping(persistentAttributeResource); } - protected void initializeSpecifiedMapping(JavaPersistentAttributeResource persistentAttributeResource) { + protected void initializeSpecifiedMapping(JavaResourcePersistentAttribute persistentAttributeResource) { String javaMappingAnnotationName = this.javaMappingAnnotationName(persistentAttributeResource); this.specifiedMapping = createJavaAttributeMappingFromAnnotation(javaMappingAnnotationName, persistentAttributeResource); } - public JavaPersistentAttributeResource getPersistentAttributeResource() { + public JavaResourcePersistentAttribute getPersistentAttributeResource() { return this.persistentAttributeResource; } - public IJavaPersistentType persistentType() { - return (IJavaPersistentType) this.parent(); + public JavaPersistentType persistentType() { + return (JavaPersistentType) this.parent(); } - public IJavaTypeMapping typeMapping() { + public JavaTypeMapping typeMapping() { return this.persistentType().getMapping(); } @@ -100,20 +105,20 @@ public class JavaPersistentAttribute extends JavaContextModel firePropertyChanged(NAME_PROPERTY, oldName, newName); } - public IJavaAttributeMapping getDefaultMapping() { + public JavaAttributeMapping getDefaultMapping() { return this.defaultMapping; } /** * clients do not set the "default" mapping */ - protected void setDefaultMapping(IJavaAttributeMapping newDefaultMapping) { - IJavaAttributeMapping oldMapping = this.defaultMapping; + protected void setDefaultMapping(JavaAttributeMapping newDefaultMapping) { + JavaAttributeMapping oldMapping = this.defaultMapping; this.defaultMapping = newDefaultMapping; - firePropertyChanged(IPersistentAttribute.DEFAULT_MAPPING_PROPERTY, oldMapping, newDefaultMapping); + firePropertyChanged(PersistentAttribute.DEFAULT_MAPPING_PROPERTY, oldMapping, newDefaultMapping); } - public IJavaAttributeMapping getSpecifiedMapping() { + public JavaAttributeMapping getSpecifiedMapping() { return this.specifiedMapping; } @@ -121,14 +126,14 @@ public class JavaPersistentAttribute extends JavaContextModel * clients do not set the "specified" mapping; * use #setMappingKey(String) */ - protected void setSpecifiedMapping(IJavaAttributeMapping newSpecifiedMapping) { - IJavaAttributeMapping oldMapping = this.specifiedMapping; + protected void setSpecifiedMapping(JavaAttributeMapping newSpecifiedMapping) { + JavaAttributeMapping oldMapping = this.specifiedMapping; this.specifiedMapping = newSpecifiedMapping; - firePropertyChanged(IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newSpecifiedMapping); + firePropertyChanged(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newSpecifiedMapping); } - public IJavaAttributeMapping getMapping() { + public JavaAttributeMapping getMapping() { return (this.specifiedMapping != null) ? this.specifiedMapping : this.defaultMapping; } @@ -157,8 +162,8 @@ public class JavaPersistentAttribute extends JavaContextModel if (newKey == specifiedMappingKey()) { return; } - IJavaAttributeMapping oldMapping = getMapping(); - IJavaAttributeMapping newMapping = createJavaAttributeMappingFromMappingKey(newKey); + JavaAttributeMapping oldMapping = getMapping(); + JavaAttributeMapping newMapping = createJavaAttributeMappingFromMappingKey(newKey); this.specifiedMapping = newMapping; if (newMapping != null) { @@ -167,7 +172,7 @@ public class JavaPersistentAttribute extends JavaContextModel else { this.persistentAttributeResource.setMappingAnnotation(null); } - firePropertyChanged(IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newMapping); + firePropertyChanged(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY, oldMapping, newMapping); if (oldMapping != null) { Collection<String> annotationsToRemove = CollectionTools.collection(oldMapping.correspondingAnnotationNames()); @@ -181,12 +186,12 @@ public class JavaPersistentAttribute extends JavaContextModel } } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { return this; } public boolean contains(int offset, CompilationUnit astRoot) { - ITextRange fullTextRange = this.fullTextRange(astRoot); + TextRange fullTextRange = this.fullTextRange(astRoot); if (fullTextRange == null) { //This happens if the attribute no longer exists in the java. //The text selection event is fired before the update from java so our @@ -200,31 +205,31 @@ public class JavaPersistentAttribute extends JavaContextModel } - public ITextRange fullTextRange(CompilationUnit astRoot) { + public TextRange fullTextRange(CompilationUnit astRoot) { return this.persistentAttributeResource.textRange(astRoot); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } - public ITextRange selectionTextRange(CompilationUnit astRoot) { + public TextRange selectionTextRange(CompilationUnit astRoot) { return this.persistentAttributeResource.nameTextRange(astRoot); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return selectionTextRange(this.persistentAttributeResource.getMember().astRoot()); } - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { this.persistentAttributeResource = persistentAttributeResource; this.setName(this.name(persistentAttributeResource)); this.updateDefaultMapping(persistentAttributeResource); this.updateSpecifiedMapping(persistentAttributeResource); } - protected String name(JavaPersistentAttributeResource persistentAttributeResource) { + protected String name(JavaResourcePersistentAttribute persistentAttributeResource) { return persistentAttributeResource.getName(); } @@ -232,7 +237,7 @@ public class JavaPersistentAttribute extends JavaContextModel return (this.specifiedMapping == null) ? null : this.specifiedMapping.annotationName(); } - protected void updateSpecifiedMapping(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateSpecifiedMapping(JavaResourcePersistentAttribute persistentAttributeResource) { String javaMappingAnnotationName = this.javaMappingAnnotationName(persistentAttributeResource); if (specifiedMappingAnnotationName() != javaMappingAnnotationName) { setSpecifiedMapping(createJavaAttributeMappingFromAnnotation(javaMappingAnnotationName, persistentAttributeResource)); @@ -244,7 +249,7 @@ public class JavaPersistentAttribute extends JavaContextModel } } - protected void updateDefaultMapping(JavaPersistentAttributeResource persistentAttributeResource) { + protected void updateDefaultMapping(JavaResourcePersistentAttribute persistentAttributeResource) { String defaultMappingKey = jpaPlatform().defaultJavaAttributeMappingKey(this); if (getDefaultMapping().getKey() != defaultMappingKey) { setDefaultMapping(createDefaultJavaAttributeMapping(persistentAttributeResource)); @@ -254,7 +259,7 @@ public class JavaPersistentAttribute extends JavaContextModel } } - protected String javaMappingAnnotationName(JavaPersistentAttributeResource persistentAttributeResource) { + protected String javaMappingAnnotationName(JavaResourcePersistentAttribute persistentAttributeResource) { Annotation mappingAnnotation = (Annotation) persistentAttributeResource.mappingAnnotation(); if (mappingAnnotation != null) { return mappingAnnotation.getAnnotationName(); @@ -262,24 +267,24 @@ public class JavaPersistentAttribute extends JavaContextModel return null; } - protected IJavaAttributeMapping createJavaAttributeMappingFromMappingKey(String key) { - if (key == IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) { + protected JavaAttributeMapping createJavaAttributeMappingFromMappingKey(String key) { + if (key == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) { return null; } - return jpaPlatform().createJavaAttributeMappingFromMappingKey(key, this); + return jpaPlatform().buildJavaAttributeMappingFromMappingKey(key, this); } - protected IJavaAttributeMapping createJavaAttributeMappingFromAnnotation(String annotationName, JavaPersistentAttributeResource persistentAttributeResource) { + protected JavaAttributeMapping createJavaAttributeMappingFromAnnotation(String annotationName, JavaResourcePersistentAttribute persistentAttributeResource) { if (annotationName == null) { return null; } - IJavaAttributeMapping mapping = jpaPlatform().createJavaAttributeMappingFromAnnotation(annotationName, this); + JavaAttributeMapping mapping = jpaPlatform().buildJavaAttributeMappingFromAnnotation(annotationName, this); mapping.initializeFromResource(persistentAttributeResource); return mapping; } - protected IJavaAttributeMapping createDefaultJavaAttributeMapping(JavaPersistentAttributeResource persistentAttributeResource) { - IJavaAttributeMapping defaultMapping = jpaPlatform().createDefaultJavaAttributeMapping(this); + protected JavaAttributeMapping createDefaultJavaAttributeMapping(JavaResourcePersistentAttribute persistentAttributeResource) { + JavaAttributeMapping defaultMapping = jpaPlatform().buildDefaultJavaAttributeMapping(this); defaultMapping.initializeFromResource(persistentAttributeResource); return defaultMapping; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java index 78fcbd0a49..da6e050f2f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java @@ -16,15 +16,19 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.resource.java.Annotation; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaStructureNodes; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ChainIterator; @@ -35,30 +39,30 @@ import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaPersistentType extends JavaContextModel implements IJavaPersistentType +public class GenericJavaPersistentType extends JavaContextModel implements JavaPersistentType { protected String name; - protected IJavaTypeMapping mapping; + protected JavaTypeMapping mapping; - protected final List<IJavaPersistentAttribute> attributes; + protected final List<JavaPersistentAttribute> attributes; protected AccessType access; - protected IPersistentType parentPersistentType; + protected PersistentType parentPersistentType; - protected JavaPersistentTypeResource persistentTypeResource; + protected JavaResourcePersistentType persistentTypeResource; - public JavaPersistentType(IJpaContextNode parent) { + public GenericJavaPersistentType(JpaContextNode parent) { super(parent); - this.attributes = new ArrayList<IJavaPersistentAttribute>(); + this.attributes = new ArrayList<JavaPersistentAttribute>(); } public String getId() { - return IJavaStructureNodes.PERSISTENT_TYPE_ID; + return JavaStructureNodes.PERSISTENT_TYPE_ID; } - public void initializeFromResource(JavaPersistentTypeResource persistentTypeResource) { + public void initializeFromResource(JavaResourcePersistentType persistentTypeResource) { this.persistentTypeResource = persistentTypeResource; this.parentPersistentType = this.parentPersistentType(persistentTypeResource); this.access = this.access(persistentTypeResource); @@ -67,13 +71,13 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist this.initializePersistentAttributes(persistentTypeResource); } - protected void initializeMapping(JavaPersistentTypeResource persistentTypeResource) { - this.mapping = jpaPlatform().createJavaTypeMappingFromAnnotation(this.javaMappingAnnotationName(persistentTypeResource), this); + protected void initializeMapping(JavaResourcePersistentType persistentTypeResource) { + this.mapping = jpaPlatform().buildJavaTypeMappingFromAnnotation(this.javaMappingAnnotationName(persistentTypeResource), this); this.mapping.initializeFromResource(persistentTypeResource); } - protected void initializePersistentAttributes(JavaPersistentTypeResource persistentTypeResource) { - Iterator<JavaPersistentAttributeResource> resourceAttributes = persistentTypeResource.fields(); + protected void initializePersistentAttributes(JavaResourcePersistentType persistentTypeResource) { + Iterator<JavaResourcePersistentAttribute> resourceAttributes = persistentTypeResource.fields(); if (access() == AccessType.PROPERTY) { resourceAttributes = persistentTypeResource.properties(); } @@ -100,7 +104,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist firePropertyChanged(NAME_PROPERTY, oldName, newName); } - public IJavaTypeMapping getMapping() { + public JavaTypeMapping getMapping() { return this.mapping; } @@ -112,12 +116,12 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist if (key == getMapping().getKey()) { return; } - IJavaTypeMapping oldMapping = getMapping(); - IJavaTypeMapping newMapping = createJavaTypeMappingFromMappingKey(key); + JavaTypeMapping oldMapping = getMapping(); + JavaTypeMapping newMapping = createJavaTypeMappingFromMappingKey(key); this.mapping = newMapping; this.persistentTypeResource.setMappingAnnotation(newMapping.annotationName()); - firePropertyChanged(IPersistentType.MAPPING_PROPERTY, oldMapping, newMapping); + firePropertyChanged(PersistentType.MAPPING_PROPERTY, oldMapping, newMapping); if (oldMapping != null) { Collection<String> annotationsToRemove = CollectionTools.collection(oldMapping.correspondingAnnotationNames()); @@ -131,10 +135,10 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } } - protected void setMapping(IJavaTypeMapping newMapping) { - IJavaTypeMapping oldMapping = this.mapping; + protected void setMapping(JavaTypeMapping newMapping) { + JavaTypeMapping oldMapping = this.mapping; this.mapping = newMapping; - firePropertyChanged(IPersistentType.MAPPING_PROPERTY, oldMapping, newMapping); + firePropertyChanged(PersistentType.MAPPING_PROPERTY, oldMapping, newMapping); } public boolean isMapped() { @@ -148,65 +152,65 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist protected void setAccess(AccessType newAccess) { AccessType oldAccess = this.access; this.access = newAccess; - firePropertyChanged(IPersistentType.ACCESS_PROPERTY, oldAccess, newAccess); + firePropertyChanged(PersistentType.ACCESS_PROPERTY, oldAccess, newAccess); } - protected Iterator<IJavaPersistentAttribute> attributesNamed(final String attributeName) { - return new FilteringIterator<IJavaPersistentAttribute, IJavaPersistentAttribute>(attributes()) { + protected Iterator<JavaPersistentAttribute> attributesNamed(final String attributeName) { + return new FilteringIterator<JavaPersistentAttribute, JavaPersistentAttribute>(attributes()) { @Override - protected boolean accept(IJavaPersistentAttribute o) { + protected boolean accept(JavaPersistentAttribute o) { return attributeName.equals(o.getName()); } }; } - public IJavaPersistentAttribute attributeNamed(String attributeName) { - Iterator<IJavaPersistentAttribute> stream = attributesNamed(attributeName); + public JavaPersistentAttribute attributeNamed(String attributeName) { + Iterator<JavaPersistentAttribute> stream = attributesNamed(attributeName); return (stream.hasNext()) ? stream.next() : null; } - public IPersistentAttribute resolveAttribute(String attributeName) { - Iterator<IJavaPersistentAttribute> stream = attributesNamed(attributeName); + public PersistentAttribute resolveAttribute(String attributeName) { + Iterator<JavaPersistentAttribute> stream = attributesNamed(attributeName); if (stream.hasNext()) { - IJavaPersistentAttribute attribute = stream.next(); + JavaPersistentAttribute attribute = stream.next(); return (stream.hasNext()) ? null /*more than one*/: attribute; } return (parentPersistentType() == null) ? null : parentPersistentType().resolveAttribute(attributeName); } - public ListIterator<IJavaPersistentAttribute> attributes() { - return new CloneListIterator<IJavaPersistentAttribute>(this.attributes); + public ListIterator<JavaPersistentAttribute> attributes() { + return new CloneListIterator<JavaPersistentAttribute>(this.attributes); } public int attributesSize() { return this.attributes.size(); } - private void addAttribute(IJavaPersistentAttribute attribute) { - addItemToList(attribute, this.attributes, IPersistentType.SPECIFIED_ATTRIBUTES_LIST); + private void addAttribute(JavaPersistentAttribute attribute) { + addItemToList(attribute, this.attributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST); } - private void removeAttribute(IJavaPersistentAttribute attribute) { - removeItemFromList(attribute, this.attributes, IPersistentType.SPECIFIED_ATTRIBUTES_LIST); + private void removeAttribute(JavaPersistentAttribute attribute) { + removeItemFromList(attribute, this.attributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST); } public Iterator<String> attributeNames() { return this.attributeNames(this.attributes()); } - protected Iterator<String> attributeNames(Iterator<? extends IPersistentAttribute> attrs) { - return new TransformationIterator<IPersistentAttribute, String>(attrs) { + protected Iterator<String> attributeNames(Iterator<? extends PersistentAttribute> attrs) { + return new TransformationIterator<PersistentAttribute, String>(attrs) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - public Iterator<IPersistentAttribute> allAttributes() { - return new CompositeIterator<IPersistentAttribute>(new TransformationIterator<IPersistentType, Iterator<IPersistentAttribute>>(this.inheritanceHierarchy()) { + public Iterator<PersistentAttribute> allAttributes() { + return new CompositeIterator<PersistentAttribute>(new TransformationIterator<PersistentType, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) { @Override - protected Iterator<IPersistentAttribute> transform(IPersistentType pt) { + protected Iterator<PersistentAttribute> transform(PersistentType pt) { return pt.attributes(); } }); @@ -226,7 +230,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist if (values != null) { return values; } - for (Iterator<IJavaPersistentAttribute> stream = attributes(); stream.hasNext();) { + for (Iterator<JavaPersistentAttribute> stream = attributes(); stream.hasNext();) { values = stream.next().javaCompletionProposals(pos, filter, astRoot); if (values != null) { return values; @@ -235,12 +239,12 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist return EmptyIterator.instance(); } - public IJpaStructureNode structureNode(int offset) { + public JpaStructureNode structureNode(int offset) { //TODO astRoot, possibly get this instead of rebuilding it CompilationUnit astRoot = this.persistentTypeResource.getMember().astRoot(); - for (Iterator<IJavaPersistentAttribute> i = attributes(); i.hasNext();) { - IJavaPersistentAttribute persistentAttribute = i.next(); + for (Iterator<JavaPersistentAttribute> i = attributes(); i.hasNext();) { + JavaPersistentAttribute persistentAttribute = i.next(); if (persistentAttribute.contains(offset, astRoot)) { return persistentAttribute; } @@ -250,7 +254,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } public boolean contains(int offset, CompilationUnit astRoot) { - ITextRange fullTextRange = this.fullTextRange(astRoot); + TextRange fullTextRange = this.fullTextRange(astRoot); if (fullTextRange == null) { //This happens if the attribute no longer exists in the java. //The text selection event is fired before the update from java so our @@ -264,34 +268,34 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } - public ITextRange fullTextRange(CompilationUnit astRoot) { + public TextRange fullTextRange(CompilationUnit astRoot) { return this.persistentTypeResource.textRange(astRoot); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } - public ITextRange selectionTextRange(CompilationUnit astRoot) { + public TextRange selectionTextRange(CompilationUnit astRoot) { return this.persistentTypeResource.nameTextRange(astRoot); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return this.selectionTextRange(this.persistentTypeResource.getMember().astRoot()); } - public Iterator<IPersistentType> inheritanceHierarchy() { + public Iterator<PersistentType> inheritanceHierarchy() { // using a chain iterator to traverse up the inheritance tree - return new ChainIterator<IPersistentType>(this) { + return new ChainIterator<PersistentType>(this) { @Override - protected IPersistentType nextLink(IPersistentType pt) { + protected PersistentType nextLink(PersistentType pt) { return pt.parentPersistentType(); } }; } - public IPersistentType parentPersistentType() { + public PersistentType parentPersistentType() { return this.parentPersistentType; } @@ -303,7 +307,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } // ******************** Updating ********************** - public void update(JavaPersistentTypeResource persistentTypeResource) { + public void update(JavaResourcePersistentType persistentTypeResource) { this.persistentTypeResource = persistentTypeResource; this.persistentTypeResource.resourceModel().addRootStructureNode(this); updateParentPersistentType(persistentTypeResource); @@ -313,7 +317,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist updatePersistentAttributes(persistentTypeResource); } - protected void updateAccess(JavaPersistentTypeResource persistentTypeResource) { + protected void updateAccess(JavaResourcePersistentType persistentTypeResource) { this.setAccess(this.access(persistentTypeResource)); } @@ -326,12 +330,12 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist * If still null check the persistence-unit default Access * Default to FIELD if all else fails. */ - protected AccessType access(JavaPersistentTypeResource persistentTypeResource) { + protected AccessType access(JavaResourcePersistentType persistentTypeResource) { AccessType javaAccess = null; boolean metadataComplete = false; - if (xmlPersistentType() != null) { - javaAccess = xmlPersistentType().getMapping().getSpecifiedAccess(); - metadataComplete = xmlPersistentType().getMapping().isMetadataComplete(); + if (ormPersistentType() != null) { + javaAccess = ormPersistentType().getMapping().getSpecifiedAccess(); + metadataComplete = ormPersistentType().getMapping().isMetadataComplete(); } if (javaAccess == null && !metadataComplete) { javaAccess = AccessType.fromJavaResourceModel(persistentTypeResource.getAccess()); @@ -359,15 +363,15 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist return javaAccess; } - protected void updateName(JavaPersistentTypeResource persistentTypeResource) { + protected void updateName(JavaResourcePersistentType persistentTypeResource) { this.setName(this.name(persistentTypeResource)); } - protected String name(JavaPersistentTypeResource persistentTypeResource) { + protected String name(JavaResourcePersistentType persistentTypeResource) { return persistentTypeResource.getQualifiedName(); } - protected void updateMapping(JavaPersistentTypeResource persistentTypeResource) { + protected void updateMapping(JavaResourcePersistentType persistentTypeResource) { String javaMappingAnnotationName = this.javaMappingAnnotationName(persistentTypeResource); if (getMapping().annotationName() != javaMappingAnnotationName) { setMapping(createJavaTypeMappingFromAnnotation(javaMappingAnnotationName, persistentTypeResource)); @@ -377,17 +381,17 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } } - protected IJavaTypeMapping createJavaTypeMappingFromMappingKey(String key) { - return jpaPlatform().createJavaTypeMappingFromMappingKey(key, this); + protected JavaTypeMapping createJavaTypeMappingFromMappingKey(String key) { + return jpaPlatform().buildJavaTypeMappingFromMappingKey(key, this); } - protected IJavaTypeMapping createJavaTypeMappingFromAnnotation(String annotationName, JavaPersistentTypeResource persistentTypeResource) { - IJavaTypeMapping mapping = jpaPlatform().createJavaTypeMappingFromAnnotation(annotationName, this); + protected JavaTypeMapping createJavaTypeMappingFromAnnotation(String annotationName, JavaResourcePersistentType persistentTypeResource) { + JavaTypeMapping mapping = jpaPlatform().buildJavaTypeMappingFromAnnotation(annotationName, this); mapping.initializeFromResource(persistentTypeResource); return mapping; } - protected String javaMappingAnnotationName(JavaPersistentTypeResource typeResource) { + protected String javaMappingAnnotationName(JavaResourcePersistentType typeResource) { Annotation mappingAnnotation = (Annotation) typeResource.mappingAnnotation(); if (mappingAnnotation != null) { return mappingAnnotation.getAnnotationName(); @@ -395,15 +399,15 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist return null; } - protected void updatePersistentAttributes(JavaPersistentTypeResource persistentTypeResource) { - ListIterator<IJavaPersistentAttribute> contextAttributes = attributes(); - Iterator<JavaPersistentAttributeResource> resourceAttributes = persistentTypeResource.fields(); + protected void updatePersistentAttributes(JavaResourcePersistentType persistentTypeResource) { + ListIterator<JavaPersistentAttribute> contextAttributes = attributes(); + Iterator<JavaResourcePersistentAttribute> resourceAttributes = persistentTypeResource.fields(); if (access() == AccessType.PROPERTY) { resourceAttributes = persistentTypeResource.properties(); } while (contextAttributes.hasNext()) { - IJavaPersistentAttribute persistentAttribute = contextAttributes.next(); + JavaPersistentAttribute persistentAttribute = contextAttributes.next(); if (resourceAttributes.hasNext()) { persistentAttribute.update(resourceAttributes.next()); } @@ -417,23 +421,23 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } } - protected IJavaPersistentAttribute createAttribute(JavaPersistentAttributeResource persistentAttributeResource) { - IJavaPersistentAttribute javaPersistentAttribute = jpaFactory().createJavaPersistentAttribute(this); + protected JavaPersistentAttribute createAttribute(JavaResourcePersistentAttribute persistentAttributeResource) { + JavaPersistentAttribute javaPersistentAttribute = jpaFactory().buildJavaPersistentAttribute(this); javaPersistentAttribute.initializeFromResource(persistentAttributeResource); return javaPersistentAttribute; } - public void updateParentPersistentType(JavaPersistentTypeResource persistentTypeResource) { + public void updateParentPersistentType(JavaResourcePersistentType persistentTypeResource) { //TODO do we need any change notification for this? this.parentPersistentType = parentPersistentType(persistentTypeResource); } - protected IPersistentType parentPersistentType(JavaPersistentTypeResource persistentTypeResource) { + protected PersistentType parentPersistentType(JavaResourcePersistentType persistentTypeResource) { return parentPersistentType(persistentTypeResource.getSuperClassQualifiedName()); } - protected IPersistentType parentPersistentType(String fullyQualifiedTypeName) { - IPersistentType possibleParent = possibleParent(fullyQualifiedTypeName); + protected PersistentType parentPersistentType(String fullyQualifiedTypeName) { + PersistentType possibleParent = possibleParent(fullyQualifiedTypeName); if (possibleParent == null) { return null; } @@ -448,19 +452,19 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist * This will check for a PersistentType with the given name in this PersistenceUnit. * If it is not found then find the JavaPersistentTypeResource and look for its parent type */ - protected IPersistentType possibleParent(String fullyQualifiedTypeName) { - IPersistentType possibleParent = persistentType(fullyQualifiedTypeName); + protected PersistentType possibleParent(String fullyQualifiedTypeName) { + PersistentType possibleParent = persistentType(fullyQualifiedTypeName); if (possibleParent != null) { return possibleParent; } - JavaPersistentTypeResource javaPersistentTypeResource = jpaProject().javaPersistentTypeResource(fullyQualifiedTypeName); + JavaResourcePersistentType javaPersistentTypeResource = jpaProject().javaPersistentTypeResource(fullyQualifiedTypeName); if (javaPersistentTypeResource != null) { return possibleParent(javaPersistentTypeResource.getSuperClassQualifiedName()); } return null; } - protected IPersistentType persistentType(String fullyQualifiedTypeName) { + protected PersistentType persistentType(String fullyQualifiedTypeName) { return persistenceUnit().persistentType(fullyQualifiedTypeName); } @@ -478,7 +482,7 @@ public class JavaPersistentType extends JavaContextModel implements IJavaPersist } protected void addAttributeMessages(List<IMessage> messages, CompilationUnit astRoot) { - for (IJavaPersistentAttribute attributeContext : this.attributes) { + for (JavaPersistentAttribute attributeContext : this.attributes) { attributeContext.addToMessages(messages, astRoot); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java index 809045d5f6..6861fb10b9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -11,9 +11,11 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.Filter; @@ -22,21 +24,21 @@ import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public class JavaPrimaryKeyJoinColumn extends JavaNamedColumn<PrimaryKeyJoinColumn> - implements IJavaPrimaryKeyJoinColumn +public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<PrimaryKeyJoinColumnAnnotation> + implements JavaPrimaryKeyJoinColumn { protected String specifiedReferencedColumnName; protected String defaultReferencedColumnName; - protected PrimaryKeyJoinColumn primaryKeyJoinColumnResource; + protected PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource; - public JavaPrimaryKeyJoinColumn(IJavaJpaContextNode parent, IAbstractJoinColumn.Owner owner) { + public GenericJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, AbstractJoinColumn.Owner owner) { super(parent, owner); } @Override - public void initializeFromResource(PrimaryKeyJoinColumn column) { + public void initializeFromResource(PrimaryKeyJoinColumnAnnotation column) { this.primaryKeyJoinColumnResource = column; super.initializeFromResource(column); this.specifiedReferencedColumnName = this.specifiedReferencedColumnName(column); @@ -45,12 +47,12 @@ public class JavaPrimaryKeyJoinColumn extends JavaNamedColumn<PrimaryKeyJoinColu //************** JavaNamedColumn implementation *************** @Override - public IAbstractJoinColumn.Owner owner() { - return (IAbstractJoinColumn.Owner) super.owner(); + public AbstractJoinColumn.Owner owner() { + return (AbstractJoinColumn.Owner) super.owner(); } @Override - protected PrimaryKeyJoinColumn columnResource() { + protected PrimaryKeyJoinColumnAnnotation columnResource() { return this.primaryKeyJoinColumnResource; } @@ -138,24 +140,24 @@ public class JavaPrimaryKeyJoinColumn extends JavaNamedColumn<PrimaryKeyJoinColu return dbReferencedColumn() != null; } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { return this.columnResource().referencedColumnNameTextRange(astRoot); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = columnResource().textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = columnResource().textRange(astRoot); return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); } @Override - public void update(PrimaryKeyJoinColumn column) { + public void update(PrimaryKeyJoinColumnAnnotation column) { this.primaryKeyJoinColumnResource = column; super.update(column); this.setSpecifiedReferencedColumnName_(this.specifiedReferencedColumnName(column)); this.setDefaultReferencedColumnName(this.defaultReferencedColumnName()); } - protected String specifiedReferencedColumnName(PrimaryKeyJoinColumn column) { + protected String specifiedReferencedColumnName(PrimaryKeyJoinColumnAnnotation column) { return column.getReferencedColumnName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java index 8c3808d1ed..3407fac5a0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java @@ -10,19 +10,21 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IQueryHint; -import org.eclipse.jpt.core.internal.resource.java.QueryHint; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.QueryHint; +import org.eclipse.jpt.core.context.java.JavaQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.resource.java.QueryHintAnnotation; -public class JavaQueryHint extends JavaContextModel implements IJavaQueryHint +public class GenericJavaQueryHint extends JavaContextModel implements JavaQueryHint { protected String name; protected String value; - protected QueryHint queryHint; + protected QueryHintAnnotation queryHint; - public JavaQueryHint(IJavaQuery<?> parent) { + public GenericJavaQueryHint(JavaQuery<?> parent) { super(parent); } @@ -34,7 +36,7 @@ public class JavaQueryHint extends JavaContextModel implements IJavaQueryHint String oldName = this.name; this.name = newName; this.queryHint.setName(newName); - firePropertyChanged(IQueryHint.NAME_PROPERTY, oldName, newName); + firePropertyChanged(QueryHint.NAME_PROPERTY, oldName, newName); } public String getValue() { @@ -45,24 +47,24 @@ public class JavaQueryHint extends JavaContextModel implements IJavaQueryHint String oldValue = this.value; this.value = newValue; this.queryHint.setValue(newValue); - firePropertyChanged(IQueryHint.VALUE_PROPERTY, oldValue, newValue); + firePropertyChanged(QueryHint.VALUE_PROPERTY, oldValue, newValue); } - public void initializeFromResource(QueryHint queryHint) { + public void initializeFromResource(QueryHintAnnotation queryHint) { this.queryHint = queryHint; this.name = queryHint.getName(); this.value = queryHint.getValue(); } - public void update(QueryHint queryHint) { + public void update(QueryHintAnnotation queryHint) { this.queryHint = queryHint; this.setName(queryHint.getName()); this.setValue(queryHint.getValue()); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java index eb8ec9cfac..5e6ed3b8fc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java @@ -14,15 +14,18 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.java.JavaSecondaryTable; import org.eclipse.jpt.core.internal.resource.java.NullPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTable; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; @@ -30,34 +33,34 @@ import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; -public class JavaSecondaryTable extends AbstractJavaTable - implements IJavaSecondaryTable +public class GenericJavaSecondaryTable extends AbstractJavaTable + implements JavaSecondaryTable { - protected final List<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; + protected final List<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; - protected IJavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; + protected JavaPrimaryKeyJoinColumn defaultPrimaryKeyJoinColumn; - protected SecondaryTable secondaryTableResource; + protected SecondaryTableAnnotation secondaryTableResource; - public JavaSecondaryTable(IJavaEntity parent) { + public GenericJavaSecondaryTable(JavaEntity parent) { super(parent); - this.specifiedPrimaryKeyJoinColumns = new ArrayList<IJavaPrimaryKeyJoinColumn>(); + this.specifiedPrimaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>(); } @Override - public IJavaEntity parent() { - return (IJavaEntity) super.parent(); + public JavaEntity parent() { + return (JavaEntity) super.parent(); } //***************** AbstractJavaTable implementation ******************** @Override protected String annotationName() { - return SecondaryTable.ANNOTATION_NAME; + return SecondaryTableAnnotation.ANNOTATION_NAME; } @Override - protected SecondaryTable tableResource() { + protected SecondaryTableAnnotation tableResource() { return this.secondaryTableResource; } @@ -69,7 +72,7 @@ public class JavaSecondaryTable extends AbstractJavaTable //***************** ISecondaryTable implementation ******************** - public ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() { + public ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns() { return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumns() : this.defaultPrimaryKeyJoinColumns(); } @@ -77,8 +80,8 @@ public class JavaSecondaryTable extends AbstractJavaTable return this.containsSpecifiedPrimaryKeyJoinColumns() ? this.specifiedPrimaryKeyJoinColumnsSize() : this.defaultPrimaryKeyJoinColumnsSize(); } - public ListIterator<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { - return new CloneListIterator<IJavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); + public ListIterator<JavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { + return new CloneListIterator<JavaPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); } public int specifiedPrimaryKeyJoinColumnsSize() { @@ -89,19 +92,19 @@ public class JavaSecondaryTable extends AbstractJavaTable return !this.specifiedPrimaryKeyJoinColumns.isEmpty(); } - public IJavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { + public JavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { return this.defaultPrimaryKeyJoinColumn; } - protected void setDefaultPrimaryKeyJoinColumn(IJavaPrimaryKeyJoinColumn newPkJoinColumn) { - IJavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn; + protected void setDefaultPrimaryKeyJoinColumn(JavaPrimaryKeyJoinColumn newPkJoinColumn) { + JavaPrimaryKeyJoinColumn oldPkJoinColumn = this.defaultPrimaryKeyJoinColumn; this.defaultPrimaryKeyJoinColumn = newPkJoinColumn; - firePropertyChanged(ISecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn); + firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldPkJoinColumn, newPkJoinColumn); } - protected ListIterator<IJavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { + protected ListIterator<JavaPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { if (this.defaultPrimaryKeyJoinColumn != null) { - return new SingleElementListIterator<IJavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn); + return new SingleElementListIterator<JavaPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumn); } return EmptyListIterator.instance(); } @@ -110,8 +113,8 @@ public class JavaSecondaryTable extends AbstractJavaTable return (this.defaultPrimaryKeyJoinColumn == null) ? 0 : 1; } - public IJavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { - IJavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn(); + public JavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { + JavaPrimaryKeyJoinColumn oldDefaultPkJoinColumn = this.getDefaultPrimaryKeyJoinColumn(); if (oldDefaultPkJoinColumn != null) { //null the default join column now if one already exists. //if one does not exist, there is already a specified join column. @@ -119,27 +122,27 @@ public class JavaSecondaryTable extends AbstractJavaTable //cause change notifications to be sent to the UI in the wrong order this.defaultPrimaryKeyJoinColumn = null; } - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); - PrimaryKeyJoinColumn pkJoinColumnResource = this.secondaryTableResource.addPkJoinColumn(index); + PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = this.secondaryTableResource.addPkJoinColumn(index); primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource); - this.fireItemAdded(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); + this.fireItemAdded(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); if (oldDefaultPkJoinColumn != null) { - this.firePropertyChanged(ISecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null); + this.firePropertyChanged(SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, oldDefaultPkJoinColumn, null); } return primaryKeyJoinColumn; } - protected void addSpecifiedPrimaryKeyJoinColumn(int index, IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { - addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void addSpecifiedPrimaryKeyJoinColumn(int index, JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { + addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } - public void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn joinColumn) { + public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn joinColumn) { this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(joinColumn)); } public void removeSpecifiedPrimaryKeyJoinColumn(int index) { - IJavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); + JavaPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); if (!containsSpecifiedPrimaryKeyJoinColumns()) { //create the defaultJoinColumn now or this will happen during project update //after removing the join column from the resource model. That causes problems @@ -147,42 +150,42 @@ public class JavaSecondaryTable extends AbstractJavaTable this.defaultPrimaryKeyJoinColumn = createPrimaryKeyJoinColumn(new NullPrimaryKeyJoinColumn(this.secondaryTableResource)); } this.secondaryTableResource.removePkJoinColumn(index); - fireItemRemoved(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); + fireItemRemoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); if (this.defaultPrimaryKeyJoinColumn != null) { //fire change notification if a defaultJoinColumn was created above - this.firePropertyChanged(IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn); + this.firePropertyChanged(Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN, null, this.defaultPrimaryKeyJoinColumn); } } - protected void removeSpecifiedPrimaryKeyJoinColumn_(IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { - removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void removeSpecifiedPrimaryKeyJoinColumn_(JavaPrimaryKeyJoinColumn primaryKeyJoinColumn) { + removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex); this.secondaryTableResource.movePkJoinColumn(targetIndex, sourceIndex); - fireItemMoved(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } - public IJavaEntity javaEntity() { + public JavaEntity javaEntity() { return parent(); } //********************* updating ************************ - public void initializeFromResource(SecondaryTable secondaryTable) { + public void initializeFromResource(SecondaryTableAnnotation secondaryTable) { super.initializeFromResource(secondaryTable); this.secondaryTableResource = secondaryTable; this.initializeSpecifiedPrimaryKeyJoinColumns(secondaryTable); this.initializeDefaultPrimaryKeyJoinColumn(secondaryTable); } - protected void initializeSpecifiedPrimaryKeyJoinColumns(SecondaryTable secondaryTable) { - ListIterator<PrimaryKeyJoinColumn> annotations = secondaryTable.pkJoinColumns(); + protected void initializeSpecifiedPrimaryKeyJoinColumns(SecondaryTableAnnotation secondaryTable) { + ListIterator<PrimaryKeyJoinColumnAnnotation> annotations = secondaryTable.pkJoinColumns(); while(annotations.hasNext()) { - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); primaryKeyJoinColumn.initializeFromResource(annotations.next()); this.specifiedPrimaryKeyJoinColumns.add(primaryKeyJoinColumn); } @@ -192,28 +195,28 @@ public class JavaSecondaryTable extends AbstractJavaTable return !containsSpecifiedPrimaryKeyJoinColumns(); } - protected void initializeDefaultPrimaryKeyJoinColumn(SecondaryTable secondaryTable) { + protected void initializeDefaultPrimaryKeyJoinColumn(SecondaryTableAnnotation secondaryTable) { if (!shouldBuildDefaultPrimaryKeyJoinColumn()) { return; } - this.defaultPrimaryKeyJoinColumn = this.jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + this.defaultPrimaryKeyJoinColumn = this.jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.defaultPrimaryKeyJoinColumn.initializeFromResource(new NullPrimaryKeyJoinColumn(secondaryTable)); } - public void update(SecondaryTable secondaryTableResource) { + public void update(SecondaryTableAnnotation secondaryTableResource) { this.secondaryTableResource = secondaryTableResource; super.update(secondaryTableResource); this.updateSpecifiedPrimaryKeyJoinColumns(secondaryTableResource); this.updateDefaultPrimaryKeyJoinColumn(secondaryTableResource); } - protected void updateSpecifiedPrimaryKeyJoinColumns(SecondaryTable secondaryTableResource) { - ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); - ListIterator<PrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = secondaryTableResource.pkJoinColumns(); + protected void updateSpecifiedPrimaryKeyJoinColumns(SecondaryTableAnnotation secondaryTableResource) { + ListIterator<JavaPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); + ListIterator<PrimaryKeyJoinColumnAnnotation> resourcePrimaryKeyJoinColumns = secondaryTableResource.pkJoinColumns(); while (primaryKeyJoinColumns.hasNext()) { - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); if (resourcePrimaryKeyJoinColumns.hasNext()) { primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next()); } @@ -227,13 +230,13 @@ public class JavaSecondaryTable extends AbstractJavaTable } } - protected void updateDefaultPrimaryKeyJoinColumn(SecondaryTable secondaryTableResource) { + protected void updateDefaultPrimaryKeyJoinColumn(SecondaryTableAnnotation secondaryTableResource) { if (!shouldBuildDefaultPrimaryKeyJoinColumn()) { setDefaultPrimaryKeyJoinColumn(null); return; } if (getDefaultPrimaryKeyJoinColumn() == null) { - IJavaPrimaryKeyJoinColumn joinColumn = this.jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn joinColumn = this.jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); joinColumn.initializeFromResource(new NullPrimaryKeyJoinColumn(secondaryTableResource)); this.setDefaultPrimaryKeyJoinColumn(joinColumn); } @@ -242,13 +245,13 @@ public class JavaSecondaryTable extends AbstractJavaTable } } - protected IJavaPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumnResource) { - IJavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().createJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + protected JavaPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) { + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource); return primaryKeyJoinColumn; } - protected IAbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { + protected AbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } @@ -261,7 +264,7 @@ public class JavaSecondaryTable extends AbstractJavaTable if (result != null) { return result; } - for (IJavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) { + for (JavaPrimaryKeyJoinColumn column : CollectionTools.iterable(this.primaryKeyJoinColumns())) { result = column.javaCompletionProposals(pos, filter, astRoot); if (result != null) { return result; @@ -274,18 +277,18 @@ public class JavaSecondaryTable extends AbstractJavaTable return false; } - class PrimaryKeyJoinColumnOwner implements IAbstractJoinColumn.Owner + class PrimaryKeyJoinColumnOwner implements AbstractJoinColumn.Owner { - public ITextRange validationTextRange(CompilationUnit astRoot) { - return JavaSecondaryTable.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericJavaSecondaryTable.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return JavaSecondaryTable.this.javaEntity(); + public TypeMapping typeMapping() { + return GenericJavaSecondaryTable.this.javaEntity(); } public Table dbTable(String tableName) { - return JavaSecondaryTable.this.dbTable(); + return GenericJavaSecondaryTable.this.dbTable(); } public Table dbReferencedColumnTable() { @@ -293,11 +296,11 @@ public class JavaSecondaryTable extends AbstractJavaTable } public int joinColumnsSize() { - return JavaSecondaryTable.this.primaryKeyJoinColumnsSize(); + return GenericJavaSecondaryTable.this.primaryKeyJoinColumnsSize(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return JavaSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn; + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericJavaSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn; } public String defaultColumnName() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java index 8b118b95d2..a91e253a6a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSequenceGenerator.java @@ -9,27 +9,29 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.resource.java.SequenceGenerator; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; -public class JavaSequenceGenerator extends JavaGenerator<SequenceGenerator> - implements IJavaSequenceGenerator +public class GenericJavaSequenceGenerator extends AbstractJavaGenerator<SequenceGeneratorAnnotation> + implements JavaSequenceGenerator { protected String specifiedSequenceName; - public JavaSequenceGenerator(IJavaJpaContextNode parent) { + public GenericJavaSequenceGenerator(JavaJpaContextNode parent) { super(parent); } @Override - public void initializeFromResource(SequenceGenerator sequenceGenerator) { + public void initializeFromResource(SequenceGeneratorAnnotation sequenceGenerator) { super.initializeFromResource(sequenceGenerator); this.specifiedSequenceName = this.specifiedSequenceName(sequenceGenerator); } public Integer getDefaultInitialValue() { - return ISequenceGenerator.DEFAULT_INITIAL_VALUE; + return SequenceGenerator.DEFAULT_INITIAL_VALUE; } public String getSequenceName() { @@ -58,12 +60,12 @@ public class JavaSequenceGenerator extends JavaGenerator<SequenceGenerator> } @Override - public void update(SequenceGenerator sequenceGenerator) { + public void update(SequenceGeneratorAnnotation sequenceGenerator) { super.update(sequenceGenerator); this.setSpecifiedSequenceName_(this.specifiedSequenceName(sequenceGenerator)); } - protected String specifiedSequenceName(SequenceGenerator generatorResource) { + protected String specifiedSequenceName(SequenceGeneratorAnnotation generatorResource) { return generatorResource.getSequenceName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java index 1ca902e875..f6d1d4460f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java @@ -9,21 +9,23 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentResource; -import org.eclipse.jpt.core.internal.resource.java.Table; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.InheritanceType; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaTable; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.TableAnnotation; -public class JavaTable extends AbstractJavaTable implements IJavaTable +public class GenericJavaTable extends AbstractJavaTable implements JavaTable { - protected JavaPersistentResource persistentResource; + protected JavaResourcePersistentMember persistentResource; - public JavaTable(IJavaEntity parent) { + public GenericJavaTable(JavaEntity parent) { super(parent); } - public void initializeFromResource(JavaPersistentResource persistentResource) { + public void initializeFromResource(JavaResourcePersistentMember persistentResource) { this.persistentResource = persistentResource; initializeFromResource(tableResource()); } @@ -34,26 +36,26 @@ public class JavaTable extends AbstractJavaTable implements IJavaTable //You could call more than one setter before this object has received any notification //from the java resource model @Override - protected Table tableResource() { + protected TableAnnotation tableResource() { //TODO get the NullTable from the resource model or build it here in the context model?? - return (Table) this.persistentResource.nonNullAnnotation(annotationName()); + return (TableAnnotation) this.persistentResource.nonNullAnnotation(annotationName()); } @Override protected String annotationName() { - return Table.ANNOTATION_NAME; + return TableAnnotation.ANNOTATION_NAME; } @Override - public IJavaEntity parent() { - return (IJavaEntity) super.parent(); + public JavaEntity parent() { + return (JavaEntity) super.parent(); } - protected IJavaEntity javaEntity() { + protected JavaEntity javaEntity() { return parent(); } - protected IEntity rootEntity() { + protected Entity rootEntity() { return javaEntity().rootEntity(); } @@ -98,7 +100,7 @@ public class JavaTable extends AbstractJavaTable implements IJavaTable // } - public void update(JavaPersistentResource persistentResource) { + public void update(JavaResourcePersistentMember persistentResource) { this.persistentResource = persistentResource; this.update(tableResource()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java index db6c88c64a..e1e5999686 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java @@ -9,14 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.core.internal.resource.java.TableGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; +import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; -public class JavaTableGenerator extends JavaGenerator<TableGenerator> - implements IJavaTableGenerator +public class GenericJavaTableGenerator extends AbstractJavaGenerator<TableGeneratorAnnotation> + implements JavaTableGenerator { protected String specifiedTable; @@ -45,12 +47,12 @@ public class JavaTableGenerator extends JavaGenerator<TableGenerator> // protected EList<IUniqueConstraint> uniqueConstraints; - public JavaTableGenerator(IJavaJpaContextNode parent) { + public GenericJavaTableGenerator(JavaJpaContextNode parent) { super(parent); } @Override - public void initializeFromResource(TableGenerator tableGenerator) { + public void initializeFromResource(TableGeneratorAnnotation tableGenerator) { super.initializeFromResource(tableGenerator); this.specifiedTable = this.specifiedTable(tableGenerator); this.specifiedCatalog = this.specifiedCatalog(tableGenerator); @@ -62,7 +64,7 @@ public class JavaTableGenerator extends JavaGenerator<TableGenerator> } public Integer getDefaultInitialValue() { - return ITableGenerator.DEFAULT_INITIAL_VALUE; + return TableGenerator.DEFAULT_INITIAL_VALUE; } public String getTable() { @@ -233,7 +235,7 @@ public class JavaTableGenerator extends JavaGenerator<TableGenerator> // ********** java resource model -> context model model ********** @Override - public void update(TableGenerator tableGenerator) { + public void update(TableGeneratorAnnotation tableGenerator) { super.update(tableGenerator); this.setSpecifiedTable_(this.specifiedTable(tableGenerator)); this.setSpecifiedCatalog_(this.specifiedCatalog(tableGenerator)); @@ -244,27 +246,27 @@ public class JavaTableGenerator extends JavaGenerator<TableGenerator> //this.updateUniqueConstraintsFromJava(astRoot); } - protected String specifiedTable(TableGenerator tableGenerator) { + protected String specifiedTable(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getTable(); } - protected String specifiedCatalog(TableGenerator tableGenerator) { + protected String specifiedCatalog(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getCatalog(); } - protected String specifiedSchema(TableGenerator tableGenerator) { + protected String specifiedSchema(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getSchema(); } - protected String specifiedPkColumnName(TableGenerator tableGenerator) { + protected String specifiedPkColumnName(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getPkColumnName(); } - protected String specifiedValueColumnName(TableGenerator tableGenerator) { + protected String specifiedValueColumnName(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getValueColumnName(); } - protected String specifiedPkColumnValue(TableGenerator tableGenerator) { + protected String specifiedPkColumnValue(TableGeneratorAnnotation tableGenerator) { return tableGenerator.getPkColumnValue(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java index e1e5db6c97..62cc372b95 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java @@ -13,21 +13,23 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.resource.java.Transient; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaTransientMapping; +import org.eclipse.jpt.core.resource.java.Transient; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaTransientMapping extends JavaAttributeMapping - implements IJavaTransientMapping +public class GenericJavaTransientMapping extends AbstractJavaAttributeMapping + implements JavaTransientMapping { - public JavaTransientMapping(IJavaPersistentAttribute parent) { + public GenericJavaTransientMapping(JavaPersistentAttribute parent) { super(parent); } public String getKey() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java index a2ad665d3c..eb35b10a77 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java @@ -13,38 +13,41 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.java.Column; -import org.eclipse.jpt.core.internal.resource.java.JPA; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.Temporal; -import org.eclipse.jpt.core.internal.resource.java.Version; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaVersionMapping; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.Temporal; +import org.eclipse.jpt.core.resource.java.Version; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVersionMapping +public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping implements JavaVersionMapping { - protected final IJavaColumn column; + protected final JavaColumn column; protected TemporalType temporal; - public JavaVersionMapping(IJavaPersistentAttribute parent) { + public GenericJavaVersionMapping(JavaPersistentAttribute parent) { super(parent); this.column = createJavaColumn(); } - protected IJavaColumn createJavaColumn() { - return jpaFactory().createJavaColumn(this, this); + protected JavaColumn createJavaColumn() { + return jpaFactory().buildJavaColumn(this, this); } @Override - public void initializeFromResource(JavaPersistentAttributeResource persistentAttributeResource) { + public void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource) { super.initializeFromResource(persistentAttributeResource); this.column.initializeFromResource(this.columnResource()); this.temporal = this.temporal(this.temporalResource()); @@ -54,14 +57,14 @@ public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVer return (Temporal) this.persistentAttributeResource.nonNullAnnotation(Temporal.ANNOTATION_NAME); } - public Column columnResource() { - return (Column) this.persistentAttributeResource.nonNullAnnotation(Column.ANNOTATION_NAME); + public ColumnAnnotation columnResource() { + return (ColumnAnnotation) this.persistentAttributeResource.nonNullAnnotation(ColumnAnnotation.ANNOTATION_NAME); } //************** IJavaAttributeMapping implementation *************** public String getKey() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { @@ -86,7 +89,7 @@ public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVer //************** IVersionMapping implementation *************** - public IJavaColumn getColumn() { + public JavaColumn getColumn() { return this.column; } @@ -98,11 +101,11 @@ public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVer TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.temporalResource().setValue(TemporalType.toJavaResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } @Override - public void update(JavaPersistentAttributeResource persistentAttributeResource) { + public void update(JavaResourcePersistentAttribute persistentAttributeResource) { super.update(persistentAttributeResource); this.column.update(this.columnResource()); this.setTemporal(this.temporal(this.temporalResource())); @@ -135,15 +138,15 @@ public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVer } protected void addColumnMessages(List<IMessage> messages, CompilationUnit astRoot) { - IJavaColumn column = this.getColumn(); + JavaColumn column = this.getColumn(); String table = column.getTable(); boolean doContinue = entityOwned() && column.isConnected(); if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_TABLE, + JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, column.tableTextRange(astRoot)) ); @@ -152,9 +155,9 @@ public class JavaVersionMapping extends JavaAttributeMapping implements IJavaVer if (doContinue && ! column.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.COLUMN_UNRESOLVED_NAME, + JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, column.nameTextRange(astRoot)) ); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeOverride.java deleted file mode 100644 index c3f82894a0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaAttributeOverride.java +++ /dev/null @@ -1,23 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.resource.java.AttributeOverride; - -public interface IJavaAttributeOverride extends IAttributeOverride, IJavaJpaContextNode, IJavaColumn.Owner -{ - IJavaColumn getColumn(); - - void initializeFromResource(AttributeOverride attributeOverride); - - void update(AttributeOverride attributeOverride); - -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaBasicMapping.java deleted file mode 100644 index 91eb09d074..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaBasicMapping.java +++ /dev/null @@ -1,15 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; - -public interface IJavaBasicMapping extends IJavaAttributeMapping, IBasicMapping, IJavaColumnMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaDiscriminatorColumn.java deleted file mode 100644 index ca80950aa6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaDiscriminatorColumn.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentResource; - -public interface IJavaDiscriminatorColumn extends IJavaNamedColumn, IDiscriminatorColumn -{ - void initializeFromResource(JavaPersistentResource persistentResource); - - void update(JavaPersistentResource persistentResource); - -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEntity.java deleted file mode 100644 index dfda039418..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; - -public interface IJavaEntity extends IJavaTypeMapping, IEntity -{ - IJavaTable getTable(); - - IJavaDiscriminatorColumn getDiscriminatorColumn(); - - IJavaTableGenerator getTableGenerator(); - IJavaTableGenerator addTableGenerator(); - - IJavaSequenceGenerator getSequenceGenerator(); - IJavaSequenceGenerator addSequenceGenerator(); - - @SuppressWarnings("unchecked") - ListIterator<IJavaSecondaryTable> secondaryTables(); - @SuppressWarnings("unchecked") - ListIterator<IJavaSecondaryTable> specifiedSecondaryTables(); - IJavaSecondaryTable addSpecifiedSecondaryTable(int index); - - @SuppressWarnings("unchecked") - ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns(); - IJavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); - @SuppressWarnings("unchecked") - ListIterator<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns(); - IPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); - - @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> attributeOverrides(); - @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> specifiedAttributeOverrides(); - @SuppressWarnings("unchecked") - ListIterator<IJavaAttributeOverride> defaultAttributeOverrides(); - IJavaAttributeOverride addSpecifiedAttributeOverride(int index); - - @SuppressWarnings("unchecked") - ListIterator<IJavaAssociationOverride> associationOverrides(); - @SuppressWarnings("unchecked") - ListIterator<IJavaAssociationOverride> specifiedAssociationOverrides(); - @SuppressWarnings("unchecked") - ListIterator<IJavaAssociationOverride> defaultAssociationOverrides(); - IJavaAssociationOverride addSpecifiedAssociationOverride(int index); - - @SuppressWarnings("unchecked") - ListIterator<IJavaNamedQuery> namedQueries(); - IJavaNamedQuery addNamedQuery(int index); - - @SuppressWarnings("unchecked") - ListIterator<IJavaNamedNativeQuery> namedNativeQueries(); - IJavaNamedNativeQuery addNamedNativeQuery(int index); -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaIdMapping.java deleted file mode 100644 index c89f1c0e84..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaIdMapping.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IIdMapping; - - -public interface IJavaIdMapping extends IJavaAttributeMapping, IIdMapping, IJavaColumnMapping -{ - IJavaGeneratedValue getGeneratedValue(); - IJavaGeneratedValue addGeneratedValue(); - - IJavaSequenceGenerator getSequenceGenerator(); - IJavaSequenceGenerator addSequenceGenerator(); - - IJavaTableGenerator getTableGenerator(); - IJavaTableGenerator addTableGenerator(); -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJoinTable.java deleted file mode 100644 index efe4b97a03..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaJoinTable.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.java; - -import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; - - -public interface IJavaJoinTable extends IJoinTable, IJavaJpaContextNode -{ - void initializeFromResource(JavaPersistentAttributeResource attributeResource); - - void update(JavaPersistentAttributeResource attributeResource); - - boolean isSpecified(); - - @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> joinColumns(); - - IJavaJoinColumn getDefaultJoinColumn(); - - @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> specifiedJoinColumns(); - - IJavaJoinColumn addSpecifiedJoinColumn(int index); - - - @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> inverseJoinColumns(); - - IJavaJoinColumn getDefaultInverseJoinColumn(); - - @SuppressWarnings("unchecked") - ListIterator<IJavaJoinColumn> specifiedInverseJoinColumns(); - - IJavaJoinColumn addSpecifiedInverseJoinColumn(int index); - -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToManyMapping.java deleted file mode 100644 index f65378960b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToManyMapping.java +++ /dev/null @@ -1,15 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; - -public interface IJavaManyToManyMapping extends IJavaMultiRelationshipMapping, IManyToManyMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToOneMapping.java deleted file mode 100644 index a69115e745..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaManyToOneMapping.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; - - -public interface IJavaManyToOneMapping extends IJavaSingleRelationshipMapping, IManyToOneMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaMultiRelationshipMapping.java deleted file mode 100644 index 33ff761a96..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaMultiRelationshipMapping.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IMultiRelationshipMapping; - -public interface IJavaMultiRelationshipMapping extends IJavaRelationshipMapping, IMultiRelationshipMapping -{ - - IJavaJoinTable getJoinTable(); -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedColumn.java deleted file mode 100644 index 96ea2e93e9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedColumn.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.INamedColumn; - - -public interface IJavaNamedColumn extends INamedColumn, IJavaJpaContextNode -{ - -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedNativeQuery.java deleted file mode 100644 index 154ba6c62b..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaNamedNativeQuery.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.INamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.java.NamedNativeQuery; - -public interface IJavaNamedNativeQuery extends INamedNativeQuery, IJavaQuery<NamedNativeQuery> -{ - -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToManyMapping.java deleted file mode 100644 index 7be227aca0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToManyMapping.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; - - -public interface IJavaOneToManyMapping extends IJavaMultiRelationshipMapping, IOneToManyMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToOneMapping.java deleted file mode 100644 index ffea677b1f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaOneToOneMapping.java +++ /dev/null @@ -1,15 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; - -public interface IJavaOneToOneMapping extends IJavaSingleRelationshipMapping, IOneToOneMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaRelationshipMapping.java deleted file mode 100644 index 11a76004ea..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaRelationshipMapping.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; - - -public interface IJavaRelationshipMapping extends IJavaAttributeMapping, IRelationshipMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSecondaryTable.java deleted file mode 100644 index c926026083..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaSecondaryTable.java +++ /dev/null @@ -1,34 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.java; - -import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.resource.java.SecondaryTable; - - -public interface IJavaSecondaryTable extends ISecondaryTable, IJavaJpaContextNode -{ - - @SuppressWarnings("unchecked") - ListIterator<IJavaPrimaryKeyJoinColumn> primaryKeyJoinColumns(); - - IJavaPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn(); - - @SuppressWarnings("unchecked") - ListIterator<IJavaPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns(); - - IJavaPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index); - - void initializeFromResource(SecondaryTable secondaryTable); - - void update(SecondaryTable secondaryTable); - -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTable.java deleted file mode 100644 index 9598a79af4..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTable.java +++ /dev/null @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentResource; - -public interface IJavaTable extends ITable, IJavaJpaContextNode -{ - void initializeFromResource(JavaPersistentResource persistentResource); - - void update(JavaPersistentResource persistentResource); -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTransientMapping.java deleted file mode 100644 index bb68d1424f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaTransientMapping.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; - - -public interface IJavaTransientMapping extends IJavaAttributeMapping, ITransientMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaVersionMapping.java deleted file mode 100644 index 271b5cfddb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/IJavaVersionMapping.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.context.java; - -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; - - -public interface IJavaVersionMapping extends IJavaAttributeMapping, IVersionMapping, IJavaColumnMapping -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java index ff24e11c4a..22f5c9ba02 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Basic; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.Basic; public class JavaBasicMappingProvider - implements IDefaultJavaAttributeMappingProvider + implements DefaultJavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaBasicMappingProvider /** * Return the singleton. */ - public static IDefaultJavaAttributeMappingProvider instance() { + public static DefaultJavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,18 +38,18 @@ public class JavaBasicMappingProvider } public String key() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return Basic.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaBasicMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaBasicMapping(parent); } - public boolean defaultApplies(IJavaPersistentAttribute persistentAttribute) { + public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { return persistentAttribute.getPersistentAttributeResource().typeIsBasic(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java index 158adf3804..624a0d70b2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java @@ -10,11 +10,12 @@ package org.eclipse.jpt.core.internal.context.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.resource.java.RelationshipMapping; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.java.JavaRelationshipMapping; +import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation; -public class JavaCascade extends JavaContextModel implements ICascade +public class JavaCascade extends JavaContextModel implements Cascade { protected boolean all; @@ -26,9 +27,9 @@ public class JavaCascade extends JavaContextModel implements ICascade protected boolean refresh; - protected RelationshipMapping relationshipMapping; + protected RelationshipMappingAnnotation relationshipMapping; - protected JavaCascade(IJavaRelationshipMapping parent) { + protected JavaCascade(JavaRelationshipMapping parent) { super(parent); } @@ -40,7 +41,7 @@ public class JavaCascade extends JavaContextModel implements ICascade boolean oldAll = this.all; this.all = newAll; this.relationshipMapping.setCascadeAll(newAll); - firePropertyChanged(ICascade.ALL_PROPERTY, oldAll, newAll); + firePropertyChanged(Cascade.ALL_PROPERTY, oldAll, newAll); } public boolean isPersist() { @@ -51,7 +52,7 @@ public class JavaCascade extends JavaContextModel implements ICascade boolean oldPersist = this.persist; this.persist = newPersist; this.relationshipMapping.setCascadePersist(newPersist); - firePropertyChanged(ICascade.PERSIST_PROPERTY, oldPersist, newPersist); + firePropertyChanged(Cascade.PERSIST_PROPERTY, oldPersist, newPersist); } public boolean isMerge() { @@ -62,7 +63,7 @@ public class JavaCascade extends JavaContextModel implements ICascade boolean oldMerge = this.merge; this.merge = newMerge; this.relationshipMapping.setCascadeMerge(newMerge); - firePropertyChanged(ICascade.MERGE_PROPERTY, oldMerge, newMerge); + firePropertyChanged(Cascade.MERGE_PROPERTY, oldMerge, newMerge); } public boolean isRemove() { @@ -73,7 +74,7 @@ public class JavaCascade extends JavaContextModel implements ICascade boolean oldRemove = this.remove; this.remove = newRemove; this.relationshipMapping.setCascadeRemove(newRemove); - firePropertyChanged(ICascade.REMOVE_PROPERTY, oldRemove, newRemove); + firePropertyChanged(Cascade.REMOVE_PROPERTY, oldRemove, newRemove); } public boolean isRefresh() { @@ -84,14 +85,14 @@ public class JavaCascade extends JavaContextModel implements ICascade boolean oldRefresh = this.refresh; this.refresh = newRefresh; this.relationshipMapping.setCascadeRefresh(newRefresh); - firePropertyChanged(ICascade.REFRESH_PROPERTY, oldRefresh, newRefresh); + firePropertyChanged(Cascade.REFRESH_PROPERTY, oldRefresh, newRefresh); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { return this.relationshipMapping.cascadeTextRange(astRoot); } - public void initialize(RelationshipMapping relationshipMapping) { + public void initialize(RelationshipMappingAnnotation relationshipMapping) { this.relationshipMapping = relationshipMapping; this.all = relationshipMapping.isCascadeAll(); this.persist = relationshipMapping.isCascadePersist(); @@ -100,7 +101,7 @@ public class JavaCascade extends JavaContextModel implements ICascade this.refresh = relationshipMapping.isCascadeRefresh(); } - public void update(RelationshipMapping relationshipMapping) { + public void update(RelationshipMappingAnnotation relationshipMapping) { this.relationshipMapping = relationshipMapping; this.setAll(relationshipMapping.isCascadeAll()); this.setPersist(relationshipMapping.isCascadePersist()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaContextModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaContextModel.java index 19e1f76513..110402e0d3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaContextModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaContextModel.java @@ -11,15 +11,16 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; import org.eclipse.jpt.utility.internal.Filter; -public abstract class JavaContextModel extends JpaContextNode implements IJavaJpaContextNode +public abstract class JavaContextModel extends AbstractJpaContextNode implements JavaJpaContextNode { // ********** constructor ********** - protected JavaContextModel(IJpaNode parent) { + protected JavaContextModel(JpaNode parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java index 275ab09760..c8ba12cd87 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Embeddable; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.EmbeddableAnnotation; public class JavaEmbeddableProvider - implements IJavaTypeMappingProvider + implements JavaTypeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaEmbeddableProvider /** * Return the singleton. */ - public static IJavaTypeMappingProvider instance() { + public static JavaTypeMappingProvider instance() { return INSTANCE; } @@ -35,15 +38,15 @@ public class JavaEmbeddableProvider } public String key() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } public String annotationName() { - return Embeddable.ANNOTATION_NAME; + return EmbeddableAnnotation.ANNOTATION_NAME; } - public IJavaTypeMapping buildMapping(IJavaPersistentType parent, IJpaBaseContextFactory factory) { - return factory.createJavaEmbeddable(parent); + public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaBaseContextFactory factory) { + return factory.buildJavaEmbeddable(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java index ec898ff153..8a84f495bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.EmbeddedId; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.EmbeddedId; public class JavaEmbeddedIdMappingProvider - implements IDefaultJavaAttributeMappingProvider + implements DefaultJavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaEmbeddedIdMappingProvider /** * Return the singleton. */ - public static IDefaultJavaAttributeMappingProvider instance() { + public static DefaultJavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,18 +38,18 @@ public class JavaEmbeddedIdMappingProvider } public String key() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return EmbeddedId.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaEmbeddedIdMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaEmbeddedIdMapping(parent); } - public boolean defaultApplies(IJavaPersistentAttribute persistentAttribute) { - return JavaEmbeddedMapping.embeddableFor(persistentAttribute) != null; + public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { + return GenericJavaEmbeddedMapping.embeddableFor(persistentAttribute) != null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java index becb3925a1..71503321d7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Embedded; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.Embedded; public class JavaEmbeddedMappingProvider - implements IDefaultJavaAttributeMappingProvider + implements DefaultJavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaEmbeddedMappingProvider /** * Return the singleton. */ - public static IDefaultJavaAttributeMappingProvider instance() { + public static DefaultJavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,18 +38,18 @@ public class JavaEmbeddedMappingProvider } public String key() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return Embedded.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaEmbeddedMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaEmbeddedMapping(parent); } - public boolean defaultApplies(IJavaPersistentAttribute persistentAttribute) { - return JavaEmbeddedMapping.embeddableFor(persistentAttribute) != null; + public boolean defaultApplies(JavaPersistentAttribute persistentAttribute) { + return GenericJavaEmbeddedMapping.embeddableFor(persistentAttribute) != null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java index 0133b89bef..1671befcaf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java @@ -9,15 +9,18 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Entity; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.EntityAnnotation; /** * */ public class JavaEntityProvider - implements IJavaTypeMappingProvider + implements JavaTypeMappingProvider { // singleton @@ -26,7 +29,7 @@ public class JavaEntityProvider /** * Return the singleton. */ - public static IJavaTypeMappingProvider instance() { + public static JavaTypeMappingProvider instance() { return INSTANCE; } @@ -38,15 +41,15 @@ public class JavaEntityProvider } public String key() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } public String annotationName() { - return Entity.ANNOTATION_NAME; + return EntityAnnotation.ANNOTATION_NAME; } - public IJavaTypeMapping buildMapping(IJavaPersistentType parent, IJpaBaseContextFactory factory) { - return factory.createJavaEntity(parent); + public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaBaseContextFactory factory) { + return factory.buildJavaEntity(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java index 10eeff394b..0f18327e2a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Id; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.Id; public class JavaIdMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaIdMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaIdMappingProvider } public String key() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return Id.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaIdMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaIdMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java index 53f9b38f4b..d857214733 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.ManyToMany; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.ManyToMany; public class JavaManyToManyMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaManyToManyMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaManyToManyMappingProvider } public String key() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return ManyToMany.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaManyToManyMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaManyToManyMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java index 69d06e323f..6c81a01c62 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.ManyToOne; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.ManyToOne; public class JavaManyToOneMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaManyToOneMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaManyToOneMappingProvider } public String key() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return ManyToOne.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaManyToOneMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaManyToOneMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java index 3a0f813223..3c360bc741 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.MappedSuperclass; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation; public class JavaMappedSuperclassProvider - implements IJavaTypeMappingProvider + implements JavaTypeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaMappedSuperclassProvider /** * Return the singleton. */ - public static IJavaTypeMappingProvider instance() { + public static JavaTypeMappingProvider instance() { return INSTANCE; } @@ -35,15 +38,15 @@ public class JavaMappedSuperclassProvider } public String key() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } public String annotationName() { - return MappedSuperclass.ANNOTATION_NAME; + return MappedSuperclassAnnotation.ANNOTATION_NAME; } - public IJavaTypeMapping buildMapping(IJavaPersistentType parent, IJpaBaseContextFactory factory) { - return factory.createJavaMappedSuperclass(parent); + public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaBaseContextFactory factory) { + return factory.buildJavaMappedSuperclass(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java index 55b53a17b6..550cd4f0c7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java @@ -9,7 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; /** * This mapping provider implementation is used to create a JavaNullAttributeMapping. @@ -17,7 +20,7 @@ import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; * exists on a Java attribute *and* no default mapping applies. */ public class JavaNullAttributeMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -26,7 +29,7 @@ public class JavaNullAttributeMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -45,7 +48,7 @@ public class JavaNullAttributeMappingProvider return null; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaNullAttributeMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaNullAttributeMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java index 97f9c4ffb8..2ad5737979 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java @@ -13,14 +13,15 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class JavaNullTypeMapping extends JavaTypeMapping +public class JavaNullTypeMapping extends AbstractJavaTypeMapping { - public JavaNullTypeMapping(IJavaPersistentType parent) { + public JavaNullTypeMapping(JavaPersistentType parent) { super(parent); } @@ -29,7 +30,7 @@ public class JavaNullTypeMapping extends JavaTypeMapping } public String getKey() { - return IMappingKeys.NULL_TYPE_MAPPING_KEY; + return MappingKeys.NULL_TYPE_MAPPING_KEY; } public boolean isMapped() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java index 50e860044f..172afd9a1c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java @@ -9,7 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; /** * This mapping provider implementation is used to create a JavaNullAttributeMapping. @@ -17,7 +20,7 @@ import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; * exists on a Java type. */ public class JavaNullTypeMappingProvider - implements IJavaTypeMappingProvider + implements JavaTypeMappingProvider { // singleton @@ -26,7 +29,7 @@ public class JavaNullTypeMappingProvider /** * Return the singleton. */ - public static IJavaTypeMappingProvider instance() { + public static JavaTypeMappingProvider instance() { return INSTANCE; } @@ -45,8 +48,8 @@ public class JavaNullTypeMappingProvider return null; } - public IJavaTypeMapping buildMapping(IJavaPersistentType parent, IJpaBaseContextFactory factory) { - return factory.createJavaNullTypeMapping(parent); + public JavaTypeMapping buildMapping(JavaPersistentType parent, JpaBaseContextFactory factory) { + return factory.buildJavaNullTypeMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java index e575067998..810cf1ac11 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.OneToMany; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.OneToMany; public class JavaOneToManyMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaOneToManyMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaOneToManyMappingProvider } public String key() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return OneToMany.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaOneToManyMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaOneToManyMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java index 7c226edd81..a4a872cf7d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.OneToOne; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.OneToOne; public class JavaOneToOneMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaOneToOneMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaOneToOneMappingProvider } public String key() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return OneToOne.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaOneToOneMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaOneToOneMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOverride.java index 6a06c5fdf6..af5ef00b3c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOverride.java @@ -11,15 +11,16 @@ package org.eclipse.jpt.core.internal.context.java; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.resource.java.OverrideResource; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.resource.java.OverrideAnnotation; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public abstract class JavaOverride<T extends OverrideResource> extends JavaContextModel implements IOverride +public abstract class JavaOverride<T extends OverrideAnnotation> extends JavaContextModel implements BaseOverride { protected String name; @@ -28,7 +29,7 @@ public abstract class JavaOverride<T extends OverrideResource> extends JavaConte protected T overrideResource; - public JavaOverride(IJavaJpaContextNode parent, Owner owner) { + public JavaOverride(JavaJpaContextNode parent, Owner owner) { super(parent); this.owner = owner; } @@ -64,7 +65,7 @@ public abstract class JavaOverride<T extends OverrideResource> extends JavaConte this.setName_(this.name(overrideResource)); } - protected String name(OverrideResource overrideResource) { + protected String name(OverrideAnnotation overrideResource) { return overrideResource.getName(); } @@ -77,8 +78,8 @@ public abstract class JavaOverride<T extends OverrideResource> extends JavaConte } @Override - public IJavaJpaContextNode parent() { - return (IJavaJpaContextNode) super.parent(); + public JavaJpaContextNode parent() { + return (JavaJpaContextNode) super.parent(); } protected abstract Iterator<String> candidateNames(); @@ -107,8 +108,8 @@ public abstract class JavaOverride<T extends OverrideResource> extends JavaConte return this.overrideResource.nameTouches(pos, astRoot); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - ITextRange textRange = this.overrideResource.textRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + TextRange textRange = this.overrideResource.textRange(astRoot); return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java index bd61eada69..3ea7672d98 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Transient; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.Transient; public class JavaTransientMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaTransientMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaTransientMappingProvider } public String key() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return Transient.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaTransientMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaTransientMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java index 88f20d2cf0..3ae967aa7b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java @@ -9,12 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.java; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.java.Version; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.java.Version; public class JavaVersionMappingProvider - implements IJavaAttributeMappingProvider + implements JavaAttributeMappingProvider { // singleton @@ -23,7 +26,7 @@ public class JavaVersionMappingProvider /** * Return the singleton. */ - public static IJavaAttributeMappingProvider instance() { + public static JavaAttributeMappingProvider instance() { return INSTANCE; } @@ -35,14 +38,14 @@ public class JavaVersionMappingProvider } public String key() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } public String annotationName() { return Version.ANNOTATION_NAME; } - public IJavaAttributeMapping buildMapping(IJavaPersistentAttribute parent, IJpaBaseContextFactory factory) { - return factory.createJavaVersionMapping(parent); + public JavaAttributeMapping buildMapping(JavaPersistentAttribute parent, JpaBaseContextFactory factory) { + return factory.buildJavaVersionMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java index 8b9add3b19..b716b5f657 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -9,39 +9,41 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping; -import org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping; - - -public abstract class XmlAttributeMapping<T extends AttributeMapping> extends JpaContextNode - implements IAttributeMapping +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.orm.OrmColumnMapping; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping; +import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping; +import org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping; + + +public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> extends AbstractJpaContextNode + implements AttributeMapping { protected String name; public static final String NAME_PROPERTY = "nameProperty"; protected T attributeMapping; - protected IJavaPersistentAttribute javaPersistentAttribute; + protected JavaPersistentAttribute javaPersistentAttribute; public static final String JAVA_PERSISTENT_ATTRIBUTE_PROPERTY = "javaPersistentAttributeProperty"; - protected XmlAttributeMapping(XmlPersistentAttribute parent) { + protected AbstractOrmAttributeMapping(OrmPersistentAttribute parent) { super(parent); } - public IJavaPersistentAttribute getJavaPersistentAttribute() { + public JavaPersistentAttribute getJavaPersistentAttribute() { return this.javaPersistentAttribute; } - protected void setJavaPersistentAttribute(IJavaPersistentAttribute newJavaPersistentAttribute) { - IJavaPersistentAttribute oldJavaPersistentAttribute = this.javaPersistentAttribute; + protected void setJavaPersistentAttribute(JavaPersistentAttribute newJavaPersistentAttribute) { + JavaPersistentAttribute oldJavaPersistentAttribute = this.javaPersistentAttribute; this.javaPersistentAttribute = newJavaPersistentAttribute; firePropertyChanged(JAVA_PERSISTENT_ATTRIBUTE_PROPERTY, oldJavaPersistentAttribute, newJavaPersistentAttribute); @@ -66,8 +68,8 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp persistentAttribute().nameChanged(oldName, newName); } - public XmlPersistentAttribute persistentAttribute() { - return (XmlPersistentAttribute) parent(); + public OrmPersistentAttribute persistentAttribute() { + return (OrmPersistentAttribute) parent(); } public String attributeName() { @@ -83,71 +85,71 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp * Subclasses should override this method to call the * appropriate initializeFrom___Mapping() method. */ - protected abstract void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping); + protected abstract void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping); - public void initializeFromXmlAttributeMapping(XmlAttributeMapping<? extends AttributeMapping> oldMapping) { + public void initializeFromXmlAttributeMapping(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> oldMapping) { setName(oldMapping.getName()); } - public void initializeFromXmlColumnMapping(IXmlColumnMapping oldMapping) { - initializeFromXmlAttributeMapping((XmlAttributeMapping) oldMapping); + public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) { + initializeFromXmlAttributeMapping((AbstractOrmAttributeMapping) oldMapping); } - public void initializeFromXmlNonOwningMapping(INonOwningMapping oldMapping) { - initializeFromXmlAttributeMapping((XmlAttributeMapping) oldMapping); + public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) { + initializeFromXmlAttributeMapping((AbstractOrmAttributeMapping) oldMapping); } - public void initializeFromXmlBasicMapping(XmlBasicMapping oldMapping) { + public void initializeFromXmlBasicMapping(GenericOrmBasicMapping oldMapping) { initializeFromXmlColumnMapping(oldMapping); } - public void initializeFromXmlIdMapping(XmlIdMapping oldMapping) { + public void initializeFromXmlIdMapping(GenericOrmIdMapping oldMapping) { initializeFromXmlColumnMapping(oldMapping); } - public void initializeFromXmlTransientMapping(XmlTransientMapping oldMapping) { + public void initializeFromXmlTransientMapping(GenericOrmTransientMapping oldMapping) { initializeFromXmlAttributeMapping(oldMapping); } - public void initializeFromXmlEmbeddedMapping(XmlEmbeddedMapping oldMapping) { + public void initializeFromXmlEmbeddedMapping(GenericOrmEmbeddedMapping oldMapping) { initializeFromXmlAttributeMapping(oldMapping); } - public void initializeFromXmlEmbeddedIdMapping(XmlEmbeddedIdMapping oldMapping) { + public void initializeFromXmlEmbeddedIdMapping(GenericOrmEmbeddedIdMapping oldMapping) { initializeFromXmlAttributeMapping(oldMapping); } - public void initializeFromXmlVersionMapping(XmlVersionMapping oldMapping) { + public void initializeFromXmlVersionMapping(GenericOrmVersionMapping oldMapping) { initializeFromXmlColumnMapping(oldMapping); } - public void initializeFromXmlRelationshipMapping(XmlRelationshipMapping<? extends RelationshipMapping> oldMapping) { + public void initializeFromXmlRelationshipMapping(AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> oldMapping) { initializeFromXmlAttributeMapping(oldMapping); } - public void initializeFromXmlMulitRelationshipMapping(XmlMultiRelationshipMapping<? extends MultiRelationshipMapping> oldMapping) { + public void initializeFromXmlMulitRelationshipMapping(AbstractOrmMultiRelationshipMapping<? extends XmlMultiRelationshipMapping> oldMapping) { initializeFromXmlRelationshipMapping(oldMapping); } - public void initializeFromXmlSingleRelationshipMapping(XmlSingleRelationshipMapping<? extends SingleRelationshipMapping> oldMapping) { + public void initializeFromXmlSingleRelationshipMapping(AbstractOrmSingleRelationshipMapping<? extends XmlSingleRelationshipMapping> oldMapping) { initializeFromXmlRelationshipMapping(oldMapping); } - public void initializeFromXmlOneToManyMapping(XmlOneToManyMapping oldMapping) { + public void initializeFromXmlOneToManyMapping(GenericOrmOneToManyMapping oldMapping) { initializeFromXmlNonOwningMapping(oldMapping); initializeFromXmlMulitRelationshipMapping(oldMapping); } - public void initializeFromXmlManyToOneMapping(XmlManyToOneMapping oldMapping) { + public void initializeFromXmlManyToOneMapping(GenericOrmManyToOneMapping oldMapping) { initializeFromXmlSingleRelationshipMapping(oldMapping); } - public void initializeFromXmlOneToOneMapping(XmlOneToOneMapping oldMapping) { + public void initializeFromXmlOneToOneMapping(GenericOrmOneToOneMapping oldMapping) { initializeFromXmlNonOwningMapping(oldMapping); initializeFromXmlSingleRelationshipMapping(oldMapping); } - public void initializeFromXmlManyToManyMapping(XmlManyToManyMapping oldMapping) { + public void initializeFromXmlManyToManyMapping(GenericOrmManyToManyMapping oldMapping) { initializeFromXmlNonOwningMapping(oldMapping); initializeFromXmlMulitRelationshipMapping(oldMapping); } @@ -172,7 +174,7 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp return null; } - public XmlTypeMapping<?> typeMapping() { + public OrmTypeMapping<?> typeMapping() { return this.persistentAttribute().typeMapping(); } @@ -197,9 +199,9 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp public boolean isIdMapping() { return false; } - public abstract void removeFromResourceModel(org.eclipse.jpt.core.internal.resource.orm.TypeMapping typeMapping); + public abstract void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.AbstractTypeMapping typeMapping); - public abstract T addToResourceModel(org.eclipse.jpt.core.internal.resource.orm.TypeMapping typeMapping); + public abstract T addToResourceModel(org.eclipse.jpt.core.resource.orm.AbstractTypeMapping typeMapping); protected T attributeMapping() { return this.attributeMapping; @@ -217,8 +219,8 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp this.setJavaPersistentAttribute(javaPersistentAttribute()); } - protected IJavaPersistentAttribute javaPersistentAttribute() { - IJavaPersistentType javaPersistentType = persistentAttribute().persistentType().javaPersistentType(); + protected JavaPersistentAttribute javaPersistentAttribute() { + JavaPersistentType javaPersistentType = persistentAttribute().persistentType().javaPersistentType(); if (javaPersistentType != null && getName() != null) { return javaPersistentType.attributeNamed(getName()); } @@ -229,7 +231,7 @@ public abstract class XmlAttributeMapping<T extends AttributeMapping> extends Jp return attributeMapping.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return attributeMapping.selectionTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmColumn.java index c43f020826..252db2dbc1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmColumn.java @@ -10,14 +10,14 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.AbstractColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAbstractColumn; -public abstract class AbstractXmlColumn<T extends AbstractColumn> extends AbstractXmlNamedColumn<T> - implements IAbstractColumn +public abstract class AbstractOrmColumn<T extends XmlAbstractColumn> extends AbstractOrmNamedColumn<T> + implements AbstractColumn { protected String specifiedTable; @@ -31,11 +31,11 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra protected Boolean specifiedUpdatable; - protected AbstractXmlColumn(IJpaContextNode parent, IAbstractColumn.Owner owner) { + protected AbstractOrmColumn(JpaContextNode parent, AbstractColumn.Owner owner) { super(parent, owner); } - public void initializeFrom(IAbstractColumn oldColumn) { + public void initializeFrom(AbstractColumn oldColumn) { super.initializeFrom(oldColumn); setSpecifiedTable(oldColumn.getSpecifiedTable()); setSpecifiedUnique(oldColumn.getSpecifiedUnique()); @@ -45,8 +45,8 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra } @Override - public IAbstractColumn.Owner owner() { - return (IAbstractColumn.Owner) super.owner(); + public AbstractColumn.Owner owner() { + return (AbstractColumn.Owner) super.owner(); } // @Override @@ -79,13 +79,13 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra columnResource().setTable(newSpecifiedTable); } } - firePropertyChanged(IAbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); + firePropertyChanged(AbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); } protected void setSpecifiedTable_(String newSpecifiedTable) { String oldSpecifiedTable = this.specifiedTable; this.specifiedTable = newSpecifiedTable; - firePropertyChanged(IAbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); + firePropertyChanged(AbstractColumn.SPECIFIED_TABLE_PROPERTY, oldSpecifiedTable, newSpecifiedTable); } public String getDefaultTable() { @@ -95,7 +95,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra protected void setDefaultTable(String newDefaultTable) { String oldDefaultTable = this.defaultTable; this.defaultTable = newDefaultTable; - firePropertyChanged(IAbstractColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable); + firePropertyChanged(AbstractColumn.DEFAULT_TABLE_PROPERTY, oldDefaultTable, newDefaultTable); } public Boolean getUnique() { @@ -103,7 +103,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra } public Boolean getDefaultUnique() { - return IAbstractColumn.DEFAULT_UNIQUE; + return AbstractColumn.DEFAULT_UNIQUE; } public Boolean getSpecifiedUnique() { @@ -125,13 +125,13 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra columnResource().setUnique(newSpecifiedUnique); } } - firePropertyChanged(IAbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); + firePropertyChanged(AbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); } protected void setSpecifiedUnique_(Boolean newSpecifiedUnique) { Boolean oldSpecifiedUnique = this.specifiedUnique; this.specifiedUnique = newSpecifiedUnique; - firePropertyChanged(IAbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); + firePropertyChanged(AbstractColumn.SPECIFIED_UNIQUE_PROPERTY, oldSpecifiedUnique, newSpecifiedUnique); } public Boolean getNullable() { @@ -139,7 +139,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra } public Boolean getDefaultNullable() { - return IAbstractColumn.DEFAULT_NULLABLE; + return AbstractColumn.DEFAULT_NULLABLE; } public Boolean getSpecifiedNullable() { @@ -161,13 +161,13 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra columnResource().setNullable(newSpecifiedNullable); } } - firePropertyChanged(IAbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); + firePropertyChanged(AbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); } protected void setSpecifiedNullable_(Boolean newSpecifiedNullable) { Boolean oldSpecifiedNullable = this.specifiedNullable; this.specifiedNullable = newSpecifiedNullable; - firePropertyChanged(IAbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); + firePropertyChanged(AbstractColumn.SPECIFIED_NULLABLE_PROPERTY, oldSpecifiedNullable, newSpecifiedNullable); } public Boolean getInsertable() { @@ -175,7 +175,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra } public Boolean getDefaultInsertable() { - return IAbstractColumn.DEFAULT_INSERTABLE; + return AbstractColumn.DEFAULT_INSERTABLE; } public Boolean getSpecifiedInsertable() { @@ -197,13 +197,13 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra columnResource().setInsertable(newSpecifiedInsertable); } } - firePropertyChanged(IAbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); + firePropertyChanged(AbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); } protected void setSpecifiedInsertable_(Boolean newSpecifiedInsertable) { Boolean oldSpecifiedInsertable = this.specifiedInsertable; this.specifiedInsertable = newSpecifiedInsertable; - firePropertyChanged(IAbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); + firePropertyChanged(AbstractColumn.SPECIFIED_INSERTABLE_PROPERTY, oldSpecifiedInsertable, newSpecifiedInsertable); } public Boolean getUpdatable() { @@ -211,7 +211,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra } public Boolean getDefaultUpdatable() { - return IAbstractColumn.DEFAULT_UPDATABLE; + return AbstractColumn.DEFAULT_UPDATABLE; } public Boolean getSpecifiedUpdatable() { @@ -233,13 +233,13 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra columnResource().setUpdatable(newSpecifiedUpdatable); } } - firePropertyChanged(IAbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); + firePropertyChanged(AbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); } protected void setSpecifiedUpdatable_(Boolean newSpecifiedUpdatable) { Boolean oldSpecifiedUpdatable = this.specifiedUpdatable; this.specifiedUpdatable = newSpecifiedUpdatable; - firePropertyChanged(IAbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); + firePropertyChanged(AbstractColumn.SPECIFIED_UPDATABLE_PROPERTY, oldSpecifiedUpdatable, newSpecifiedUpdatable); } @Override @@ -247,7 +247,7 @@ public abstract class AbstractXmlColumn<T extends AbstractColumn> extends Abstra return this.getTable(); } - public ITextRange tableTextRange(CompilationUnit astRoot) { + public TextRange tableTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java index 411bf079b7..d9d1d1fd45 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.IGenerator; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.Generator; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlGenerator; -public abstract class XmlGenerator<T extends Generator> extends JpaContextNode implements IGenerator +public abstract class AbstractOrmGenerator<T extends XmlGenerator> extends AbstractJpaContextNode implements Generator { protected String name; @@ -28,7 +28,7 @@ public abstract class XmlGenerator<T extends Generator> extends JpaContextNode i protected T generatorResource; - protected XmlGenerator(IJpaContextNode parent) { + protected AbstractOrmGenerator(JpaContextNode parent) { super(parent); } @@ -132,15 +132,15 @@ public abstract class XmlGenerator<T extends Generator> extends JpaContextNode i return this.generatorResource; } - protected String name(Generator generatorResource) { + protected String name(XmlGenerator generatorResource) { return generatorResource.getName(); } - protected Integer specifiedInitialValue(Generator generatorResource) { + protected Integer specifiedInitialValue(XmlGenerator generatorResource) { return generatorResource.getInitialValue(); } - protected Integer specifiedAllocationSize(Generator generatorResource) { + protected Integer specifiedAllocationSize(XmlGenerator generatorResource) { return generatorResource.getAllocationSize(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index b5b74a1180..4a34b838ea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -10,18 +10,18 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IMultiRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.orm.MapKey; -import org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.MultiRelationshipMapping; +import org.eclipse.jpt.core.resource.orm.MapKey; +import org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping; +import org.eclipse.jpt.core.resource.orm.OrmFactory; -public abstract class XmlMultiRelationshipMapping<T extends MultiRelationshipMapping> - extends XmlRelationshipMapping<T> - implements IMultiRelationshipMapping +public abstract class AbstractOrmMultiRelationshipMapping<T extends XmlMultiRelationshipMapping> + extends AbstractOrmRelationshipMapping<T> + implements MultiRelationshipMapping { protected String mappedBy; @@ -34,17 +34,17 @@ public abstract class XmlMultiRelationshipMapping<T extends MultiRelationshipMap protected boolean isCustomOrdering; - protected final XmlJoinTable joinTable; + protected final GenericOrmJoinTable joinTable; protected String mapKey; - protected XmlMultiRelationshipMapping(XmlPersistentAttribute parent) { + protected AbstractOrmMultiRelationshipMapping(OrmPersistentAttribute parent) { super(parent); - this.joinTable = new XmlJoinTable(this); + this.joinTable = new GenericOrmJoinTable(this); } @Override - public void initializeFromXmlMulitRelationshipMapping(XmlMultiRelationshipMapping<? extends MultiRelationshipMapping> oldMapping) { + public void initializeFromXmlMulitRelationshipMapping(AbstractOrmMultiRelationshipMapping<? extends XmlMultiRelationshipMapping> oldMapping) { super.initializeFromXmlMulitRelationshipMapping(oldMapping); getJoinTable().initializeFrom(oldMapping.getJoinTable()); } @@ -54,7 +54,7 @@ public abstract class XmlMultiRelationshipMapping<T extends MultiRelationshipMap } public FetchType getDefaultFetch() { - return IMultiRelationshipMapping.DEFAULT_FETCH_TYPE; + return MultiRelationshipMapping.DEFAULT_FETCH_TYPE; } public String getMappedBy() { @@ -156,7 +156,7 @@ public abstract class XmlMultiRelationshipMapping<T extends MultiRelationshipMap // return (mappedByNode == null) ? validationTextRange() : buildTextRange(mappedByNode); // } - public XmlJoinTable getJoinTable() { + public GenericOrmJoinTable getJoinTable() { return this.joinTable; } @@ -241,12 +241,12 @@ public abstract class XmlMultiRelationshipMapping<T extends MultiRelationshipMap // return JavaMultiRelationshipMapping.javaDefaultTargetEntityFromContainer(typeBinding); // } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { // TODO Auto-generated method stub return false; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java index 0af7e5617e..864dc784cc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java @@ -10,17 +10,17 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.NamedColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlNamedColumn; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; -public abstract class AbstractXmlNamedColumn<T extends NamedColumn> extends JpaContextNode - implements INamedColumn +public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends AbstractJpaContextNode + implements NamedColumn { protected Owner owner; @@ -30,12 +30,12 @@ public abstract class AbstractXmlNamedColumn<T extends NamedColumn> extends Jpa protected String columnDefinition; - protected AbstractXmlNamedColumn(IJpaContextNode parent, Owner owner) { + protected AbstractOrmNamedColumn(JpaContextNode parent, Owner owner) { super(parent); this.owner = owner; } - public void initializeFrom(INamedColumn oldColumn) { + public void initializeFrom(NamedColumn oldColumn) { setSpecifiedName(oldColumn.getSpecifiedName()); setColumnDefinition(oldColumn.getColumnDefinition()); } @@ -143,7 +143,7 @@ public abstract class AbstractXmlNamedColumn<T extends NamedColumn> extends Jpa return dbColumn() != null; } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java index 8620080cf9..e67b236cfc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java @@ -12,30 +12,30 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IQuery; -import org.eclipse.jpt.core.internal.context.base.IQueryHint; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.Query; -import org.eclipse.jpt.core.internal.resource.orm.QueryHint; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.Query; +import org.eclipse.jpt.core.context.QueryHint; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlQuery; +import org.eclipse.jpt.core.resource.orm.XmlQueryHint; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public abstract class AbstractXmlQuery<E extends Query> extends JpaContextNode implements IQuery +public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractJpaContextNode implements Query { protected String name; protected String query; - protected final List<XmlQueryHint> hints; + protected final List<GenericOrmQueryHint> hints; protected E queryResource; - protected AbstractXmlQuery(IJpaContextNode parent) { + protected AbstractOrmQuery(JpaContextNode parent) { super(parent); - this.hints = new ArrayList<XmlQueryHint>(); + this.hints = new ArrayList<GenericOrmQueryHint>(); } protected E queryResource() { @@ -50,7 +50,7 @@ public abstract class AbstractXmlQuery<E extends Query> extends JpaContextNode i String oldName = this.name; this.name = newName; this.queryResource().setName(newName); - firePropertyChanged(IQuery.NAME_PROPERTY, oldName, newName); + firePropertyChanged(Query.NAME_PROPERTY, oldName, newName); } public String getQuery() { @@ -61,47 +61,47 @@ public abstract class AbstractXmlQuery<E extends Query> extends JpaContextNode i String oldQuery = this.query; this.query = newQuery; this.queryResource().setQuery(newQuery); - firePropertyChanged(IQuery.QUERY_PROPERTY, oldQuery, newQuery); + firePropertyChanged(Query.QUERY_PROPERTY, oldQuery, newQuery); } @SuppressWarnings("unchecked") - public ListIterator<XmlQueryHint> hints() { - return new CloneListIterator<XmlQueryHint>(this.hints); + public ListIterator<GenericOrmQueryHint> hints() { + return new CloneListIterator<GenericOrmQueryHint>(this.hints); } public int hintsSize() { return this.hints.size(); } - public XmlQueryHint addHint(int index) { - XmlQueryHint queryHint = new XmlQueryHint(this); + public GenericOrmQueryHint addHint(int index) { + GenericOrmQueryHint queryHint = new GenericOrmQueryHint(this); this.hints.add(index, queryHint); this.queryResource().getHints().add(index, OrmFactory.eINSTANCE.createQueryHint()); - this.fireItemAdded(IQuery.HINTS_LIST, index, queryHint); + this.fireItemAdded(Query.HINTS_LIST, index, queryHint); return queryHint; } - protected void addHint(int index, XmlQueryHint queryHint) { - addItemToList(index, queryHint, this.hints, IQuery.HINTS_LIST); + protected void addHint(int index, GenericOrmQueryHint queryHint) { + addItemToList(index, queryHint, this.hints, Query.HINTS_LIST); } - public void removeHint(IQueryHint queryHint) { + public void removeHint(QueryHint queryHint) { removeHint(this.hints.indexOf(queryHint)); } public void removeHint(int index) { - XmlQueryHint queryHint = this.hints.remove(index); + GenericOrmQueryHint queryHint = this.hints.remove(index); this.queryResource.getHints().remove(index); - fireItemRemoved(IQuery.HINTS_LIST, index, queryHint); + fireItemRemoved(Query.HINTS_LIST, index, queryHint); } - protected void removeHint_(XmlQueryHint queryHint) { - removeItemFromList(queryHint, this.hints, IQuery.HINTS_LIST); + protected void removeHint_(GenericOrmQueryHint queryHint) { + removeItemFromList(queryHint, this.hints, Query.HINTS_LIST); } public void moveHint(int targetIndex, int sourceIndex) { this.queryResource.getHints().move(targetIndex, sourceIndex); - moveItemInList(targetIndex, sourceIndex, this.hints, IQuery.HINTS_LIST); + moveItemInList(targetIndex, sourceIndex, this.hints, Query.HINTS_LIST); } @@ -114,13 +114,13 @@ public abstract class AbstractXmlQuery<E extends Query> extends JpaContextNode i } protected void initializeHints(E queryResource) { - for (QueryHint queryhint : queryResource.getHints()) { + for (XmlQueryHint queryhint : queryResource.getHints()) { this.hints.add(createHint(queryhint)); } } - protected XmlQueryHint createHint(QueryHint queryhint) { - XmlQueryHint xmlQueryHint = new XmlQueryHint(this); + protected GenericOrmQueryHint createHint(XmlQueryHint queryhint) { + GenericOrmQueryHint xmlQueryHint = new GenericOrmQueryHint(this); xmlQueryHint.initialize(queryhint); return xmlQueryHint; } @@ -133,11 +133,11 @@ public abstract class AbstractXmlQuery<E extends Query> extends JpaContextNode i } protected void updateHints(E queryResource) { - ListIterator<XmlQueryHint> hints = hints(); - ListIterator<QueryHint> resourceHints = queryResource.getHints().listIterator(); + ListIterator<GenericOrmQueryHint> hints = hints(); + ListIterator<XmlQueryHint> resourceHints = queryResource.getHints().listIterator(); while (hints.hasNext()) { - XmlQueryHint hint = hints.next(); + GenericOrmQueryHint hint = hints.next(); if (resourceHints.hasNext()) { hint.update(resourceHints.next()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java index d4af6590dc..ac6d5ddd14 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -10,32 +10,32 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.Iterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -public abstract class XmlRelationshipMapping<T extends RelationshipMapping> extends XmlAttributeMapping<T> - implements IRelationshipMapping +public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMapping> extends AbstractOrmAttributeMapping<T> + implements RelationshipMapping { protected String specifiedTargetEntity; protected String defaultTargetEntity; - protected IEntity resolvedTargetEntity; + protected Entity resolvedTargetEntity; protected FetchType specifiedFetch; - protected final XmlCascade cascade; + protected final OrmCascade cascade; - protected XmlRelationshipMapping(XmlPersistentAttribute parent) { + protected AbstractOrmRelationshipMapping(OrmPersistentAttribute parent) { super(parent); - this.cascade = new XmlCascade(this); + this.cascade = new OrmCascade(this); } public String getTargetEntity() { @@ -69,12 +69,12 @@ public abstract class XmlRelationshipMapping<T extends RelationshipMapping> exte firePropertyChanged(DEFAULT_TARGET_ENTITY_PROPERTY, oldDefaultTargetEntity, newDefaultTargetEntity); } - public IEntity getResolvedTargetEntity() { + public Entity getResolvedTargetEntity() { return this.resolvedTargetEntity; } - protected void setResolvedTargetEntity(IEntity newResolvedTargetEntity) { - IEntity oldResolvedTargetEntity = this.resolvedTargetEntity; + protected void setResolvedTargetEntity(Entity newResolvedTargetEntity) { + Entity oldResolvedTargetEntity = this.resolvedTargetEntity; this.resolvedTargetEntity = newResolvedTargetEntity; firePropertyChanged(RESOLVED_TARGET_ENTITY_PROPERTY, oldResolvedTargetEntity, newResolvedTargetEntity); } @@ -91,22 +91,22 @@ public abstract class XmlRelationshipMapping<T extends RelationshipMapping> exte FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; this.attributeMapping().setFetch(FetchType.toOrmResourceModel(newSpecifiedFetch)); - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) { FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } - public XmlCascade getCascade() { + public OrmCascade getCascade() { return this.cascade; } @Override - public void initializeFromXmlRelationshipMapping(XmlRelationshipMapping<? extends RelationshipMapping> oldMapping) { + public void initializeFromXmlRelationshipMapping(AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> oldMapping) { super.initializeFromXmlRelationshipMapping(oldMapping); setSpecifiedTargetEntity(oldMapping.getSpecifiedTargetEntity()); setSpecifiedFetch(oldMapping.getSpecifiedFetch()); @@ -146,7 +146,7 @@ public abstract class XmlRelationshipMapping<T extends RelationshipMapping> exte // } public Iterator<String> allTargetEntityAttributeNames() { - IEntity targetEntity = this.getResolvedTargetEntity(); + Entity targetEntity = this.getResolvedTargetEntity(); return (targetEntity == null) ? EmptyIterator.<String> instance() : targetEntity.persistentType().allAttributeNames(); } @@ -196,7 +196,7 @@ public abstract class XmlRelationshipMapping<T extends RelationshipMapping> exte return null; } - public IEntity getEntity() { + public Entity getEntity() { // TODO Auto-generated method stub return null; } @@ -224,7 +224,7 @@ public abstract class XmlRelationshipMapping<T extends RelationshipMapping> exte this.cascade.update(relationshipMapping); } - protected FetchType specifiedFetch(RelationshipMapping relationshipMapping) { + protected FetchType specifiedFetch(XmlRelationshipMapping relationshipMapping) { return FetchType.fromOrmResourceModel(relationshipMapping.getFetch()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java index 0bf2e4ccc5..3f160258a6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java @@ -12,59 +12,59 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ISingleRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.SingleRelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipMapping> - extends XmlRelationshipMapping<T> implements ISingleRelationshipMapping +public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRelationshipMapping> + extends AbstractOrmRelationshipMapping<T> implements SingleRelationshipMapping { - protected final List<XmlJoinColumn> specifiedJoinColumns; + protected final List<GenericOrmJoinColumn> specifiedJoinColumns; - protected final List<XmlJoinColumn> defaultJoinColumns; + protected final List<GenericOrmJoinColumn> defaultJoinColumns; protected Boolean specifiedOptional; - protected XmlSingleRelationshipMapping(XmlPersistentAttribute parent) { + protected AbstractOrmSingleRelationshipMapping(OrmPersistentAttribute parent) { super(parent); - this.specifiedJoinColumns = new ArrayList<XmlJoinColumn>(); - this.defaultJoinColumns = new ArrayList<XmlJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<GenericOrmJoinColumn>(); + this.defaultJoinColumns = new ArrayList<GenericOrmJoinColumn>(); //this.getDefaultJoinColumns().add(this.createJoinColumn(new JoinColumnOwner(this))); } @Override - public void initializeFromXmlSingleRelationshipMapping(XmlSingleRelationshipMapping<? extends SingleRelationshipMapping> oldMapping) { + public void initializeFromXmlSingleRelationshipMapping(AbstractOrmSingleRelationshipMapping<? extends XmlSingleRelationshipMapping> oldMapping) { super.initializeFromXmlSingleRelationshipMapping(oldMapping); int index = 0; - for (IJoinColumn joinColumn : CollectionTools.iterable(oldMapping.specifiedJoinColumns())) { - XmlJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++); + for (JoinColumn joinColumn : CollectionTools.iterable(oldMapping.specifiedJoinColumns())) { + GenericOrmJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++); newJoinColumn.initializeFrom(joinColumn); } } public FetchType getDefaultFetch() { - return ISingleRelationshipMapping.DEFAULT_FETCH_TYPE; + return SingleRelationshipMapping.DEFAULT_FETCH_TYPE; } //***************** ISingleRelationshipMapping implementation ***************** @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> joinColumns() { + public ListIterator<GenericOrmJoinColumn> joinColumns() { return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns(); } @@ -72,15 +72,15 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize(); } - public IJoinColumn getDefaultJoinColumn() { + public JoinColumn getDefaultJoinColumn() { // TODO Auto-generated method stub return null; } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> defaultJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.defaultJoinColumns); + public ListIterator<GenericOrmJoinColumn> defaultJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.defaultJoinColumns); } public int defaultJoinColumnsSize() { @@ -88,8 +88,8 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.specifiedJoinColumns); + public ListIterator<GenericOrmJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { @@ -100,36 +100,36 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM return !this.specifiedJoinColumns.isEmpty(); } - public XmlJoinColumn addSpecifiedJoinColumn(int index) { - XmlJoinColumn joinColumn = new XmlJoinColumn(this, new JoinColumnOwner()); + public GenericOrmJoinColumn addSpecifiedJoinColumn(int index) { + GenericOrmJoinColumn joinColumn = new GenericOrmJoinColumn(this, new JoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); this.attributeMapping().getJoinColumns().add(index, OrmFactory.eINSTANCE.createJoinColumnImpl()); - this.fireItemAdded(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } - protected void addSpecifiedJoinColumn(int index, XmlJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, GenericOrmJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); } - public void removeSpecifiedJoinColumn(IJoinColumn joinColumn) { + public void removeSpecifiedJoinColumn(JoinColumn joinColumn) { this.removeSpecifiedJoinColumn(this.specifiedJoinColumns.indexOf(joinColumn)); } public void removeSpecifiedJoinColumn(int index) { - XmlJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + GenericOrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); this.attributeMapping().getJoinColumns().remove(index); - fireItemRemoved(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); } - protected void removeSpecifiedJoinColumn_(XmlJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn_(GenericOrmJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex); this.attributeMapping().getJoinColumns().move(targetIndex, sourceIndex); - fireItemMoved(ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } public Boolean getOptional() { @@ -137,7 +137,7 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM } public Boolean getDefaultOptional() { - return INullable.DEFAULT_OPTIONAL; + return Nullable.DEFAULT_OPTIONAL; } public Boolean getSpecifiedOptional() { @@ -148,13 +148,13 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM Boolean oldSpecifiedOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; attributeMapping().setOptional(newSpecifiedOptional); - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); } protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) { Boolean oldSpecifiedOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldSpecifiedOptional, newSpecifiedOptional); } // // public boolean containsSpecifiedJoinColumns() { @@ -173,13 +173,13 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM if (singleRelationshipMapping == null) { return; } - for (JoinColumn joinColumn : singleRelationshipMapping.getJoinColumns()) { + for (XmlJoinColumn joinColumn : singleRelationshipMapping.getJoinColumns()) { this.specifiedJoinColumns.add(createJoinColumn(joinColumn)); } } - protected XmlJoinColumn createJoinColumn(JoinColumn joinColumn) { - XmlJoinColumn xmlJoinColumn = new XmlJoinColumn(this, new JoinColumnOwner()); + protected GenericOrmJoinColumn createJoinColumn(XmlJoinColumn joinColumn) { + GenericOrmJoinColumn xmlJoinColumn = new GenericOrmJoinColumn(this, new JoinColumnOwner()); xmlJoinColumn.initialize(joinColumn); return xmlJoinColumn; } @@ -192,14 +192,14 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM } protected void updateSpecifiedJoinColumns(T singleRelationshipMapping) { - ListIterator<XmlJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = EmptyListIterator.instance(); + ListIterator<GenericOrmJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<XmlJoinColumn> resourceJoinColumns = EmptyListIterator.instance(); if (singleRelationshipMapping != null) { resourceJoinColumns = singleRelationshipMapping.getJoinColumns().listIterator(); } while (joinColumns.hasNext()) { - XmlJoinColumn joinColumn = joinColumns.next(); + GenericOrmJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -214,7 +214,7 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM } - public class JoinColumnOwner implements IJoinColumn.Owner + public class JoinColumnOwner implements JoinColumn.Owner { public JoinColumnOwner() { @@ -225,23 +225,23 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return XmlSingleRelationshipMapping.this.typeMapping().tableName(); + return AbstractOrmSingleRelationshipMapping.this.typeMapping().tableName(); } - public IEntity targetEntity() { - return XmlSingleRelationshipMapping.this.getResolvedTargetEntity(); + public Entity targetEntity() { + return AbstractOrmSingleRelationshipMapping.this.getResolvedTargetEntity(); } public String attributeName() { - return XmlSingleRelationshipMapping.this.getName(); + return AbstractOrmSingleRelationshipMapping.this.getName(); } - public IRelationshipMapping relationshipMapping() { - return XmlSingleRelationshipMapping.this; + public RelationshipMapping relationshipMapping() { + return AbstractOrmSingleRelationshipMapping.this; } public boolean tableNameIsInvalid(String tableName) { - return XmlSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); + return AbstractOrmSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); } /** @@ -251,8 +251,8 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM return true; } - public ITypeMapping typeMapping() { - return XmlSingleRelationshipMapping.this.typeMapping(); + public TypeMapping typeMapping() { + return AbstractOrmSingleRelationshipMapping.this.typeMapping(); } public Table dbTable(String tableName) { @@ -260,12 +260,12 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM } public Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlSingleRelationshipMapping.this.defaultJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return AbstractOrmSingleRelationshipMapping.this.defaultJoinColumns.contains(joinColumn); } public String defaultColumnName() { @@ -273,13 +273,13 @@ public abstract class XmlSingleRelationshipMapping<T extends SingleRelationshipM return null; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } public int joinColumnsSize() { - return XmlSingleRelationshipMapping.this.joinColumnsSize(); + return AbstractOrmSingleRelationshipMapping.this.joinColumnsSize(); } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java index 9db0b3bf43..0eb3e6a880 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractXmlTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java @@ -10,16 +10,15 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.AbstractTable; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAbstractTable; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.NameTools; -public abstract class AbstractXmlTable extends JpaContextNode implements ITable +public abstract class AbstractOrmTable extends AbstractJpaContextNode implements Table { protected String specifiedName; @@ -35,11 +34,11 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable // protected EList<IUniqueConstraint> uniqueConstraints; - protected AbstractXmlTable(IJpaContextNode parent) { + protected AbstractOrmTable(JpaContextNode parent) { super(parent); } - public void initializeFrom(ITable oldTable) { + public void initializeFrom(Table oldTable) { setSpecifiedName(oldTable.getSpecifiedName()); setSpecifiedCatalog(oldTable.getSpecifiedCatalog()); setSpecifiedSchema(oldTable.getSpecifiedSchema()); @@ -54,7 +53,7 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable return this.specifiedName; } - protected abstract AbstractTable table(); + protected abstract XmlAbstractTable table(); protected abstract void removeTableResource(); @@ -187,17 +186,17 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable // } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITextRange catalogTextRange(CompilationUnit astRoot) { + public TextRange catalogTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITextRange schemaTextRange(CompilationUnit astRoot) { + public TextRange schemaTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @@ -227,7 +226,7 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable // return owner; // } - public Table dbTable() { + public org.eclipse.jpt.db.internal.Table dbTable() { Schema schema = this.dbSchema(); return (schema == null) ? null : schema.tableNamed(getName()); } @@ -252,7 +251,7 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable // return OrmFactory.eINSTANCE.createXmlUniqueConstraint(); // } - protected void initialize(AbstractTable table) { + protected void initialize(XmlAbstractTable table) { this.specifiedName = this.specifiedName(table); this.specifiedSchema = this.specifiedSchema(table); this.specifiedCatalog = this.specifiedCatalog(table); @@ -261,7 +260,7 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable this.defaultCatalog = this.defaultCatalog(); } - protected void update(AbstractTable table) { + protected void update(XmlAbstractTable table) { this.setSpecifiedName_(this.specifiedName(table)); this.setSpecifiedSchema_(this.specifiedSchema(table)); this.setSpecifiedCatalog_(this.specifiedCatalog(table)); @@ -270,15 +269,15 @@ public abstract class AbstractXmlTable extends JpaContextNode implements ITable this.setDefaultCatalog(this.defaultCatalog()); } - protected String specifiedName(AbstractTable table) { + protected String specifiedName(XmlAbstractTable table) { return table == null ? null : table.getName(); } - protected String specifiedSchema(AbstractTable table) { + protected String specifiedSchema(XmlAbstractTable table) { return table == null ? null : table.getSchema(); } - protected String specifiedCatalog(AbstractTable table) { + protected String specifiedCatalog(XmlAbstractTable table) { return table == null ? null : table.getCatalog(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java index 271a71dfea..e75de07469 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -10,43 +10,40 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNode implements ITypeMapping +public abstract class AbstractOrmTypeMapping<E extends AbstractTypeMapping> extends AbstractJpaContextNode implements OrmTypeMapping<E> { protected String class_; - public static final String CLASS_PROPERTY = "classProperty"; - protected AccessType defaultAccess; - public static final String DEFAULT_ACCESS_PROPERTY = "defaultAccessProperty"; + public AccessType defaultAccess; protected AccessType specifiedAccess; - public static final String SPECIFIED_ACCESS_PROPERTY = "specifiedAccessProperty"; - protected boolean defaultMetadataComplete; - public static final String DEFAULT_METADATA_COMPLETE_PROPERTY = "defaultMetadataCompleteProperty"; + public boolean defaultMetadataComplete; protected Boolean specifiedMetadataComplete; - public static final String SPECIFIED_METADATA_COMPLETE_PROPERTY = "specifiedMetadataCompleteProperty"; - protected IJavaPersistentType javaPersistentType; - public static final String JAVA_PERSISTENT_TYPE_PROPERTY = "javaPersistentTypeProperty"; + protected JavaPersistentType javaPersistentType; protected E typeMapping; - protected XmlTypeMapping(XmlPersistentType parent) { + protected AbstractOrmTypeMapping(OrmPersistentType parent) { super(parent); } @@ -99,7 +96,7 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo if (isDefaultMetadataComplete()) { //entity-mappings/persistence-unit-metadata/xml-mapping-metadata-complete is specified, then it overrides //anything set here - return Boolean.TRUE; + return true; } return (this.getSpecifiedMetadataComplete() == null) ? this.isDefaultMetadataComplete() : this.getSpecifiedMetadataComplete(); } @@ -125,8 +122,8 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo firePropertyChanged(SPECIFIED_METADATA_COMPLETE_PROPERTY, oldMetadataComplete, newSpecifiedMetadataComplete); } - public XmlPersistentType persistentType() { - return (XmlPersistentType) parent(); + public OrmPersistentType persistentType() { + return (OrmPersistentType) parent(); } /** @@ -135,7 +132,7 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo * fromthe old ITypeMapping (oldMapping) * @param oldMapping */ - public void initializeFrom(XmlTypeMapping<? extends TypeMapping> oldMapping) { + public void initializeFrom(OrmTypeMapping<? extends AbstractTypeMapping> oldMapping) { this.setClass(oldMapping.getClass_()); this.setSpecifiedAccess(oldMapping.getSpecifiedAccess()); this.setSpecifiedMetadataComplete(oldMapping.getSpecifiedMetadataComplete()); @@ -172,19 +169,7 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo // } /** - * type mappings are a sequence in the orm schema. We must keep - * the list of type mappings in the appropriate order so the wtp xml - * translators will write them to the xml in that order and they - * will adhere to the schema. - * - * Each concrete subclass of XmlTypeMapping must implement this - * method and return an int that matches it's order in the schema - * @return - */ - public abstract int xmlSequence(); - - /** - * @see ITypeMapping#attributeMappingKeyAllowed(String) + * @see TypeMapping#attributeMappingKeyAllowed(String) * * Default implementation: override where needed */ @@ -208,7 +193,7 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo return EmptyIterator.instance(); } - protected E typeMappingResource() { + public E typeMappingResource() { return this.typeMapping; } @@ -234,25 +219,25 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo return entityMappings().getAccess(); } - protected IJavaPersistentType getJavaPersistentType() { + public JavaPersistentType getJavaPersistentType() { return this.javaPersistentType; } - protected void setJavaPersistentType(IJavaPersistentType newJavaPersistentType) { - IJavaPersistentType oldJavaPersistentType = this.javaPersistentType; + protected void setJavaPersistentType(JavaPersistentType newJavaPersistentType) { + JavaPersistentType oldJavaPersistentType = this.javaPersistentType; this.javaPersistentType = newJavaPersistentType; firePropertyChanged(JAVA_PERSISTENT_TYPE_PROPERTY, oldJavaPersistentType, newJavaPersistentType); } protected void initializeJavaPersistentType() { - JavaPersistentTypeResource persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); + JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); if (persistentTypeResource != null) { this.javaPersistentType = createJavaPersistentType(persistentTypeResource); } } protected void updateJavaPersistentType() { - JavaPersistentTypeResource persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); + JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); if (persistentTypeResource == null) { setJavaPersistentType(null); } @@ -266,8 +251,8 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo } } - protected IJavaPersistentType createJavaPersistentType(JavaPersistentTypeResource persistentTypeResource) { - IJavaPersistentType javaPersistentType = jpaFactory().createJavaPersistentType(this); + protected JavaPersistentType createJavaPersistentType(JavaResourcePersistentType persistentTypeResource) { + JavaPersistentType javaPersistentType = jpaFactory().buildJavaPersistentType(this); javaPersistentType.initializeFromResource(persistentTypeResource); return javaPersistentType; } @@ -292,26 +277,22 @@ public abstract class XmlTypeMapping<E extends TypeMapping> extends JpaContextNo this.setDefaultAccess(this.defaultAccess()); } - protected Boolean metadataComplete(TypeMapping typeMapping) { + protected Boolean metadataComplete(AbstractTypeMapping typeMapping) { return typeMapping.getMetadataComplete(); } - public abstract void removeFromResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); - - public abstract E addToResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings); - // ************************************************************************* - public IJpaStructureNode structureNode(int offset) { + public JpaStructureNode structureNode(int offset) { if (this.typeMapping.containsOffset(offset)) { return persistentType(); } return null; } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return this.typeMapping.selectionTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/EntityMappingsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java index 8ce84610eb..f70ea5777d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/EntityMappingsImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java @@ -13,29 +13,36 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; -import org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedQuery; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator; -import org.eclipse.jpt.core.internal.resource.orm.TableGenerator; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmStructureNodes; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddable; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass; +import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery; +import org.eclipse.jpt.core.resource.orm.XmlNamedQuery; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator; +import org.eclipse.jpt.core.resource.orm.XmlTableGenerator; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class EntityMappingsImpl extends JpaContextNode implements EntityMappings +public class GenericEntityMappings extends AbstractJpaContextNode implements EntityMappings { - protected org.eclipse.jpt.core.internal.resource.orm.EntityMappings xmlEntityMappings; + protected org.eclipse.jpt.core.resource.orm.EntityMappings xmlEntityMappings; protected String version; @@ -57,29 +64,29 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings protected final PersistenceUnitMetadata persistenceUnitMetadata; - protected final List<XmlPersistentType> persistentTypes; + protected final List<OrmPersistentType> persistentTypes; - protected final List<XmlSequenceGenerator> sequenceGenerators; + protected final List<GenericOrmSequenceGenerator> sequenceGenerators; - protected final List<XmlTableGenerator> tableGenerators; + protected final List<GenericOrmTableGenerator> tableGenerators; - protected final List<XmlNamedQuery> namedQueries; + protected final List<GenericOrmNamedQuery> namedQueries; - protected final List<XmlNamedNativeQuery> namedNativeQueries; + protected final List<GenericOrmNamedNativeQuery> namedNativeQueries; - public EntityMappingsImpl(OrmXml parent) { + public GenericEntityMappings(OrmXml parent) { super(parent); - this.persistenceUnitMetadata = jpaFactory().createPersistenceUnitMetadata(this); - this.persistentTypes = new ArrayList<XmlPersistentType>(); - this.sequenceGenerators = new ArrayList<XmlSequenceGenerator>(); - this.tableGenerators = new ArrayList<XmlTableGenerator>(); - this.namedQueries = new ArrayList<XmlNamedQuery>(); - this.namedNativeQueries = new ArrayList<XmlNamedNativeQuery>(); + this.persistenceUnitMetadata = jpaFactory().buildPersistenceUnitMetadata(this); + this.persistentTypes = new ArrayList<OrmPersistentType>(); + this.sequenceGenerators = new ArrayList<GenericOrmSequenceGenerator>(); + this.tableGenerators = new ArrayList<GenericOrmTableGenerator>(); + this.namedQueries = new ArrayList<GenericOrmNamedQuery>(); + this.namedNativeQueries = new ArrayList<GenericOrmNamedNativeQuery>(); } public String getId() { - return IOrmStructureNodes.ENTITY_MAPPINGS_ID; + return OrmStructureNodes.ENTITY_MAPPINGS_ID; } @Override @@ -87,10 +94,10 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings return this; } - public XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName) { - for (XmlPersistentType xmlPersistentType : CollectionTools.iterable(xmlPersistentTypes())) { - if (xmlPersistentType.isFor(fullyQualifiedTypeName)) { - return xmlPersistentType; + public OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName) { + for (OrmPersistentType ormPersistentType : CollectionTools.iterable(ormPersistentTypes())) { + if (ormPersistentType.isFor(fullyQualifiedTypeName)) { + return ormPersistentType; } } return null; @@ -201,39 +208,39 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldSpecifiedAccess, newSpecifiedAccess); } - public ListIterator<XmlPersistentType> xmlPersistentTypes() { - return new CloneListIterator<XmlPersistentType>(this.persistentTypes); + public ListIterator<OrmPersistentType> ormPersistentTypes() { + return new CloneListIterator<OrmPersistentType>(this.persistentTypes); } - public int xmlPersistentTypesSize() { + public int ormPersistentTypesSize() { return this.persistentTypes.size(); } - public XmlPersistentType addXmlPersistentType(String mappingKey, String className) { - XmlPersistentType persistentType = jpaFactory().createXmlPersistentType(this, mappingKey); + public OrmPersistentType addOrmPersistentType(String mappingKey, String className) { + OrmPersistentType persistentType = jpaFactory().buildOrmPersistentType(this, mappingKey); int index = insertionIndex(persistentType); this.persistentTypes.add(index, persistentType); if (className.startsWith(getPackage() + ".")) { // adds short name if package name is specified className = className.substring(getPackage().length() + 1); } - TypeMapping typeMapping = persistentType.getMapping().addToResourceModel(this.xmlEntityMappings); + AbstractTypeMapping typeMapping = persistentType.getMapping().addToResourceModel(this.xmlEntityMappings); typeMapping.setClassName(className); fireItemAdded(PERSISTENT_TYPES_LIST, index, persistentType); return persistentType; } - protected void addXmlPersistentType(XmlPersistentType xmlPersistentType) { + protected void addOrmPersistentType(OrmPersistentType xmlPersistentType) { addItemToList(xmlPersistentType, this.persistentTypes, PERSISTENT_TYPES_LIST); } - protected int insertionIndex(XmlPersistentType persistentType) { + protected int insertionIndex(OrmPersistentType persistentType) { return CollectionTools.insertionIndexOf(this.persistentTypes, persistentType, buildMappingComparator()); } - private Comparator<XmlPersistentType> buildMappingComparator() { - return new Comparator<XmlPersistentType>() { - public int compare(XmlPersistentType o1, XmlPersistentType o2) { + private Comparator<OrmPersistentType> buildMappingComparator() { + return new Comparator<OrmPersistentType>() { + public int compare(OrmPersistentType o1, OrmPersistentType o2) { int o1Sequence = o1.getMapping().xmlSequence(); int o2Sequence = o2.getMapping().xmlSequence(); if (o1Sequence < o2Sequence) { @@ -247,22 +254,22 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings }; } - public void removeXmlPersistentType(int index) { - XmlPersistentType xmlPersistentType = this.persistentTypes.get(index); + public void removeOrmPersistentType(int index) { + OrmPersistentType ormPersistentType = this.persistentTypes.get(index); this.persistentTypes.remove(index); - xmlPersistentType.getMapping().removeFromResourceModel(this.xmlEntityMappings); - fireItemRemoved(PERSISTENT_TYPES_LIST, index, xmlPersistentType); + ormPersistentType.getMapping().removeFromResourceModel(this.xmlEntityMappings); + fireItemRemoved(PERSISTENT_TYPES_LIST, index, ormPersistentType); } - public void removeXmlPersistentType(XmlPersistentType xmlPersistentType) { - removeXmlPersistentType(this.persistentTypes.indexOf(xmlPersistentType)); + public void removeOrmPersistentType(OrmPersistentType ormPersistentType) { + removeOrmPersistentType(this.persistentTypes.indexOf(ormPersistentType)); } - protected void removeXmlPersistentType_(XmlPersistentType xmlPersistentType) { - removeItemFromList(xmlPersistentType, this.persistentTypes, PERSISTENT_TYPES_LIST); + protected void removeOrmPersistentType_(OrmPersistentType ormPersistentType) { + removeItemFromList(ormPersistentType, this.persistentTypes, PERSISTENT_TYPES_LIST); } - public void changeMapping(XmlPersistentType xmlPersistentType, XmlTypeMapping<? extends TypeMapping> oldMapping, XmlTypeMapping<? extends TypeMapping> newMapping) { + public void changeMapping(OrmPersistentType xmlPersistentType, OrmTypeMapping<? extends AbstractTypeMapping> oldMapping, OrmTypeMapping<? extends AbstractTypeMapping> newMapping) { int sourceIndex = this.persistentTypes.indexOf(xmlPersistentType); this.persistentTypes.remove(sourceIndex); oldMapping.removeFromResourceModel(this.xmlEntityMappings); @@ -274,39 +281,39 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings fireItemMoved(PERSISTENT_TYPES_LIST, targetIndex, sourceIndex); } - public ListIterator<XmlSequenceGenerator> sequenceGenerators() { - return new CloneListIterator<XmlSequenceGenerator>(this.sequenceGenerators); + public ListIterator<GenericOrmSequenceGenerator> sequenceGenerators() { + return new CloneListIterator<GenericOrmSequenceGenerator>(this.sequenceGenerators); } public int sequenceGeneratorsSize() { return this.sequenceGenerators.size(); } - public ISequenceGenerator addSequenceGenerator(int index) { - XmlSequenceGenerator xmlSequenceGenerator = new XmlSequenceGenerator(this); + public SequenceGenerator addSequenceGenerator(int index) { + GenericOrmSequenceGenerator xmlSequenceGenerator = new GenericOrmSequenceGenerator(this); this.sequenceGenerators.add(index, xmlSequenceGenerator); - SequenceGenerator sequenceGenerator = OrmFactory.eINSTANCE.createSequenceGeneratorImpl(); + XmlSequenceGenerator sequenceGenerator = OrmFactory.eINSTANCE.createSequenceGeneratorImpl(); xmlSequenceGenerator.initialize(sequenceGenerator); this.xmlEntityMappings.getSequenceGenerators().add(index, sequenceGenerator); fireItemAdded(SEQUENCE_GENERATORS_LIST, index, xmlSequenceGenerator); return xmlSequenceGenerator; } - protected void addSequenceGenerator(int index, XmlSequenceGenerator sequenceGenerator) { + protected void addSequenceGenerator(int index, GenericOrmSequenceGenerator sequenceGenerator) { addItemToList(index, sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST); } - public void removeSequenceGenerator(ISequenceGenerator sequenceGenerator) { + public void removeSequenceGenerator(SequenceGenerator sequenceGenerator) { removeSequenceGenerator(this.sequenceGenerators.indexOf(sequenceGenerator)); } public void removeSequenceGenerator(int index) { - XmlSequenceGenerator removedSequenceGenerator = this.sequenceGenerators.remove(index); + GenericOrmSequenceGenerator removedSequenceGenerator = this.sequenceGenerators.remove(index); fireItemRemoved(SEQUENCE_GENERATORS_LIST, index, removedSequenceGenerator); this.xmlEntityMappings.getSequenceGenerators().remove(index); } - protected void removeSequenceGenerator_(XmlSequenceGenerator sequenceGenerator) { + protected void removeSequenceGenerator_(GenericOrmSequenceGenerator sequenceGenerator) { removeItemFromList(sequenceGenerator, this.sequenceGenerators, EntityMappings.SEQUENCE_GENERATORS_LIST); } @@ -316,39 +323,39 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings fireItemMoved(EntityMappings.SEQUENCE_GENERATORS_LIST, targetIndex, sourceIndex); } - public ListIterator<XmlTableGenerator> tableGenerators() { - return new CloneListIterator<XmlTableGenerator>(this.tableGenerators); + public ListIterator<GenericOrmTableGenerator> tableGenerators() { + return new CloneListIterator<GenericOrmTableGenerator>(this.tableGenerators); } public int tableGeneratorsSize() { return this.tableGenerators.size(); } - public ITableGenerator addTableGenerator(int index) { - XmlTableGenerator xmlTableGenerator = new XmlTableGenerator(this); + public TableGenerator addTableGenerator(int index) { + GenericOrmTableGenerator xmlTableGenerator = new GenericOrmTableGenerator(this); this.tableGenerators.add(index, xmlTableGenerator); - TableGenerator tableGenerator = OrmFactory.eINSTANCE.createTableGeneratorImpl(); + XmlTableGenerator tableGenerator = OrmFactory.eINSTANCE.createTableGeneratorImpl(); xmlTableGenerator.initialize(tableGenerator); this.xmlEntityMappings.getTableGenerators().add(index, tableGenerator); fireItemAdded(TABLE_GENERATORS_LIST, index, xmlTableGenerator); return xmlTableGenerator; } - protected void addTableGenerator(int index, XmlTableGenerator tableGenerator) { + protected void addTableGenerator(int index, GenericOrmTableGenerator tableGenerator) { addItemToList(index, tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST); } - public void removeTableGenerator(ITableGenerator tableGenerator) { + public void removeTableGenerator(TableGenerator tableGenerator) { removeTableGenerator(this.tableGenerators.indexOf(tableGenerator)); } public void removeTableGenerator(int index) { - XmlTableGenerator removedTableGenerator = this.tableGenerators.remove(index); + GenericOrmTableGenerator removedTableGenerator = this.tableGenerators.remove(index); this.xmlEntityMappings.getTableGenerators().remove(index); fireItemRemoved(TABLE_GENERATORS_LIST, index, removedTableGenerator); } - protected void removeTableGenerator_(XmlTableGenerator tableGenerator) { + protected void removeTableGenerator_(GenericOrmTableGenerator tableGenerator) { removeItemFromList(tableGenerator, this.tableGenerators, EntityMappings.TABLE_GENERATORS_LIST); } @@ -358,37 +365,37 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings fireItemMoved(EntityMappings.TABLE_GENERATORS_LIST, targetIndex, sourceIndex); } - public ListIterator<XmlNamedQuery> namedQueries() { - return new CloneListIterator<XmlNamedQuery>(this.namedQueries); + public ListIterator<GenericOrmNamedQuery> namedQueries() { + return new CloneListIterator<GenericOrmNamedQuery>(this.namedQueries); } public int namedQueriesSize() { return this.namedQueries.size(); } - public XmlNamedQuery addNamedQuery(int index) { - XmlNamedQuery namedQuery = new XmlNamedQuery(this); + public GenericOrmNamedQuery addNamedQuery(int index) { + GenericOrmNamedQuery namedQuery = new GenericOrmNamedQuery(this); this.namedQueries.add(index, namedQuery); this.xmlEntityMappings.getNamedQueries().add(index, OrmFactory.eINSTANCE.createNamedQuery()); this.fireItemAdded(EntityMappings.NAMED_QUERIES_LIST, index, namedQuery); return namedQuery; } - protected void addNamedQuery(int index, XmlNamedQuery namedQuery) { + protected void addNamedQuery(int index, GenericOrmNamedQuery namedQuery) { addItemToList(index, namedQuery, this.namedQueries, EntityMappings.NAMED_QUERIES_LIST); } - public void removeNamedQuery(XmlNamedQuery namedQuery) { + public void removeNamedQuery(GenericOrmNamedQuery namedQuery) { this.removeNamedQuery(this.namedQueries.indexOf(namedQuery)); } public void removeNamedQuery(int index) { - XmlNamedQuery namedQuery = this.namedQueries.remove(index); + GenericOrmNamedQuery namedQuery = this.namedQueries.remove(index); this.xmlEntityMappings.getNamedQueries().remove(index); fireItemRemoved(EntityMappings.NAMED_QUERIES_LIST, index, namedQuery); } - protected void removeNamedQuery_(XmlNamedQuery namedQuery) { + protected void removeNamedQuery_(GenericOrmNamedQuery namedQuery) { removeItemFromList(namedQuery, this.namedQueries, EntityMappings.NAMED_QUERIES_LIST); } @@ -397,37 +404,37 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings moveItemInList(targetIndex, sourceIndex, this.namedQueries, EntityMappings.NAMED_QUERIES_LIST); } - public ListIterator<XmlNamedNativeQuery> namedNativeQueries() { - return new CloneListIterator<XmlNamedNativeQuery>(this.namedNativeQueries); + public ListIterator<GenericOrmNamedNativeQuery> namedNativeQueries() { + return new CloneListIterator<GenericOrmNamedNativeQuery>(this.namedNativeQueries); } public int namedNativeQueriesSize() { return this.namedNativeQueries.size(); } - public XmlNamedNativeQuery addNamedNativeQuery(int index) { - XmlNamedNativeQuery namedNativeQuery = new XmlNamedNativeQuery(this); + public GenericOrmNamedNativeQuery addNamedNativeQuery(int index) { + GenericOrmNamedNativeQuery namedNativeQuery = new GenericOrmNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); this.xmlEntityMappings.getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createNamedNativeQuery()); this.fireItemAdded(EntityMappings.NAMED_QUERIES_LIST, index, namedNativeQuery); return namedNativeQuery; } - protected void addNamedNativeQuery(int index, XmlNamedNativeQuery namedNativeQuery) { + protected void addNamedNativeQuery(int index, GenericOrmNamedNativeQuery namedNativeQuery) { addItemToList(index, namedNativeQuery, this.namedNativeQueries, EntityMappings.NAMED_NATIVE_QUERIES_LIST); } - public void removeNamedNativeQuery(XmlNamedNativeQuery namedNativeQuery) { + public void removeNamedNativeQuery(GenericOrmNamedNativeQuery namedNativeQuery) { removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery)); } public void removeNamedNativeQuery(int index) { - XmlNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index); + GenericOrmNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index); this.xmlEntityMappings.getNamedNativeQueries().remove(index); fireItemRemoved(NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); } - protected void removeNamedNativeQuery_(XmlNamedNativeQuery namedNativeQuery) { + protected void removeNamedNativeQuery_(GenericOrmNamedNativeQuery namedNativeQuery) { removeItemFromList(namedNativeQuery, this.namedNativeQueries, EntityMappings.NAMED_NATIVE_QUERIES_LIST); } @@ -440,7 +447,7 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings //this needs to be handled both for className and persistentType.getName(). //moving on for now since I am just trying to get the ui compiled! just a warning that this isn't good api public boolean containsPersistentType(String className) { - for (XmlPersistentType persistentType : CollectionTools.iterable(xmlPersistentTypes())) { + for (OrmPersistentType persistentType : CollectionTools.iterable(ormPersistentTypes())) { if (persistentType.getName().equals(className)) { return true; } @@ -452,7 +459,7 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings return getPersistenceUnitMetadata().getPersistenceUnitDefaults(); } - public void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.xmlEntityMappings = entityMappings; this.version = entityMappings.getVersion(); this.description = entityMappings.getDescription(); @@ -471,65 +478,65 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings this.initializeNamedNativeQueries(entityMappings); } - protected void initializePersistentTypes(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + protected void initializePersistentTypes(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.initializeMappedSuperclasses(entityMappings); this.initializeEntities(entityMappings); this.initializeEmbeddables(entityMappings); } - protected void initializeMappedSuperclasses(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (MappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(mappedSuperclass); - this.persistentTypes.add(xmlPersistentType); + protected void initializeMappedSuperclasses(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlMappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) { + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); + ormPersistentType.initialize(mappedSuperclass); + this.persistentTypes.add(ormPersistentType); } } - protected void initializeEntities(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (Entity entity : entityMappings.getEntities()) { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.ENTITY_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(entity); - this.persistentTypes.add(xmlPersistentType); + protected void initializeEntities(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlEntity entity : entityMappings.getEntities()) { + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); + ormPersistentType.initialize(entity); + this.persistentTypes.add(ormPersistentType); } } - protected void initializeEmbeddables(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (Embeddable embeddable : entityMappings.getEmbeddables()) { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(embeddable); - this.persistentTypes.add(xmlPersistentType); + protected void initializeEmbeddables(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlEmbeddable embeddable : entityMappings.getEmbeddables()) { + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); + ormPersistentType.initialize(embeddable); + this.persistentTypes.add(ormPersistentType); } } - protected void initializeTableGenerators(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (TableGenerator tableGenerator : entityMappings.getTableGenerators()) { - XmlTableGenerator xmlTableGenerator = new XmlTableGenerator(this); + protected void initializeTableGenerators(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlTableGenerator tableGenerator : entityMappings.getTableGenerators()) { + GenericOrmTableGenerator xmlTableGenerator = new GenericOrmTableGenerator(this); xmlTableGenerator.initialize(tableGenerator); this.tableGenerators.add(xmlTableGenerator); } } - protected void initializeSequenceGenerators(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (SequenceGenerator sequenceGenerator : entityMappings.getSequenceGenerators()) { - XmlSequenceGenerator xmlSequenceGenerator = new XmlSequenceGenerator(this); + protected void initializeSequenceGenerators(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlSequenceGenerator sequenceGenerator : entityMappings.getSequenceGenerators()) { + GenericOrmSequenceGenerator xmlSequenceGenerator = new GenericOrmSequenceGenerator(this); xmlSequenceGenerator.initialize(sequenceGenerator); this.sequenceGenerators.add(xmlSequenceGenerator); } } - protected void initializeNamedQueries(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (NamedQuery namedQuery : entityMappings.getNamedQueries()) { + protected void initializeNamedQueries(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlNamedQuery namedQuery : entityMappings.getNamedQueries()) { this.namedQueries.add(createNamedQuery(namedQuery)); } } - protected void initializeNamedNativeQueries(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - for (NamedNativeQuery namedNativeQuery : entityMappings.getNamedNativeQueries()) { + protected void initializeNamedNativeQueries(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + for (XmlNamedNativeQuery namedNativeQuery : entityMappings.getNamedNativeQueries()) { this.namedNativeQueries.add(createNamedNativeQuery(namedNativeQuery)); } } - public void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.xmlEntityMappings = entityMappings; this.setDescription(entityMappings.getDescription()); this.setPackage(entityMappings.getPackage()); @@ -547,65 +554,65 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings this.updateNamedNativeQueries(entityMappings); } - protected AccessType specifiedAccess(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + protected AccessType specifiedAccess(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { return AccessType.fromXmlResourceModel(entityMappings.getAccess()); } - protected void updatePersistentTypes(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - ListIterator<XmlPersistentType> xmlPersistentTypes = this.xmlPersistentTypes(); - this.updateMappedSuperclasses(entityMappings, xmlPersistentTypes); - this.updateEntities(entityMappings, xmlPersistentTypes); - this.updateEmbeddables(entityMappings, xmlPersistentTypes); + protected void updatePersistentTypes(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + ListIterator<OrmPersistentType> ormPersistentTypes = this.ormPersistentTypes(); + this.updateMappedSuperclasses(entityMappings, ormPersistentTypes); + this.updateEntities(entityMappings, ormPersistentTypes); + this.updateEmbeddables(entityMappings, ormPersistentTypes); - while (xmlPersistentTypes.hasNext()) { - this.removeXmlPersistentType(xmlPersistentTypes.next()); + while (ormPersistentTypes.hasNext()) { + this.removeOrmPersistentType(ormPersistentTypes.next()); } } - protected void updateMappedSuperclasses(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings, ListIterator<XmlPersistentType> xmlPersistentTypes) { - for (MappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) { - if (xmlPersistentTypes.hasNext()) { - xmlPersistentTypes.next().update(mappedSuperclass); + protected void updateMappedSuperclasses(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) { + for (XmlMappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) { + if (ormPersistentTypes.hasNext()) { + ormPersistentTypes.next().update(mappedSuperclass); } else { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(mappedSuperclass); - addXmlPersistentType(xmlPersistentType); + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); + ormPersistentType.initialize(mappedSuperclass); + addOrmPersistentType(ormPersistentType); } } } - protected void updateEntities(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings, ListIterator<XmlPersistentType> xmlPersistentTypes) { - for (Entity entity : entityMappings.getEntities()) { - if (xmlPersistentTypes.hasNext()) { - xmlPersistentTypes.next().update(entity); + protected void updateEntities(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) { + for (XmlEntity entity : entityMappings.getEntities()) { + if (ormPersistentTypes.hasNext()) { + ormPersistentTypes.next().update(entity); } else { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.ENTITY_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(entity); - addXmlPersistentType(xmlPersistentType); + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); + ormPersistentType.initialize(entity); + addOrmPersistentType(ormPersistentType); } } } - protected void updateEmbeddables(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings, ListIterator<XmlPersistentType> xmlPersistentTypes) { - for (Embeddable embeddable : entityMappings.getEmbeddables()) { - if (xmlPersistentTypes.hasNext()) { - xmlPersistentTypes.next().update(embeddable); + protected void updateEmbeddables(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings, ListIterator<OrmPersistentType> ormPersistentTypes) { + for (XmlEmbeddable embeddable : entityMappings.getEmbeddables()) { + if (ormPersistentTypes.hasNext()) { + ormPersistentTypes.next().update(embeddable); } else { - XmlPersistentType xmlPersistentType = jpaFactory().createXmlPersistentType(this, IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); - xmlPersistentType.initialize(embeddable); - addXmlPersistentType(xmlPersistentType); + OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); + ormPersistentType.initialize(embeddable); + addOrmPersistentType(ormPersistentType); } } } - protected void updateTableGenerators(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - ListIterator<XmlTableGenerator> tableGenerators = tableGenerators(); - ListIterator<TableGenerator> resourceTableGenerators = entityMappings.getTableGenerators().listIterator(); + protected void updateTableGenerators(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + ListIterator<GenericOrmTableGenerator> tableGenerators = tableGenerators(); + ListIterator<XmlTableGenerator> resourceTableGenerators = entityMappings.getTableGenerators().listIterator(); while (tableGenerators.hasNext()) { - XmlTableGenerator tableGenerator = tableGenerators.next(); + GenericOrmTableGenerator tableGenerator = tableGenerators.next(); if (resourceTableGenerators.hasNext()) { tableGenerator.update(resourceTableGenerators.next()); } @@ -619,17 +626,17 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings } } - protected XmlTableGenerator createTableGenerator(TableGenerator tableGeneratorResource) { - XmlTableGenerator tableGenerator = new XmlTableGenerator(this); + protected GenericOrmTableGenerator createTableGenerator(XmlTableGenerator tableGeneratorResource) { + GenericOrmTableGenerator tableGenerator = new GenericOrmTableGenerator(this); tableGenerator.initialize(tableGeneratorResource); return tableGenerator; } - protected void updateSequenceGenerators(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - ListIterator<XmlSequenceGenerator> sequenceGenerators = sequenceGenerators(); - ListIterator<SequenceGenerator> resourceSequenceGenerators = entityMappings.getSequenceGenerators().listIterator(); + protected void updateSequenceGenerators(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + ListIterator<GenericOrmSequenceGenerator> sequenceGenerators = sequenceGenerators(); + ListIterator<XmlSequenceGenerator> resourceSequenceGenerators = entityMappings.getSequenceGenerators().listIterator(); while (sequenceGenerators.hasNext()) { - XmlSequenceGenerator sequenceGenerator = sequenceGenerators.next(); + GenericOrmSequenceGenerator sequenceGenerator = sequenceGenerators.next(); if (resourceSequenceGenerators.hasNext()) { sequenceGenerator.update(resourceSequenceGenerators.next()); } @@ -643,18 +650,18 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings } } - protected XmlSequenceGenerator createSequenceGenerator(SequenceGenerator sequenceGeneratorResource) { - XmlSequenceGenerator sequenceGenerator = new XmlSequenceGenerator(this); + protected GenericOrmSequenceGenerator createSequenceGenerator(XmlSequenceGenerator sequenceGeneratorResource) { + GenericOrmSequenceGenerator sequenceGenerator = new GenericOrmSequenceGenerator(this); sequenceGenerator.initialize(sequenceGeneratorResource); return sequenceGenerator; } - protected void updateNamedQueries(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - ListIterator<XmlNamedQuery> namedQueries = namedQueries(); - ListIterator<NamedQuery> resourceNamedQueries = entityMappings.getNamedQueries().listIterator(); + protected void updateNamedQueries(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + ListIterator<GenericOrmNamedQuery> namedQueries = namedQueries(); + ListIterator<XmlNamedQuery> resourceNamedQueries = entityMappings.getNamedQueries().listIterator(); while (namedQueries.hasNext()) { - XmlNamedQuery namedQuery = namedQueries.next(); + GenericOrmNamedQuery namedQuery = namedQueries.next(); if (resourceNamedQueries.hasNext()) { namedQuery.update(resourceNamedQueries.next()); } @@ -668,18 +675,18 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings } } - protected XmlNamedQuery createNamedQuery(NamedQuery namedQuery) { - XmlNamedQuery xmlNamedQuery = new XmlNamedQuery(this); + protected GenericOrmNamedQuery createNamedQuery(XmlNamedQuery namedQuery) { + GenericOrmNamedQuery xmlNamedQuery = new GenericOrmNamedQuery(this); xmlNamedQuery.initialize(namedQuery); return xmlNamedQuery; } - protected void updateNamedNativeQueries(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - ListIterator<XmlNamedNativeQuery> namedNativeQueries = namedNativeQueries(); - ListIterator<NamedNativeQuery> resourceNamedNativeQueries = entityMappings.getNamedNativeQueries().listIterator(); + protected void updateNamedNativeQueries(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + ListIterator<GenericOrmNamedNativeQuery> namedNativeQueries = namedNativeQueries(); + ListIterator<XmlNamedNativeQuery> resourceNamedNativeQueries = entityMappings.getNamedNativeQueries().listIterator(); while (namedNativeQueries.hasNext()) { - XmlNamedNativeQuery namedQuery = namedNativeQueries.next(); + GenericOrmNamedNativeQuery namedQuery = namedNativeQueries.next(); if (resourceNamedNativeQueries.hasNext()) { namedQuery.update(resourceNamedNativeQueries.next()); } @@ -693,8 +700,8 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings } } - protected XmlNamedNativeQuery createNamedNativeQuery(NamedNativeQuery namedQuery) { - XmlNamedNativeQuery xmlNamedNativeQuery = new XmlNamedNativeQuery(this); + protected GenericOrmNamedNativeQuery createNamedNativeQuery(XmlNamedNativeQuery namedQuery) { + GenericOrmNamedNativeQuery xmlNamedNativeQuery = new GenericOrmNamedNativeQuery(this); xmlNamedNativeQuery.initialize(namedQuery); return xmlNamedNativeQuery; } @@ -702,8 +709,8 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings // ************************************************************************* - public IJpaStructureNode structureNode(int textOffset) { - for (XmlPersistentType persistentType: CollectionTools.iterable(xmlPersistentTypes())) { + public JpaStructureNode structureNode(int textOffset) { + for (OrmPersistentType persistentType: CollectionTools.iterable(ormPersistentTypes())) { if (persistentType.containsOffset(textOffset)) { return persistentType.structureNode(textOffset); } @@ -718,7 +725,7 @@ public class EntityMappingsImpl extends JpaContextNode implements EntityMappings return xmlEntityMappings.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return xmlEntityMappings.selectionTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java index 37d459e38d..9f13ef56b8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java @@ -13,42 +13,42 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class XmlAssociationOverride extends JpaContextNode - implements IAssociationOverride +public class GenericOrmAssociationOverride extends AbstractJpaContextNode + implements AssociationOverride { protected String name; - protected final List<XmlJoinColumn> specifiedJoinColumns; + protected final List<GenericOrmJoinColumn> specifiedJoinColumns; - protected final List<XmlJoinColumn> defaultJoinColumns; + protected final List<GenericOrmJoinColumn> defaultJoinColumns; - private final IAssociationOverride.Owner owner; + private final AssociationOverride.Owner owner; - protected AssociationOverride associationOverride; + protected XmlAssociationOverride associationOverride; - protected XmlAssociationOverride(IJpaContextNode parent, IAssociationOverride.Owner owner) { + protected GenericOrmAssociationOverride(JpaContextNode parent, AssociationOverride.Owner owner) { super(parent); this.owner = owner; - this.specifiedJoinColumns = new ArrayList<XmlJoinColumn>(); - this.defaultJoinColumns = new ArrayList<XmlJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<GenericOrmJoinColumn>(); + this.defaultJoinColumns = new ArrayList<GenericOrmJoinColumn>(); } public Owner owner() { @@ -65,11 +65,11 @@ public class XmlAssociationOverride extends JpaContextNode String oldName = this.name; this.name = newName; this.associationOverride.setName(newName); - firePropertyChanged(IOverride.NAME_PROPERTY, oldName, newName); + firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName); } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> joinColumns() { + public ListIterator<GenericOrmJoinColumn> joinColumns() { return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns(); } @@ -78,8 +78,8 @@ public class XmlAssociationOverride extends JpaContextNode } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> defaultJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.defaultJoinColumns); + public ListIterator<GenericOrmJoinColumn> defaultJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.defaultJoinColumns); } public int defaultJoinColumnsSize() { @@ -87,43 +87,43 @@ public class XmlAssociationOverride extends JpaContextNode } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.specifiedJoinColumns); + public ListIterator<GenericOrmJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { return this.specifiedJoinColumns.size(); } - public XmlJoinColumn addSpecifiedJoinColumn(int index) { - XmlJoinColumn joinColumn = new XmlJoinColumn(this, createJoinColumnOwner()); + public GenericOrmJoinColumn addSpecifiedJoinColumn(int index) { + GenericOrmJoinColumn joinColumn = new GenericOrmJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); this.associationOverride.getJoinColumns().add(index, OrmFactory.eINSTANCE.createJoinColumnImpl()); - this.fireItemAdded(IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } - protected IJoinColumn.Owner createJoinColumnOwner() { + protected JoinColumn.Owner createJoinColumnOwner() { return new JoinColumnOwner(); } - protected void addSpecifiedJoinColumn(int index, XmlJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, GenericOrmJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public void removeSpecifiedJoinColumn(int index) { - XmlJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + GenericOrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); this.associationOverride.getJoinColumns().remove(index); - fireItemRemoved(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedJoinColumn); } - protected void removeSpecifiedJoinColumn(XmlJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn(GenericOrmJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { this.associationOverride.getJoinColumns().move(targetIndex, sourceIndex); - moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); + moveItemInList(targetIndex, sourceIndex, this.specifiedJoinColumns, AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST); } public boolean containsSpecifiedJoinColumns() { @@ -135,30 +135,30 @@ public class XmlAssociationOverride extends JpaContextNode } - public void initialize(AssociationOverride associationOverride) { + public void initialize(XmlAssociationOverride associationOverride) { this.associationOverride = associationOverride; this.name = associationOverride.getName(); initializeSpecifiedJoinColumns(associationOverride); } - protected void initializeSpecifiedJoinColumns(AssociationOverride associationOverride) { - for (JoinColumn joinColumn : associationOverride.getJoinColumns()) { + protected void initializeSpecifiedJoinColumns(XmlAssociationOverride associationOverride) { + for (XmlJoinColumn joinColumn : associationOverride.getJoinColumns()) { this.specifiedJoinColumns.add(createJoinColumn(joinColumn)); } } - public void update(AssociationOverride associationOverride) { + public void update(XmlAssociationOverride associationOverride) { this.associationOverride = associationOverride; this.setName(associationOverride.getName()); updateSpecifiedJoinColumns(associationOverride); } - protected void updateSpecifiedJoinColumns(AssociationOverride associationOverride) { - ListIterator<XmlJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = associationOverride.getJoinColumns().listIterator(); + protected void updateSpecifiedJoinColumns(XmlAssociationOverride associationOverride) { + ListIterator<GenericOrmJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<XmlJoinColumn> resourceJoinColumns = associationOverride.getJoinColumns().listIterator(); while (joinColumns.hasNext()) { - XmlJoinColumn joinColumn = joinColumns.next(); + GenericOrmJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -172,13 +172,13 @@ public class XmlAssociationOverride extends JpaContextNode } } - protected XmlJoinColumn createJoinColumn(JoinColumn joinColumn) { - XmlJoinColumn xmlJoinColumn = new XmlJoinColumn(this, new JoinColumnOwner()); + protected GenericOrmJoinColumn createJoinColumn(XmlJoinColumn joinColumn) { + GenericOrmJoinColumn xmlJoinColumn = new GenericOrmJoinColumn(this, new JoinColumnOwner()); xmlJoinColumn.initialize(joinColumn); return xmlJoinColumn; } - public class JoinColumnOwner implements IJoinColumn.Owner + public class JoinColumnOwner implements JoinColumn.Owner { public JoinColumnOwner() { @@ -189,24 +189,24 @@ public class XmlAssociationOverride extends JpaContextNode * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return XmlAssociationOverride.this.owner.typeMapping().tableName(); + return GenericOrmAssociationOverride.this.owner.typeMapping().tableName(); } public String defaultColumnName() { return null; } - public IEntity targetEntity() { - IRelationshipMapping relationshipMapping = relationshipMapping(); + public Entity targetEntity() { + RelationshipMapping relationshipMapping = relationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity(); } public String attributeName() { - return XmlAssociationOverride.this.getName(); + return GenericOrmAssociationOverride.this.getName(); } - public IRelationshipMapping relationshipMapping() { - return XmlAssociationOverride.this.owner.relationshipMapping(XmlAssociationOverride.this.getName()); + public RelationshipMapping relationshipMapping() { + return GenericOrmAssociationOverride.this.owner.relationshipMapping(GenericOrmAssociationOverride.this.getName()); } public boolean tableNameIsInvalid(String tableName) { @@ -220,13 +220,13 @@ public class XmlAssociationOverride extends JpaContextNode return true; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITypeMapping typeMapping() { - return XmlAssociationOverride.this.owner.typeMapping(); + public TypeMapping typeMapping() { + return GenericOrmAssociationOverride.this.owner.typeMapping(); } public Table dbTable(String tableName) { @@ -234,16 +234,16 @@ public class XmlAssociationOverride extends JpaContextNode } public Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlAssociationOverride.this.defaultJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericOrmAssociationOverride.this.defaultJoinColumns.contains(joinColumn); } public int joinColumnsSize() { - return XmlAssociationOverride.this.joinColumnsSize(); + return GenericOrmAssociationOverride.this.joinColumnsSize(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java index 566a883b0b..4e57c815ed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java @@ -10,35 +10,36 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.orm.OrmColumn; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.db.internal.Table; -public class XmlAttributeOverride extends JpaContextNode - implements IAttributeOverride, IXmlColumn.Owner +public class GenericOrmAttributeOverride extends AbstractJpaContextNode + implements AttributeOverride, OrmColumn.Owner { protected String name; private final Owner owner; - protected AttributeOverride attributeOverride; + protected XmlAttributeOverride attributeOverride; - protected final XmlColumn column; + protected final GenericOrmColumn column; - protected XmlAttributeOverride(IJpaContextNode parent, IAttributeOverride.Owner owner) { + protected GenericOrmAttributeOverride(JpaContextNode parent, AttributeOverride.Owner owner) { super(parent); this.owner = owner; - this.column = new XmlColumn(this, this); + this.column = new GenericOrmColumn(this, this); } public Owner owner() { @@ -53,25 +54,25 @@ public class XmlAttributeOverride extends JpaContextNode String oldName = this.name; this.name = newName; this.attributeOverride.setName(newName); - firePropertyChanged(IOverride.NAME_PROPERTY, oldName, newName); + firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName); } protected void setName_(String newName) { String oldName = this.name; this.name = newName; - firePropertyChanged(IOverride.NAME_PROPERTY, oldName, newName); + firePropertyChanged(BaseOverride.NAME_PROPERTY, oldName, newName); } - public XmlColumn getColumn() { + public GenericOrmColumn getColumn() { return this.column; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return owner().typeMapping(); } @@ -103,7 +104,7 @@ public class XmlAttributeOverride extends JpaContextNode //***************** IXmlColumn.Owner implementation **************** - public Column columnResource() { + public XmlColumn columnResource() { return this.attributeOverride.getColumn(); } @@ -118,13 +119,13 @@ public class XmlAttributeOverride extends JpaContextNode //***************** updating **************** - public void initialize(AttributeOverride attributeOverride) { + public void initialize(XmlAttributeOverride attributeOverride) { this.attributeOverride = attributeOverride; this.name = attributeOverride.getName(); this.column.initialize(attributeOverride.getColumn()); } - public void update(AttributeOverride attributeOverride) { + public void update(XmlAttributeOverride attributeOverride) { this.attributeOverride = attributeOverride; this.setName_(attributeOverride.getName()); this.column.update(attributeOverride.getColumn()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java index ddf677ca2f..48543eafae 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java @@ -10,27 +10,29 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.EnumType; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Basic; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.EnumType; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.orm.OrmColumn; +import org.eclipse.jpt.core.context.orm.OrmColumnMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlColumn; import org.eclipse.jpt.db.internal.Table; -public class XmlBasicMapping extends XmlAttributeMapping<Basic> - implements IBasicMapping, IXmlColumnMapping +public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic> + implements BasicMapping, OrmColumnMapping { - protected final XmlColumn column; + protected final OrmColumn column; protected FetchType specifiedFetch; @@ -42,9 +44,9 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> protected boolean lob; - protected XmlBasicMapping(XmlPersistentAttribute parent) { + protected GenericOrmBasicMapping(OrmPersistentAttribute parent) { super(parent); - this.column = new XmlColumn(this, this); + this.column = new GenericOrmColumn(this, this); } public FetchType getFetch() { @@ -52,7 +54,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> } public FetchType getDefaultFetch() { - return IBasicMapping.DEFAULT_FETCH_TYPE; + return BasicMapping.DEFAULT_FETCH_TYPE; } public FetchType getSpecifiedFetch() { @@ -63,13 +65,13 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; this.attributeMapping().setFetch(FetchType.toOrmResourceModel(newSpecifiedFetch)); - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } protected void setSpecifiedFetch_(FetchType newSpecifiedFetch) { FetchType oldFetch = this.specifiedFetch; this.specifiedFetch = newSpecifiedFetch; - firePropertyChanged(IFetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); + firePropertyChanged(Fetchable.SPECIFIED_FETCH_PROPERTY, oldFetch, newSpecifiedFetch); } public Boolean getOptional() { @@ -77,7 +79,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> } public Boolean getDefaultOptional() { - return INullable.DEFAULT_OPTIONAL; + return Nullable.DEFAULT_OPTIONAL; } public Boolean getSpecifiedOptional() { @@ -88,13 +90,13 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> Boolean oldOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; this.attributeMapping().setOptional(newSpecifiedOptional); - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); } protected void setSpecifiedOptional_(Boolean newSpecifiedOptional) { Boolean oldOptional = this.specifiedOptional; this.specifiedOptional = newSpecifiedOptional; - firePropertyChanged(INullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); + firePropertyChanged(Nullable.SPECIFIED_OPTIONAL_PROPERTY, oldOptional, newSpecifiedOptional); } public boolean isLob() { @@ -105,13 +107,13 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> boolean oldLob = this.lob; this.lob = newLob; this.attributeMapping().setLob(newLob); - firePropertyChanged(IBasicMapping.LOB_PROPERTY, oldLob, newLob); + firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob); } protected void setLob_(boolean newLob) { boolean oldLob = this.lob; this.lob = newLob; - firePropertyChanged(IBasicMapping.LOB_PROPERTY, oldLob, newLob); + firePropertyChanged(BasicMapping.LOB_PROPERTY, oldLob, newLob); } public TemporalType getTemporal() { @@ -122,13 +124,13 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.attributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } protected void setTemporal_(TemporalType newTemporal) { TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } public EnumType getEnumerated() { @@ -136,7 +138,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> } public EnumType getDefaultEnumerated() { - return IBasicMapping.DEFAULT_ENUMERATED; + return BasicMapping.DEFAULT_ENUMERATED; } public EnumType getSpecifiedEnumerated() { @@ -147,27 +149,27 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> EnumType oldEnumerated = this.specifiedEnumerated; this.specifiedEnumerated = newSpecifiedEnumerated; this.attributeMapping().setEnumerated(EnumType.toOrmResourceModel(newSpecifiedEnumerated)); - firePropertyChanged(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); + firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); } protected void setSpecifiedEnumerated_(EnumType newSpecifiedEnumerated) { EnumType oldEnumerated = this.specifiedEnumerated; this.specifiedEnumerated = newSpecifiedEnumerated; - firePropertyChanged(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); + firePropertyChanged(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY, oldEnumerated, newSpecifiedEnumerated); } public String getKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlBasicMapping(this); } @Override - public void initializeFromXmlColumnMapping(IXmlColumnMapping oldMapping) { + public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) { super.initializeFromXmlColumnMapping(oldMapping); setTemporal(oldMapping.getTemporal()); getColumn().initializeFrom(oldMapping.getColumn()); @@ -183,7 +185,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> return true; } - public XmlColumn getColumn() { + public OrmColumn getColumn() { return this.column; } @@ -199,13 +201,13 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> return typeMapping().dbTable(tableName); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @Override - public void initialize(Basic basic) { + public void initialize(XmlBasic basic) { super.initialize(basic); this.specifiedFetch = this.specifiedFetch(basic); this.specifiedOptional = this.specifiedOptional(basic); @@ -216,7 +218,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> } @Override - public void update(Basic basic) { + public void update(XmlBasic basic) { super.update(basic); this.setSpecifiedFetch_(this.specifiedFetch(basic)); this.setSpecifiedOptional_(this.specifiedOptional(basic)); @@ -226,36 +228,36 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> this.column.update(basic.getColumn()); } - protected Boolean specifiedOptional(Basic basic) { + protected Boolean specifiedOptional(XmlBasic basic) { return basic.getOptional(); } - protected FetchType specifiedFetch(Basic basic) { + protected FetchType specifiedFetch(XmlBasic basic) { return FetchType.fromOrmResourceModel(basic.getFetch()); } - protected EnumType specifiedEnumerated(Basic basic) { + protected EnumType specifiedEnumerated(XmlBasic basic) { return EnumType.fromOrmResourceModel(basic.getEnumerated()); } - protected TemporalType specifiedTemporal(Basic basic) { + protected TemporalType specifiedTemporal(XmlBasic basic) { return TemporalType.fromOrmResourceModel(basic.getTemporal()); } - protected boolean specifiedLob(Basic basic) { + protected boolean specifiedLob(XmlBasic basic) { return basic.isLob(); } @Override - public Basic addToResourceModel(TypeMapping typeMapping) { - Basic basic = OrmFactory.eINSTANCE.createBasicImpl(); + public XmlBasic addToResourceModel(AbstractTypeMapping typeMapping) { + XmlBasic basic = OrmFactory.eINSTANCE.createBasicImpl(); persistentAttribute().initialize(basic); typeMapping.getAttributes().getBasics().add(basic); return basic; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getBasics().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -264,7 +266,7 @@ public class XmlBasicMapping extends XmlAttributeMapping<Basic> //***************** IXmlColumn.Owner implementation **************** - public Column columnResource() { + public XmlColumn columnResource() { return this.attributeMapping().getColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java index 90e0c0c6b8..84030a73e3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java @@ -9,11 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.Column; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.orm.OrmColumn; +import org.eclipse.jpt.core.resource.orm.XmlColumn; -public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn +public class GenericOrmColumn extends AbstractOrmColumn<XmlColumn> implements OrmColumn { protected Integer specifiedLength; @@ -21,16 +22,16 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn protected Integer specifiedScale; - protected XmlColumn(IJpaContextNode parent, IXmlColumn.Owner owner) { + protected GenericOrmColumn(JpaContextNode parent, OrmColumn.Owner owner) { super(parent, owner); } @Override - public IXmlColumn.Owner owner() { - return (IXmlColumn.Owner) super.owner(); + public OrmColumn.Owner owner() { + return (OrmColumn.Owner) super.owner(); } - public void initializeFrom(IColumn oldColumn) { + public void initializeFrom(Column oldColumn) { super.initializeFrom(oldColumn); setSpecifiedLength(oldColumn.getSpecifiedLength()); setSpecifiedPrecision(oldColumn.getSpecifiedPrecision()); @@ -51,7 +52,7 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } public Integer getDefaultLength() { - return IColumn.DEFAULT_LENGTH; + return Column.DEFAULT_LENGTH; } public Integer getSpecifiedLength() { @@ -87,7 +88,7 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } public Integer getDefaultPrecision() { - return IColumn.DEFAULT_PRECISION; + return Column.DEFAULT_PRECISION; } public Integer getSpecifiedPrecision() { @@ -123,7 +124,7 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } public Integer getDefaultScale() { - return IColumn.DEFAULT_SCALE; + return Column.DEFAULT_SCALE; } public Integer getSpecifiedScale() { @@ -155,7 +156,7 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } @Override - protected Column columnResource() { + protected XmlColumn columnResource() { return owner().columnResource(); } @@ -172,7 +173,7 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } @Override - protected void initialize(Column column) { + public void initialize(XmlColumn column) { super.initialize(column); this.specifiedLength = this.specifiedLength(column); this.specifiedPrecision = this.specifiedPrecision(column); @@ -180,22 +181,22 @@ public class XmlColumn extends AbstractXmlColumn<Column> implements IColumn } @Override - protected void update(Column column) { + public void update(XmlColumn column) { super.update(column); this.setSpecifiedLength_(this.specifiedLength(column)); this.setSpecifiedPrecision_(this.specifiedPrecision(column)); this.setSpecifiedScale_(this.specifiedScale(column)); } - protected Integer specifiedLength(Column column) { + protected Integer specifiedLength(XmlColumn column) { return column == null ? null : column.getLength(); } - protected Integer specifiedPrecision(Column column) { + protected Integer specifiedPrecision(XmlColumn column) { return column == null ? null : column.getPrecision(); } - protected Integer specifiedScale(Column column) { + protected Integer specifiedScale(XmlColumn column) { return column == null ? null : column.getScale(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java index 9603a74be5..8ee345cdfb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java @@ -9,15 +9,15 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.DiscriminatorType; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; - -public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<DiscriminatorColumn> - implements IDiscriminatorColumn +import org.eclipse.jpt.core.context.DiscriminatorType; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.OrmFactory; + +public class GenericOrmDiscriminatorColumn extends AbstractOrmNamedColumn<XmlDiscriminatorColumn> + implements DiscriminatorColumn { protected DiscriminatorType specifiedDiscriminatorType; @@ -30,9 +30,9 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator protected Integer specifiedLength; - protected Entity entity; + protected XmlEntity entity; - protected XmlDiscriminatorColumn(IJpaContextNode parent, Owner owner) { + protected GenericOrmDiscriminatorColumn(JpaContextNode parent, Owner owner) { super(parent, owner); } @@ -48,7 +48,7 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator } public DiscriminatorType getDefaultDiscriminatorType() { - return IDiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE; + return DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE; } public DiscriminatorType getSpecifiedDiscriminatorType() { @@ -70,13 +70,13 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator this.columnResource().setDiscriminatorType(DiscriminatorType.toOrmResourceModel(newSpecifiedDiscriminatorType)); } } - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); } protected void setSpecifiedDiscriminatorType_(DiscriminatorType newSpecifiedDiscriminatorType) { DiscriminatorType oldDiscriminatorType = this.specifiedDiscriminatorType; this.specifiedDiscriminatorType = newSpecifiedDiscriminatorType; - firePropertyChanged(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); + firePropertyChanged(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY, oldDiscriminatorType, newSpecifiedDiscriminatorType); } public Integer getLength() { @@ -129,7 +129,7 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator @Override - protected DiscriminatorColumn columnResource() { + protected XmlDiscriminatorColumn columnResource() { return this.entity.getDiscriminatorColumn(); } @@ -143,19 +143,19 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator this.entity.setDiscriminatorColumn(null); } - public void initialize(Entity entity) { + public void initialize(XmlEntity entity) { this.entity = entity; this.initialize(this.columnResource()); } - public void update(Entity entity) { + public void update(XmlEntity entity) { this.entity = entity; this.update(this.columnResource()); } @Override - protected void initialize(DiscriminatorColumn column) { + protected void initialize(XmlDiscriminatorColumn column) { super.initialize(column); this.specifiedLength = this.specifiedLength(column); this.specifiedDiscriminatorType = this.specifiedDiscriminatorType(column); @@ -163,18 +163,18 @@ public class XmlDiscriminatorColumn extends AbstractXmlNamedColumn<Discriminator } @Override - protected void update(DiscriminatorColumn column) { + protected void update(XmlDiscriminatorColumn column) { super.update(column); this.setSpecifiedLength_(this.specifiedLength(column)); this.setSpecifiedDiscriminatorType_(this.specifiedDiscriminatorType(column)); //TODO defaultLength, scale, precision from java column } - protected Integer specifiedLength(DiscriminatorColumn column) { + protected Integer specifiedLength(XmlDiscriminatorColumn column) { return column == null ? null : column.getLength(); } - protected DiscriminatorType specifiedDiscriminatorType(DiscriminatorColumn column) { + protected DiscriminatorType specifiedDiscriminatorType(XmlDiscriminatorColumn column) { return column == null ? null : DiscriminatorType.fromOrmResourceModel(column.getDiscriminatorType()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java index effc2f1761..82ff137997 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java @@ -9,23 +9,24 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; -import org.eclipse.jpt.core.internal.resource.orm.EntityMappings; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddable; +import org.eclipse.jpt.core.resource.orm.EntityMappings; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; -public class XmlEmbeddable extends XmlTypeMapping<Embeddable> implements IEmbeddable +public class GenericOrmEmbeddable extends AbstractOrmTypeMapping<XmlEmbeddable> implements Embeddable { - public XmlEmbeddable(XmlPersistentType parent) { + public GenericOrmEmbeddable(OrmPersistentType parent) { super(parent); } public String getKey() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } public boolean tableNameIsInvalid(String tableName) { @@ -36,36 +37,33 @@ public class XmlEmbeddable extends XmlTypeMapping<Embeddable> implements IEmbedd return EmptyIterator.instance(); } - public Iterator<ITable> associatedTables() { + public Iterator<Table> associatedTables() { return EmptyIterator.instance(); } - public Iterator<ITable> associatedTablesIncludingInherited() { + public Iterator<Table> associatedTablesIncludingInherited() { return EmptyIterator.instance(); } - @Override public int xmlSequence() { return 2; } @Override public boolean attributeMappingKeyAllowed(String attributeMappingKey) { - return attributeMappingKey == IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return attributeMappingKey == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY || attributeMappingKey == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } - protected Boolean metadataComplete(Embeddable embeddable) { + protected Boolean metadataComplete(XmlEmbeddable embeddable) { return embeddable.getMetadataComplete(); } - @Override - public void removeFromResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { entityMappings.getEmbeddables().remove(this.typeMappingResource()); } - @Override - public Embeddable addToResourceModel(EntityMappings entityMappings) { - Embeddable embeddable = OrmFactory.eINSTANCE.createEmbeddable(); + public XmlEmbeddable addToResourceModel(EntityMappings entityMappings) { + XmlEmbeddable embeddable = OrmFactory.eINSTANCE.createEmbeddable(); persistentType().initialize(embeddable); entityMappings.getEmbeddables().add(embeddable); return embeddable; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java index ab813c88f8..ed6a0cc814 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java @@ -14,20 +14,20 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; @@ -36,31 +36,31 @@ import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implements IEmbeddedIdMapping +public class GenericOrmEmbeddedIdMapping extends AbstractOrmAttributeMapping<XmlEmbeddedId> implements EmbeddedIdMapping { - protected final List<XmlAttributeOverride> specifiedAttributeOverrides; + protected final List<GenericOrmAttributeOverride> specifiedAttributeOverrides; - protected final List<XmlAttributeOverride> defaultAttributeOverrides; + protected final List<GenericOrmAttributeOverride> defaultAttributeOverrides; - private IEmbeddable embeddable; + private Embeddable embeddable; - protected XmlEmbeddedIdMapping(XmlPersistentAttribute parent) { + protected GenericOrmEmbeddedIdMapping(OrmPersistentAttribute parent) { super(parent); - this.specifiedAttributeOverrides = new ArrayList<XmlAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<XmlAttributeOverride>(); + this.specifiedAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlEmbeddedIdMapping(this); } @Override - public void initializeFromXmlEmbeddedMapping(XmlEmbeddedMapping oldMapping) { + public void initializeFromXmlEmbeddedMapping(GenericOrmEmbeddedMapping oldMapping) { super.initializeFromXmlEmbeddedMapping(oldMapping); int index = 0; - for (IAttributeOverride attributeOverride : CollectionTools.iterable(oldMapping.specifiedAttributeOverrides())) { - XmlAttributeOverride newAttributeOverride = addSpecifiedAttributeOverride(index++); + for (AttributeOverride attributeOverride : CollectionTools.iterable(oldMapping.specifiedAttributeOverrides())) { + GenericOrmAttributeOverride newAttributeOverride = addSpecifiedAttributeOverride(index++); newAttributeOverride.setName(attributeOverride.getName()); newAttributeOverride.getColumn().initializeFrom(attributeOverride.getColumn()); } @@ -72,11 +72,11 @@ public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implem } public String getKey() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> attributeOverrides() { + public ListIterator<GenericOrmAttributeOverride> attributeOverrides() { //TODO attribute overrides return EmptyListIterator.instance(); } @@ -87,8 +87,8 @@ public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implem } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { @@ -96,57 +96,57 @@ public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implem } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public XmlAttributeOverride addSpecifiedAttributeOverride(int index) { - XmlAttributeOverride attributeOverride = new XmlAttributeOverride(this, this); + public GenericOrmAttributeOverride addSpecifiedAttributeOverride(int index) { + GenericOrmAttributeOverride attributeOverride = new GenericOrmAttributeOverride(this, this); this.specifiedAttributeOverrides.add(index, attributeOverride); - AttributeOverride attributeOverrideResource = OrmFactory.eINSTANCE.createAttributeOverrideImpl(); + XmlAttributeOverride attributeOverrideResource = OrmFactory.eINSTANCE.createAttributeOverrideImpl(); this.attributeMapping().getAttributeOverrides().add(index, attributeOverrideResource); attributeOverride.initialize(attributeOverrideResource); - this.fireItemAdded(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected void addSpecifiedAttributeOverride(int index, XmlAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, GenericOrmAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - XmlAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + GenericOrmAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); this.attributeMapping().getAttributeOverrides().remove(index); - fireItemRemoved(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + fireItemRemoved(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); } - protected void removeSpecifiedAttributeOverride_(XmlAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(GenericOrmAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.attributeMapping().getAttributeOverrides().move(targetIndex, sourceIndex); - fireItemMoved(IEmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(EmbeddedIdMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } - public boolean isVirtual(IOverride override) { + public boolean isVirtual(BaseOverride override) { return this.defaultAttributeOverrides.contains(override); } - public IColumnMapping columnMapping(String attributeName) { - return JavaEmbeddedMapping.columnMapping(attributeName, embeddable()); + public ColumnMapping columnMapping(String attributeName) { + return GenericJavaEmbeddedMapping.columnMapping(attributeName, embeddable()); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @@ -233,62 +233,62 @@ public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implem // - public IEmbeddable embeddable() { + public Embeddable embeddable() { return this.embeddable; } public Iterator<String> allOverridableAttributeNames() { - return new TransformationIterator<IPersistentAttribute, String>(this.allOverridableAttributes()) { + return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - public Iterator<IPersistentAttribute> allOverridableAttributes() { + public Iterator<PersistentAttribute> allOverridableAttributes() { if (this.embeddable() == null) { return EmptyIterator.instance(); } - return new FilteringIterator<IPersistentAttribute, IPersistentAttribute>(this.embeddable().persistentType().attributes()) { + return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.embeddable().persistentType().attributes()) { @Override - protected boolean accept(IPersistentAttribute o) { + protected boolean accept(PersistentAttribute o) { return o.isOverridableAttribute(); } }; } @Override - public void initialize(EmbeddedId embeddedId) { + public void initialize(XmlEmbeddedId embeddedId) { super.initialize(embeddedId); this.initializeSpecifiedAttributeOverrides(embeddedId); } - protected void initializeSpecifiedAttributeOverrides(EmbeddedId embeddedId) { - for (AttributeOverride attributeOverride : embeddedId.getAttributeOverrides()) { + protected void initializeSpecifiedAttributeOverrides(XmlEmbeddedId embeddedId) { + for (XmlAttributeOverride attributeOverride : embeddedId.getAttributeOverrides()) { this.specifiedAttributeOverrides.add(createAttributeOverride(attributeOverride)); } } - protected XmlAttributeOverride createAttributeOverride(AttributeOverride attributeOverride) { - XmlAttributeOverride xmlAttributeOverride = new XmlAttributeOverride(this, this); + protected GenericOrmAttributeOverride createAttributeOverride(XmlAttributeOverride attributeOverride) { + GenericOrmAttributeOverride xmlAttributeOverride = new GenericOrmAttributeOverride(this, this); xmlAttributeOverride.initialize(attributeOverride); return xmlAttributeOverride; } @Override - public void update(EmbeddedId embeddedId) { + public void update(XmlEmbeddedId embeddedId) { super.update(embeddedId); this.updateSpecifiedAttributeOverrides(embeddedId); } - protected void updateSpecifiedAttributeOverrides(EmbeddedId embeddedId) { - ListIterator<XmlAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<AttributeOverride> resourceAttributeOverrides = embeddedId.getAttributeOverrides().listIterator(); + protected void updateSpecifiedAttributeOverrides(XmlEmbeddedId embeddedId) { + ListIterator<GenericOrmAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<XmlAttributeOverride> resourceAttributeOverrides = embeddedId.getAttributeOverrides().listIterator(); while (attributeOverrides.hasNext()) { - XmlAttributeOverride attributeOverride = attributeOverrides.next(); + GenericOrmAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { attributeOverride.update(resourceAttributeOverrides.next()); } @@ -303,15 +303,15 @@ public class XmlEmbeddedIdMapping extends XmlAttributeMapping<EmbeddedId> implem } @Override - public EmbeddedId addToResourceModel(TypeMapping typeMapping) { - EmbeddedId embeddedId = OrmFactory.eINSTANCE.createEmbeddedIdImpl(); + public XmlEmbeddedId addToResourceModel(AbstractTypeMapping typeMapping) { + XmlEmbeddedId embeddedId = OrmFactory.eINSTANCE.createEmbeddedIdImpl(); persistentAttribute().initialize(embeddedId); typeMapping.getAttributes().getEmbeddedIds().add(embeddedId); return embeddedId; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getEmbeddedIds().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java index 801a71a9e0..3dce30a03e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java @@ -14,21 +14,21 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.Embedded; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlEmbedded; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator; @@ -37,31 +37,31 @@ import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements IEmbeddedMapping +public class GenericOrmEmbeddedMapping extends AbstractOrmAttributeMapping<XmlEmbedded> implements EmbeddedMapping { - protected final List<XmlAttributeOverride> specifiedAttributeOverrides; + protected final List<GenericOrmAttributeOverride> specifiedAttributeOverrides; - protected final List<XmlAttributeOverride> defaultAttributeOverrides; + protected final List<GenericOrmAttributeOverride> defaultAttributeOverrides; - private IEmbeddable embeddable; + private Embeddable embeddable; - protected XmlEmbeddedMapping(XmlPersistentAttribute parent) { + protected GenericOrmEmbeddedMapping(OrmPersistentAttribute parent) { super(parent); - this.specifiedAttributeOverrides = new ArrayList<XmlAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<XmlAttributeOverride>(); + this.specifiedAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlEmbeddedMapping(this); } @Override - public void initializeFromXmlEmbeddedIdMapping(XmlEmbeddedIdMapping oldMapping) { + public void initializeFromXmlEmbeddedIdMapping(GenericOrmEmbeddedIdMapping oldMapping) { super.initializeFromXmlEmbeddedIdMapping(oldMapping); int index = 0; - for (IAttributeOverride attributeOverride : CollectionTools.iterable(oldMapping.specifiedAttributeOverrides())) { - XmlAttributeOverride newAttributeOverride = addSpecifiedAttributeOverride(index++); + for (AttributeOverride attributeOverride : CollectionTools.iterable(oldMapping.specifiedAttributeOverrides())) { + GenericOrmAttributeOverride newAttributeOverride = addSpecifiedAttributeOverride(index++); newAttributeOverride.setName(attributeOverride.getName()); newAttributeOverride.getColumn().initializeFrom(attributeOverride.getColumn()); } @@ -73,12 +73,12 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements } public String getKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> attributeOverrides() { - return new CompositeListIterator<XmlAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); + public ListIterator<GenericOrmAttributeOverride> attributeOverrides() { + return new CompositeListIterator<GenericOrmAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); } public int attributeOverridesSize() { @@ -87,8 +87,8 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { @@ -96,57 +96,57 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public XmlAttributeOverride addSpecifiedAttributeOverride(int index) { - XmlAttributeOverride attributeOverride = new XmlAttributeOverride(this, this); + public GenericOrmAttributeOverride addSpecifiedAttributeOverride(int index) { + GenericOrmAttributeOverride attributeOverride = new GenericOrmAttributeOverride(this, this); this.specifiedAttributeOverrides.add(index, attributeOverride); - AttributeOverride attributeOverrideResource = OrmFactory.eINSTANCE.createAttributeOverrideImpl(); + XmlAttributeOverride attributeOverrideResource = OrmFactory.eINSTANCE.createAttributeOverrideImpl(); this.attributeMapping().getAttributeOverrides().add(index, attributeOverrideResource); attributeOverride.initialize(attributeOverrideResource); - this.fireItemAdded(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected void addSpecifiedAttributeOverride(int index, XmlAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, GenericOrmAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - XmlAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + GenericOrmAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); this.attributeMapping().getAttributeOverrides().remove(index); - fireItemRemoved(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + fireItemRemoved(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); } - protected void removeSpecifiedAttributeOverride_(XmlAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(GenericOrmAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.attributeMapping().getAttributeOverrides().move(targetIndex, sourceIndex); - fireItemMoved(IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } - public boolean isVirtual(IOverride override) { + public boolean isVirtual(BaseOverride override) { return this.defaultAttributeOverrides.contains(override); } - public IColumnMapping columnMapping(String attributeName) { - return JavaEmbeddedMapping.columnMapping(attributeName, embeddable()); + public ColumnMapping columnMapping(String attributeName) { + return GenericJavaEmbeddedMapping.columnMapping(attributeName, embeddable()); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @@ -232,40 +232,40 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements // } - public IEmbeddable embeddable() { + public Embeddable embeddable() { return this.embeddable; } public Iterator<String> allOverridableAttributeNames() { - return new TransformationIterator<IPersistentAttribute, String>(this.allOverridableAttributes()) { + return new TransformationIterator<PersistentAttribute, String>(this.allOverridableAttributes()) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - public Iterator<IPersistentAttribute> allOverridableAttributes() { + public Iterator<PersistentAttribute> allOverridableAttributes() { if (this.embeddable() == null) { return EmptyIterator.instance(); } - return new FilteringIterator<IPersistentAttribute, IPersistentAttribute>(this.embeddable().persistentType().attributes()) { + return new FilteringIterator<PersistentAttribute, PersistentAttribute>(this.embeddable().persistentType().attributes()) { @Override - protected boolean accept(IPersistentAttribute o) { + protected boolean accept(PersistentAttribute o) { return o.isOverridableAttribute(); } }; } @Override - public void initialize(Embedded embedded) { + public void initialize(XmlEmbedded embedded) { super.initialize(embedded); this.embeddable = embeddableFor(javaPersistentAttribute()); this.initializeSpecifiedAttributeOverrides(embedded); } - protected void initializeSpecifiedAttributeOverrides(Embedded embedded) { - for (AttributeOverride attributeOverride : embedded.getAttributeOverrides()) { + protected void initializeSpecifiedAttributeOverrides(XmlEmbedded embedded) { + for (XmlAttributeOverride attributeOverride : embedded.getAttributeOverrides()) { this.specifiedAttributeOverrides.add(createAttributeOverride(attributeOverride)); } } @@ -282,26 +282,26 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements // } // } - protected XmlAttributeOverride createAttributeOverride(AttributeOverride attributeOverride) { - XmlAttributeOverride xmlAttributeOverride = new XmlAttributeOverride(this, this); + protected GenericOrmAttributeOverride createAttributeOverride(XmlAttributeOverride attributeOverride) { + GenericOrmAttributeOverride xmlAttributeOverride = new GenericOrmAttributeOverride(this, this); xmlAttributeOverride.initialize(attributeOverride); return xmlAttributeOverride; } @Override - public void update(Embedded embedded) { + public void update(XmlEmbedded embedded) { super.update(embedded); this.embeddable = embeddableFor(javaPersistentAttribute()); this.updateSpecifiedAttributeOverrides(embedded); } - protected void updateSpecifiedAttributeOverrides(Embedded embedded) { - ListIterator<XmlAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<AttributeOverride> resourceAttributeOverrides = embedded.getAttributeOverrides().listIterator(); + protected void updateSpecifiedAttributeOverrides(XmlEmbedded embedded) { + ListIterator<GenericOrmAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<XmlAttributeOverride> resourceAttributeOverrides = embedded.getAttributeOverrides().listIterator(); while (attributeOverrides.hasNext()) { - XmlAttributeOverride attributeOverride = attributeOverrides.next(); + GenericOrmAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { attributeOverride.update(resourceAttributeOverrides.next()); } @@ -316,15 +316,15 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements } @Override - public Embedded addToResourceModel(TypeMapping typeMapping) { - Embedded embedded = OrmFactory.eINSTANCE.createEmbeddedImpl(); + public XmlEmbedded addToResourceModel(AbstractTypeMapping typeMapping) { + XmlEmbedded embedded = OrmFactory.eINSTANCE.createEmbeddedImpl(); persistentAttribute().initialize(embedded); typeMapping.getAttributes().getEmbeddeds().add(embedded); return embedded; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getEmbeddeds().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -332,11 +332,11 @@ public class XmlEmbeddedMapping extends XmlAttributeMapping<Embedded> implements } //******* static methods ********* - public static IEmbeddable embeddableFor(IJavaPersistentAttribute javaPersistentAttribute) { + public static Embeddable embeddableFor(JavaPersistentAttribute javaPersistentAttribute) { if (javaPersistentAttribute == null) { return null; } - return JavaEmbeddedMapping.embeddableFor(javaPersistentAttribute); + return GenericJavaEmbeddedMapping.embeddableFor(javaPersistentAttribute); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java index fc2a8236ab..cb33ecf559 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java @@ -14,44 +14,44 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.INamedNativeQuery; -import org.eclipse.jpt.core.internal.context.base.INamedQuery; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; -import org.eclipse.jpt.core.internal.context.java.IJavaEntity; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaSecondaryTable; -import org.eclipse.jpt.core.internal.context.java.JavaEntity; -import org.eclipse.jpt.core.internal.resource.orm.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.IdClass; -import org.eclipse.jpt.core.internal.resource.orm.Inheritance; -import org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedQuery; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.SecondaryTable; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.NamedNativeQuery; +import org.eclipse.jpt.core.context.NamedQuery; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.InheritanceType; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaSecondaryTable; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEntity; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.IdClass; +import org.eclipse.jpt.core.resource.orm.Inheritance; +import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery; +import org.eclipse.jpt.core.resource.orm.XmlNamedQuery; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -63,7 +63,7 @@ import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity +public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implements Entity { protected String specifiedName; @@ -71,17 +71,17 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity protected String idClass; - protected final XmlTable table; + protected final GenericOrmTable table; - protected final List<XmlSecondaryTable> specifiedSecondaryTables; + protected final List<GenericOrmSecondaryTable> specifiedSecondaryTables; - protected final List<XmlSecondaryTable> virtualSecondaryTables; + protected final List<GenericOrmSecondaryTable> virtualSecondaryTables; //TODO this might need to move to IEntity, for the UI public static final String VIRTUAL_SECONDARY_TABLES_LIST = "virtualSecondaryTablesList"; - protected final List<XmlPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; + protected final List<GenericOrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; - protected final List<XmlPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns; + protected final List<GenericOrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns; protected InheritanceType specifiedInheritanceStrategy; @@ -93,61 +93,61 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity protected boolean discriminatorValueAllowed; - protected final XmlDiscriminatorColumn discriminatorColumn; + protected final GenericOrmDiscriminatorColumn discriminatorColumn; - protected XmlSequenceGenerator sequenceGenerator; + protected GenericOrmSequenceGenerator sequenceGenerator; - protected XmlTableGenerator tableGenerator; + protected GenericOrmTableGenerator tableGenerator; - protected final List<XmlAttributeOverride> specifiedAttributeOverrides; + protected final List<GenericOrmAttributeOverride> specifiedAttributeOverrides; - protected final List<XmlAttributeOverride> defaultAttributeOverrides; + protected final List<GenericOrmAttributeOverride> defaultAttributeOverrides; - protected final List<XmlAssociationOverride> specifiedAssociationOverrides; + protected final List<GenericOrmAssociationOverride> specifiedAssociationOverrides; - protected final List<XmlAssociationOverride> defaultAssociationOverrides; + protected final List<GenericOrmAssociationOverride> defaultAssociationOverrides; - protected final List<XmlNamedQuery> namedQueries; + protected final List<GenericOrmNamedQuery> namedQueries; - protected final List<XmlNamedNativeQuery> namedNativeQueries; + protected final List<GenericOrmNamedNativeQuery> namedNativeQueries; - public XmlEntity(XmlPersistentType parent) { + public GenericOrmEntity(OrmPersistentType parent) { super(parent); - this.table = new XmlTable(this); - this.specifiedSecondaryTables = new ArrayList<XmlSecondaryTable>(); - this.virtualSecondaryTables = new ArrayList<XmlSecondaryTable>(); + this.table = new GenericOrmTable(this); + this.specifiedSecondaryTables = new ArrayList<GenericOrmSecondaryTable>(); + this.virtualSecondaryTables = new ArrayList<GenericOrmSecondaryTable>(); this.discriminatorColumn = createXmlDiscriminatorColumn(); - this.specifiedPrimaryKeyJoinColumns = new ArrayList<XmlPrimaryKeyJoinColumn>(); - this.defaultPrimaryKeyJoinColumns = new ArrayList<XmlPrimaryKeyJoinColumn>(); - this.specifiedAttributeOverrides = new ArrayList<XmlAttributeOverride>(); - this.defaultAttributeOverrides = new ArrayList<XmlAttributeOverride>(); - this.specifiedAssociationOverrides = new ArrayList<XmlAssociationOverride>(); - this.defaultAssociationOverrides = new ArrayList<XmlAssociationOverride>(); - this.namedQueries = new ArrayList<XmlNamedQuery>(); - this.namedNativeQueries = new ArrayList<XmlNamedNativeQuery>(); + this.specifiedPrimaryKeyJoinColumns = new ArrayList<GenericOrmPrimaryKeyJoinColumn>(); + this.defaultPrimaryKeyJoinColumns = new ArrayList<GenericOrmPrimaryKeyJoinColumn>(); + this.specifiedAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); + this.defaultAttributeOverrides = new ArrayList<GenericOrmAttributeOverride>(); + this.specifiedAssociationOverrides = new ArrayList<GenericOrmAssociationOverride>(); + this.defaultAssociationOverrides = new ArrayList<GenericOrmAssociationOverride>(); + this.namedQueries = new ArrayList<GenericOrmNamedQuery>(); + this.namedNativeQueries = new ArrayList<GenericOrmNamedNativeQuery>(); } - protected XmlDiscriminatorColumn createXmlDiscriminatorColumn() { - return new XmlDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); + protected GenericOrmDiscriminatorColumn createXmlDiscriminatorColumn() { + return new GenericOrmDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); } - protected INamedColumn.Owner buildDiscriminatorColumnOwner() { - return new INamedColumn.Owner(){ - public Table dbTable(String tableName) { - return XmlEntity.this.dbTable(tableName); + protected NamedColumn.Owner buildDiscriminatorColumnOwner() { + return new NamedColumn.Owner(){ + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + return GenericOrmEntity.this.dbTable(tableName); } - public ITextRange validationTextRange(CompilationUnit astRoot) { - return XmlEntity.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericOrmEntity.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return XmlEntity.this; + public TypeMapping typeMapping() { + return GenericOrmEntity.this; } public String defaultColumnName() { //TODO default column name from java here or in XmlDiscriminatorColumn? - return IDiscriminatorColumn.DEFAULT_NAME; + return DiscriminatorColumn.DEFAULT_NAME; } }; } @@ -155,7 +155,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity // ******************* ITypeMapping implementation ******************** public String getKey() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } @Override @@ -164,14 +164,14 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @Override - public Table primaryDbTable() { + public org.eclipse.jpt.db.internal.Table primaryDbTable() { return getTable().dbTable(); } @Override - public Table dbTable(String tableName) { - for (Iterator<ITable> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { - Table dbTable = stream.next().dbTable(); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { + org.eclipse.jpt.db.internal.Table dbTable = stream.next().dbTable(); if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) { return dbTable; } @@ -184,10 +184,10 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return getTable().dbSchema(); } - public IJavaEntity javaEntity() { - IJavaPersistentType javaPersistentType = getJavaPersistentType(); - if (javaPersistentType != null && javaPersistentType.mappingKey() == IMappingKeys.ENTITY_TYPE_MAPPING_KEY) { - return (IJavaEntity) javaPersistentType.getMapping(); + public JavaEntity javaEntity() { + JavaPersistentType javaPersistentType = getJavaPersistentType(); + if (javaPersistentType != null && javaPersistentType.mappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { + return (JavaEntity) javaPersistentType.getMapping(); } return null; } @@ -217,12 +217,12 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity firePropertyChanged(DEFAULT_NAME_PROPERTY, oldDefaultName, newDefaultName); } - public XmlTable getTable() { + public GenericOrmTable getTable() { return this.table; } @SuppressWarnings("unchecked") - public ListIterator<XmlSecondaryTable> secondaryTables() { + public ListIterator<GenericOrmSecondaryTable> secondaryTables() { if (specifiedSecondaryTablesSize() > 0) { return specifiedSecondaryTables(); } @@ -236,63 +236,63 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return virtualSecondaryTablesSize(); } - public ListIterator<XmlSecondaryTable> virtualSecondaryTables() { - return new CloneListIterator<XmlSecondaryTable>(this.virtualSecondaryTables); + public ListIterator<GenericOrmSecondaryTable> virtualSecondaryTables() { + return new CloneListIterator<GenericOrmSecondaryTable>(this.virtualSecondaryTables); } public int virtualSecondaryTablesSize() { return this.virtualSecondaryTables.size(); } - protected void addVirtualSecondaryTable(XmlSecondaryTable secondaryTable) { - addItemToList(secondaryTable, this.virtualSecondaryTables, XmlEntity.VIRTUAL_SECONDARY_TABLES_LIST); + protected void addVirtualSecondaryTable(GenericOrmSecondaryTable secondaryTable) { + addItemToList(secondaryTable, this.virtualSecondaryTables, GenericOrmEntity.VIRTUAL_SECONDARY_TABLES_LIST); } - protected void removeVirtualSecondaryTable(XmlSecondaryTable secondaryTable) { - removeItemFromList(secondaryTable, this.virtualSecondaryTables, XmlEntity.VIRTUAL_SECONDARY_TABLES_LIST); + protected void removeVirtualSecondaryTable(GenericOrmSecondaryTable secondaryTable) { + removeItemFromList(secondaryTable, this.virtualSecondaryTables, GenericOrmEntity.VIRTUAL_SECONDARY_TABLES_LIST); } @SuppressWarnings("unchecked") - public ListIterator<XmlSecondaryTable> specifiedSecondaryTables() { - return new CloneListIterator<XmlSecondaryTable>(this.specifiedSecondaryTables); + public ListIterator<GenericOrmSecondaryTable> specifiedSecondaryTables() { + return new CloneListIterator<GenericOrmSecondaryTable>(this.specifiedSecondaryTables); } public int specifiedSecondaryTablesSize() { return this.specifiedSecondaryTables.size(); } - public XmlSecondaryTable addSpecifiedSecondaryTable(int index) { - XmlSecondaryTable secondaryTable = new XmlSecondaryTable(this); + public GenericOrmSecondaryTable addSpecifiedSecondaryTable(int index) { + GenericOrmSecondaryTable secondaryTable = new GenericOrmSecondaryTable(this); this.specifiedSecondaryTables.add(index, secondaryTable); - SecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createSecondaryTable(); + XmlSecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createSecondaryTable(); secondaryTable.initialize(secondaryTableResource); typeMappingResource().getSecondaryTables().add(index, secondaryTableResource); - fireItemAdded(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable); + fireItemAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable); return secondaryTable; } - protected void addSpecifiedSecondaryTable(int index, XmlSecondaryTable secondaryTable) { - addItemToList(index, secondaryTable, this.specifiedSecondaryTables, IEntity.SPECIFIED_SECONDARY_TABLES_LIST); + protected void addSpecifiedSecondaryTable(int index, GenericOrmSecondaryTable secondaryTable) { + addItemToList(index, secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST); } - public void removeSpecifiedSecondaryTable(ISecondaryTable secondaryTable) { + public void removeSpecifiedSecondaryTable(SecondaryTable secondaryTable) { this.removeSpecifiedSecondaryTable(this.specifiedSecondaryTables.indexOf(secondaryTable)); } public void removeSpecifiedSecondaryTable(int index) { - XmlSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index); + GenericOrmSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index); typeMappingResource().getSecondaryTables().remove(index); - fireItemRemoved(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable); + fireItemRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable); } - protected void removeSpecifiedSecondaryTable_(XmlSecondaryTable secondaryTable) { - removeItemFromList(secondaryTable, this.specifiedSecondaryTables, IEntity.SPECIFIED_SECONDARY_TABLES_LIST); + protected void removeSpecifiedSecondaryTable_(GenericOrmSecondaryTable secondaryTable) { + removeItemFromList(secondaryTable, this.specifiedSecondaryTables, Entity.SPECIFIED_SECONDARY_TABLES_LIST); } public void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedSecondaryTables, targetIndex, sourceIndex); this.typeMappingResource().getSecondaryTables().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex); } public boolean containsSecondaryTable(String name) { @@ -307,12 +307,12 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return containsSecondaryTable(name, virtualSecondaryTables()); } - public boolean containsVirtualSecondaryTable(XmlSecondaryTable secondaryTable) { + public boolean containsVirtualSecondaryTable(GenericOrmSecondaryTable secondaryTable) { return this.virtualSecondaryTables.contains(secondaryTable); } - protected boolean containsSecondaryTable(String name, ListIterator<XmlSecondaryTable> secondaryTables) { - for (XmlSecondaryTable secondaryTable : CollectionTools.iterable(secondaryTables)) { + protected boolean containsSecondaryTable(String name, ListIterator<GenericOrmSecondaryTable> secondaryTables) { + for (GenericOrmSecondaryTable secondaryTable : CollectionTools.iterable(secondaryTables)) { String secondaryTableName = secondaryTable.getName(); if (secondaryTableName != null && secondaryTableName.equals(name)) { return true; @@ -321,10 +321,10 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return false; } - protected Iterator<String> tableNames(Iterator<ITable> tables) { - return new TransformationIterator<ITable, String>(tables) { + protected Iterator<String> tableNames(Iterator<Table> tables) { + return new TransformationIterator<Table, String>(tables) { @Override - protected String transform(ITable t) { + protected String transform(Table t) { return t.getName(); } }; @@ -334,7 +334,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return this.nonNullTableNames(this.associatedTablesIncludingInherited()); } - protected Iterator<String> nonNullTableNames(Iterator<ITable> tables) { + protected Iterator<String> nonNullTableNames(Iterator<Table> tables) { return new FilteringIterator<String, String>(this.tableNames(tables)) { @Override protected boolean accept(String o) { @@ -343,18 +343,18 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity }; } - public Iterator<ITable> associatedTables() { - return new SingleElementIterator<ITable>(getTable()); + public Iterator<Table> associatedTables() { + return new SingleElementIterator<Table>(getTable()); //TODO return new CompositeIterator(this.getTable(), this.getSecondaryTables().iterator()); } - public Iterator<ITable> associatedTablesIncludingInherited() { - return new CompositeIterator<ITable>(new TransformationIterator<ITypeMapping, Iterator<ITable>>(this.inheritanceHierarchy()) { + public Iterator<Table> associatedTablesIncludingInherited() { + return new CompositeIterator<Table>(new TransformationIterator<TypeMapping, Iterator<Table>>(this.inheritanceHierarchy()) { @Override - protected Iterator<ITable> transform(ITypeMapping mapping) { - return new FilteringIterator<ITable, ITable>(mapping.associatedTables()) { + protected Iterator<Table> transform(TypeMapping mapping) { + return new FilteringIterator<Table, Table>(mapping.associatedTables()) { @Override - protected boolean accept(ITable o) { + protected boolean accept(Table o) { return true; //TODO //filtering these out so as to avoid the duplicate table, root and children share the same table @@ -423,15 +423,15 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity typeMappingResource().setInheritance(null); } - public XmlDiscriminatorColumn getDiscriminatorColumn() { + public GenericOrmDiscriminatorColumn getDiscriminatorColumn() { return this.discriminatorColumn; } - public XmlSequenceGenerator addSequenceGenerator() { + public GenericOrmSequenceGenerator addSequenceGenerator() { if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = new XmlSequenceGenerator(this); + this.sequenceGenerator = new GenericOrmSequenceGenerator(this); typeMappingResource().setSequenceGenerator(OrmFactory.eINSTANCE.createSequenceGeneratorImpl()); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; @@ -441,27 +441,27 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity if (getSequenceGenerator() == null) { throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed"); } - XmlSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + GenericOrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = null; this.typeMappingResource().setSequenceGenerator(null); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null); } - public XmlSequenceGenerator getSequenceGenerator() { + public GenericOrmSequenceGenerator getSequenceGenerator() { return this.sequenceGenerator; } - protected void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator) { - XmlSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + protected void setSequenceGenerator(GenericOrmSequenceGenerator newSequenceGenerator) { + GenericOrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = newSequenceGenerator; firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator); } - public XmlTableGenerator addTableGenerator() { + public GenericOrmTableGenerator addTableGenerator() { if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = new XmlTableGenerator(this); + this.tableGenerator = new GenericOrmTableGenerator(this); typeMappingResource().setTableGenerator(OrmFactory.eINSTANCE.createTableGeneratorImpl()); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; @@ -471,18 +471,18 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity if (getTableGenerator() == null) { throw new IllegalStateException("tableGenerator does not exist, cannot be removed"); } - XmlTableGenerator oldTableGenerator = this.tableGenerator; + GenericOrmTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = null; this.typeMappingResource().setTableGenerator(null); firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null); } - public XmlTableGenerator getTableGenerator() { + public GenericOrmTableGenerator getTableGenerator() { return this.tableGenerator; } - protected void setTableGenerator(XmlTableGenerator newTableGenerator) { - XmlTableGenerator oldTableGenerator = this.tableGenerator; + protected void setTableGenerator(GenericOrmTableGenerator newTableGenerator) { + GenericOrmTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = newTableGenerator; firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator); } @@ -519,25 +519,25 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity protected void setDiscriminatorValueAllowed(boolean newDiscriminatorValueAllowed) { boolean oldDiscriminatorValueAllowed = this.discriminatorValueAllowed; this.discriminatorValueAllowed = newDiscriminatorValueAllowed; - firePropertyChanged(IEntity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed); + firePropertyChanged(Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY, oldDiscriminatorValueAllowed, newDiscriminatorValueAllowed); } @SuppressWarnings("unchecked") - public ListIterator<XmlPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { - return new CloneListIterator<XmlPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumns); + public ListIterator<GenericOrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { + return new CloneListIterator<GenericOrmPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumns); } public int defaultPrimaryKeyJoinColumnsSize() { return this.defaultPrimaryKeyJoinColumns.size(); } - public IPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { + public PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { // TODO Auto-generated method stub return null; } @SuppressWarnings("unchecked") - public ListIterator<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns() { + public ListIterator<GenericOrmPrimaryKeyJoinColumn> primaryKeyJoinColumns() { return this.specifiedPrimaryKeyJoinColumns.isEmpty() ? this.defaultPrimaryKeyJoinColumns() : this.specifiedPrimaryKeyJoinColumns(); } @@ -546,53 +546,53 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @SuppressWarnings("unchecked") - public ListIterator<XmlPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { - return new CloneListIterator<XmlPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); + public ListIterator<GenericOrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { + return new CloneListIterator<GenericOrmPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); } public int specifiedPrimaryKeyJoinColumnsSize() { return this.specifiedPrimaryKeyJoinColumns.size(); } - public XmlPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { - XmlPrimaryKeyJoinColumn primaryKeyJoinColumn = new XmlPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + public GenericOrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { + GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn = new GenericOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); this.typeMappingResource().getPrimaryKeyJoinColumns().add(index, OrmFactory.eINSTANCE.createPrimaryKeyJoinColumn()); - this.fireItemAdded(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); + this.fireItemAdded(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); return primaryKeyJoinColumn; } - protected IAbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { + protected AbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } - protected void addSpecifiedPrimaryKeyJoinColumn(int index, XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { - addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void addSpecifiedPrimaryKeyJoinColumn(int index, GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn) { + addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } - public void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn primaryKeyJoinColumn) { + public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) { this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(primaryKeyJoinColumn)); } public void removeSpecifiedPrimaryKeyJoinColumn(int index) { - XmlPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); + GenericOrmPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); this.typeMappingResource().getPrimaryKeyJoinColumns().remove(index); - fireItemRemoved(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); + fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); } - protected void removeSpecifiedPrimaryKeyJoinColumn_(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { - removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void removeSpecifiedPrimaryKeyJoinColumn_(GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn) { + removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex); this.typeMappingResource().getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> attributeOverrides() { - return new CompositeListIterator<XmlAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); + public ListIterator<GenericOrmAttributeOverride> attributeOverrides() { + return new CompositeListIterator<GenericOrmAttributeOverride>(specifiedAttributeOverrides(), defaultAttributeOverrides()); } public int attributeOverridesSize() { @@ -600,8 +600,8 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> defaultAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.defaultAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> defaultAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.defaultAttributeOverrides); } public int defaultAttributeOverridesSize() { @@ -609,49 +609,49 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @SuppressWarnings("unchecked") - public ListIterator<XmlAttributeOverride> specifiedAttributeOverrides() { - return new CloneListIterator<XmlAttributeOverride>(this.specifiedAttributeOverrides); + public ListIterator<GenericOrmAttributeOverride> specifiedAttributeOverrides() { + return new CloneListIterator<GenericOrmAttributeOverride>(this.specifiedAttributeOverrides); } public int specifiedAttributeOverridesSize() { return this.specifiedAttributeOverrides.size(); } - public XmlAttributeOverride addSpecifiedAttributeOverride(int index) { - XmlAttributeOverride attributeOverride = new XmlAttributeOverride(this, createAttributeOverrideOwner()); + public GenericOrmAttributeOverride addSpecifiedAttributeOverride(int index) { + GenericOrmAttributeOverride attributeOverride = new GenericOrmAttributeOverride(this, createAttributeOverrideOwner()); this.specifiedAttributeOverrides.add(index, attributeOverride); this.typeMappingResource().getAttributeOverrides().add(index, OrmFactory.eINSTANCE.createAttributeOverrideImpl()); - this.fireItemAdded(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); + this.fireItemAdded(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, attributeOverride); return attributeOverride; } - protected void addSpecifiedAttributeOverride(int index, XmlAttributeOverride attributeOverride) { - addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void addSpecifiedAttributeOverride(int index, GenericOrmAttributeOverride attributeOverride) { + addItemToList(index, attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } - public void removeSpecifiedAttributeOverride(IAttributeOverride attributeOverride) { + public void removeSpecifiedAttributeOverride(AttributeOverride attributeOverride) { removeSpecifiedAttributeOverride(this.specifiedAttributeOverrides.indexOf(attributeOverride)); } public void removeSpecifiedAttributeOverride(int index) { - XmlAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); + GenericOrmAttributeOverride removedAttributeOverride = this.specifiedAttributeOverrides.remove(index); this.typeMappingResource().getAttributeOverrides().remove(index); - fireItemRemoved(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); + fireItemRemoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, index, removedAttributeOverride); } - protected void removeSpecifiedAttributeOverride_(XmlAttributeOverride attributeOverride) { - removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); + protected void removeSpecifiedAttributeOverride_(GenericOrmAttributeOverride attributeOverride) { + removeItemFromList(attributeOverride, this.specifiedAttributeOverrides, Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST); } public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); this.typeMappingResource().getAttributeOverrides().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } @SuppressWarnings("unchecked") - public ListIterator<XmlAssociationOverride> associationOverrides() { - return new CompositeListIterator<XmlAssociationOverride>(specifiedAssociationOverrides(), defaultAssociationOverrides()); + public ListIterator<GenericOrmAssociationOverride> associationOverrides() { + return new CompositeListIterator<GenericOrmAssociationOverride>(specifiedAssociationOverrides(), defaultAssociationOverrides()); } public int associationOverridesSize() { @@ -659,8 +659,8 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @SuppressWarnings("unchecked") - public ListIterator<XmlAssociationOverride> defaultAssociationOverrides() { - return new CloneListIterator<XmlAssociationOverride>(this.defaultAssociationOverrides); + public ListIterator<GenericOrmAssociationOverride> defaultAssociationOverrides() { + return new CloneListIterator<GenericOrmAssociationOverride>(this.defaultAssociationOverrides); } public int defaultAssociationOverridesSize() { @@ -668,126 +668,126 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @SuppressWarnings("unchecked") - public ListIterator<XmlAssociationOverride> specifiedAssociationOverrides() { - return new CloneListIterator<XmlAssociationOverride>(this.specifiedAssociationOverrides); + public ListIterator<GenericOrmAssociationOverride> specifiedAssociationOverrides() { + return new CloneListIterator<GenericOrmAssociationOverride>(this.specifiedAssociationOverrides); } public int specifiedAssociationOverridesSize() { return this.specifiedAssociationOverrides.size(); } - public XmlAssociationOverride addSpecifiedAssociationOverride(int index) { - XmlAssociationOverride associationOverride = new XmlAssociationOverride(this, createAssociationOverrideOwner()); + public GenericOrmAssociationOverride addSpecifiedAssociationOverride(int index) { + GenericOrmAssociationOverride associationOverride = new GenericOrmAssociationOverride(this, createAssociationOverrideOwner()); this.specifiedAssociationOverrides.add(index, associationOverride); this.typeMappingResource().getAssociationOverrides().add(index, OrmFactory.eINSTANCE.createAssociationOverride()); - this.fireItemAdded(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride); + this.fireItemAdded(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, associationOverride); return associationOverride; } - protected void addSpecifiedAssociationOverride(int index, XmlAssociationOverride associationOverride) { - addItemToList(index, associationOverride, this.specifiedAssociationOverrides, IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); + protected void addSpecifiedAssociationOverride(int index, GenericOrmAssociationOverride associationOverride) { + addItemToList(index, associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); } - public void removeSpecifiedAssociationOverride(IAssociationOverride associationOverride) { + public void removeSpecifiedAssociationOverride(AssociationOverride associationOverride) { removeSpecifiedAssociationOverride(this.specifiedAssociationOverrides.indexOf(associationOverride)); } public void removeSpecifiedAssociationOverride(int index) { - XmlAssociationOverride removedAssociationOverride = this.specifiedAssociationOverrides.remove(index); + GenericOrmAssociationOverride removedAssociationOverride = this.specifiedAssociationOverrides.remove(index); this.typeMappingResource().getAssociationOverrides().remove(index); - fireItemRemoved(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, removedAssociationOverride); + fireItemRemoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, index, removedAssociationOverride); } - protected void removeSpecifiedAssociationOverride_(XmlAssociationOverride associationOverride) { - removeItemFromList(associationOverride, this.specifiedAssociationOverrides, IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); + protected void removeSpecifiedAssociationOverride_(GenericOrmAssociationOverride associationOverride) { + removeItemFromList(associationOverride, this.specifiedAssociationOverrides, Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST); } public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex); this.typeMappingResource().getAssociationOverrides().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex); } @SuppressWarnings("unchecked") - public ListIterator<XmlNamedQuery> namedQueries() { - return new CloneListIterator<XmlNamedQuery>(this.namedQueries); + public ListIterator<GenericOrmNamedQuery> namedQueries() { + return new CloneListIterator<GenericOrmNamedQuery>(this.namedQueries); } public int namedQueriesSize() { return this.namedQueries.size(); } - public XmlNamedQuery addNamedQuery(int index) { - XmlNamedQuery namedQuery = new XmlNamedQuery(this); + public GenericOrmNamedQuery addNamedQuery(int index) { + GenericOrmNamedQuery namedQuery = new GenericOrmNamedQuery(this); this.namedQueries.add(index, namedQuery); this.typeMappingResource().getNamedQueries().add(index, OrmFactory.eINSTANCE.createNamedQuery()); - this.fireItemAdded(IEntity.NAMED_QUERIES_LIST, index, namedQuery); + this.fireItemAdded(Entity.NAMED_QUERIES_LIST, index, namedQuery); return namedQuery; } - protected void addNamedQuery(int index, XmlNamedQuery namedQuery) { - addItemToList(index, namedQuery, this.namedQueries, IEntity.NAMED_QUERIES_LIST); + protected void addNamedQuery(int index, GenericOrmNamedQuery namedQuery) { + addItemToList(index, namedQuery, this.namedQueries, Entity.NAMED_QUERIES_LIST); } - public void removeNamedQuery(INamedQuery namedQuery) { + public void removeNamedQuery(NamedQuery namedQuery) { removeNamedQuery(this.namedQueries.indexOf(namedQuery)); } public void removeNamedQuery(int index) { - XmlNamedQuery namedQuery = this.namedQueries.remove(index); + GenericOrmNamedQuery namedQuery = this.namedQueries.remove(index); this.typeMappingResource().getNamedQueries().remove(index); - fireItemRemoved(IEntity.NAMED_QUERIES_LIST, index, namedQuery); + fireItemRemoved(Entity.NAMED_QUERIES_LIST, index, namedQuery); } - protected void removeNamedQuery_(XmlNamedQuery namedQuery) { - removeItemFromList(namedQuery, this.namedQueries, IEntity.NAMED_QUERIES_LIST); + protected void removeNamedQuery_(GenericOrmNamedQuery namedQuery) { + removeItemFromList(namedQuery, this.namedQueries, Entity.NAMED_QUERIES_LIST); } public void moveNamedQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedQueries, targetIndex, sourceIndex); this.typeMappingResource().getNamedQueries().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.NAMED_QUERIES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.NAMED_QUERIES_LIST, targetIndex, sourceIndex); } @SuppressWarnings("unchecked") - public ListIterator<XmlNamedNativeQuery> namedNativeQueries() { - return new CloneListIterator<XmlNamedNativeQuery>(this.namedNativeQueries); + public ListIterator<GenericOrmNamedNativeQuery> namedNativeQueries() { + return new CloneListIterator<GenericOrmNamedNativeQuery>(this.namedNativeQueries); } public int namedNativeQueriesSize() { return this.namedNativeQueries.size(); } - public XmlNamedNativeQuery addNamedNativeQuery(int index) { - XmlNamedNativeQuery namedNativeQuery = new XmlNamedNativeQuery(this); + public GenericOrmNamedNativeQuery addNamedNativeQuery(int index) { + GenericOrmNamedNativeQuery namedNativeQuery = new GenericOrmNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); this.typeMappingResource().getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createNamedNativeQuery()); - this.fireItemAdded(IEntity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); + this.fireItemAdded(Entity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); return namedNativeQuery; } - protected void addNamedNativeQuery(int index, XmlNamedNativeQuery namedNativeQuery) { - addItemToList(index, namedNativeQuery, this.namedNativeQueries, IEntity.NAMED_NATIVE_QUERIES_LIST); + protected void addNamedNativeQuery(int index, GenericOrmNamedNativeQuery namedNativeQuery) { + addItemToList(index, namedNativeQuery, this.namedNativeQueries, Entity.NAMED_NATIVE_QUERIES_LIST); } - public void removeNamedNativeQuery(INamedNativeQuery namedNativeQuery) { + public void removeNamedNativeQuery(NamedNativeQuery namedNativeQuery) { this.removeNamedNativeQuery(this.namedNativeQueries.indexOf(namedNativeQuery)); } public void removeNamedNativeQuery(int index) { - XmlNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index); + GenericOrmNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index); this.typeMappingResource().getNamedNativeQueries().remove(index); - fireItemRemoved(IEntity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); + fireItemRemoved(Entity.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); } - protected void removeNamedNativeQuery_(XmlNamedNativeQuery namedNativeQuery) { - removeItemFromList(namedNativeQuery, this.namedNativeQueries, IEntity.NAMED_NATIVE_QUERIES_LIST); + protected void removeNamedNativeQuery_(GenericOrmNamedNativeQuery namedNativeQuery) { + removeItemFromList(namedNativeQuery, this.namedNativeQueries, Entity.NAMED_NATIVE_QUERIES_LIST); } public void moveNamedNativeQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex); this.typeMappingResource().getNamedNativeQueries().move(targetIndex, sourceIndex); - fireItemMoved(IEntity.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex); + fireItemMoved(Entity.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex); } public String getIdClass() { @@ -809,13 +809,13 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity idClassResource().setClassName(newIdClass); } } - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected void setIdClass_(String newIdClass) { String oldIdClass = this.idClass; this.idClass = newIdClass; - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected IdClass idClassResource() { @@ -830,22 +830,22 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity typeMappingResource().setIdClass(null); } - public IEntity parentEntity() { - for (Iterator<IPersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { - ITypeMapping typeMapping = i.next().getMapping(); - if (typeMapping != this && typeMapping instanceof IEntity) { - return (IEntity) typeMapping; + public Entity parentEntity() { + for (Iterator<PersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { + TypeMapping typeMapping = i.next().getMapping(); + if (typeMapping != this && typeMapping instanceof Entity) { + return (Entity) typeMapping; } } return this; } - public IEntity rootEntity() { - IEntity rootEntity = null; - for (Iterator<IPersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { - IPersistentType persistentType = i.next(); - if (persistentType.getMapping() instanceof IEntity) { - rootEntity = (IEntity) persistentType.getMapping(); + public Entity rootEntity() { + Entity rootEntity = null; + for (Iterator<PersistentType> i = persistentType().inheritanceHierarchy(); i.hasNext();) { + PersistentType persistentType = i.next(); + if (persistentType.getMapping() instanceof Entity) { + rootEntity = (Entity) persistentType.getMapping(); } } return rootEntity; @@ -889,7 +889,6 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity // - @Override public int xmlSequence() { return 1; } @@ -898,10 +897,10 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity * Return an iterator of Entities, each which inherits from the one before, * and terminates at the root entity (or at the point of cyclicity). */ - protected Iterator<ITypeMapping> inheritanceHierarchy() { - return new TransformationIterator<IPersistentType, ITypeMapping>(persistentType().inheritanceHierarchy()) { + protected Iterator<TypeMapping> inheritanceHierarchy() { + return new TransformationIterator<PersistentType, TypeMapping>(persistentType().inheritanceHierarchy()) { @Override - protected ITypeMapping transform(IPersistentType type) { + protected TypeMapping transform(PersistentType type) { return type.getMapping(); } }; @@ -909,9 +908,9 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity @Override public Iterator<String> allOverridableAttributeNames() { - return new CompositeIterator<String>(new TransformationIterator<ITypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { + return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { @Override - protected Iterator<String> transform(ITypeMapping mapping) { + protected Iterator<String> transform(TypeMapping mapping) { return mapping.overridableAttributeNames(); } }); @@ -919,9 +918,9 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity @Override public Iterator<String> allOverridableAssociationNames() { - return new CompositeIterator<String>(new TransformationIterator<ITypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { + return new CompositeIterator<String>(new TransformationIterator<TypeMapping, Iterator<String>>(this.inheritanceHierarchy()) { @Override - protected Iterator<String> transform(ITypeMapping mapping) { + protected Iterator<String> transform(TypeMapping mapping) { return mapping.overridableAssociationNames(); } }); @@ -979,7 +978,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity @Override - public void initialize(Entity entity) { + public void initialize(XmlEntity entity) { super.initialize(entity); this.specifiedName = entity.getName(); this.defaultName = this.defaultName(); @@ -1006,8 +1005,8 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity this.defaultInheritanceStrategy = this.defaultInheritanceStrategy(); } - protected void initializeSpecifiedSecondaryTables(Entity entity) { - for (SecondaryTable secondaryTable : entity.getSecondaryTables()) { + protected void initializeSpecifiedSecondaryTables(XmlEntity entity) { + for (XmlSecondaryTable secondaryTable : entity.getSecondaryTables()) { this.specifiedSecondaryTables.add(createSecondaryTable(secondaryTable)); } } @@ -1022,9 +1021,9 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity if (specifiedSecondaryTablesSize() > 0) { return; } - ListIterator<IJavaSecondaryTable> javaSecondaryTables = javaEntity().secondaryTables(); + ListIterator<JavaSecondaryTable> javaSecondaryTables = javaEntity().secondaryTables(); while(javaSecondaryTables.hasNext()) { - IJavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); + JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); if (javaSecondaryTable.getName() != null) { //TODO calling setters during initialize in createVirtualSecondaryTable //I think this is going to be a problem @@ -1033,46 +1032,46 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected void initializeTableGenerator(Entity entity) { + protected void initializeTableGenerator(XmlEntity entity) { if (entity.getTableGenerator() != null) { - this.tableGenerator = new XmlTableGenerator(this); + this.tableGenerator = new GenericOrmTableGenerator(this); this.tableGenerator.initialize(entity.getTableGenerator()); } } - protected void initializeSequenceGenerator(Entity entity) { + protected void initializeSequenceGenerator(XmlEntity entity) { if (entity.getSequenceGenerator() != null) { - this.sequenceGenerator = new XmlSequenceGenerator(this); + this.sequenceGenerator = new GenericOrmSequenceGenerator(this); this.sequenceGenerator.initialize(entity.getSequenceGenerator()); } } - protected void initializeSpecifiedPrimaryKeyJoinColumns(Entity entity) { - for (PrimaryKeyJoinColumn primaryKeyJoinColumn : entity.getPrimaryKeyJoinColumns()) { + protected void initializeSpecifiedPrimaryKeyJoinColumns(XmlEntity entity) { + for (XmlPrimaryKeyJoinColumn primaryKeyJoinColumn : entity.getPrimaryKeyJoinColumns()) { this.specifiedPrimaryKeyJoinColumns.add(createPrimaryKeyJoinColumn(primaryKeyJoinColumn)); } } - protected void initializeSpecifiedAttributeOverrides(Entity entity) { - for (AttributeOverride attributeOverride : entity.getAttributeOverrides()) { + protected void initializeSpecifiedAttributeOverrides(XmlEntity entity) { + for (XmlAttributeOverride attributeOverride : entity.getAttributeOverrides()) { this.specifiedAttributeOverrides.add(createAttributeOverride(attributeOverride)); } } - protected void initializeSpecifiedAssociationOverrides(Entity entity) { - for (AssociationOverride associationOverride : entity.getAssociationOverrides()) { + protected void initializeSpecifiedAssociationOverrides(XmlEntity entity) { + for (XmlAssociationOverride associationOverride : entity.getAssociationOverrides()) { this.specifiedAssociationOverrides.add(createAssociationOverride(associationOverride)); } } - protected void initializeNamedQueries(Entity entity) { - for (NamedQuery namedQuery : entity.getNamedQueries()) { + protected void initializeNamedQueries(XmlEntity entity) { + for (XmlNamedQuery namedQuery : entity.getNamedQueries()) { this.namedQueries.add(createNamedQuery(namedQuery)); } } - protected void initializeNamedNativeQueries(Entity entity) { - for (NamedNativeQuery namedNativeQuery : entity.getNamedNativeQueries()) { + protected void initializeNamedNativeQueries(XmlEntity entity) { + for (XmlNamedNativeQuery namedNativeQuery : entity.getNamedNativeQueries()) { this.namedNativeQueries.add(createNamedNativeQuery(namedNativeQuery)); } } @@ -1086,7 +1085,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } @Override - public void update(Entity entity) { + public void update(XmlEntity entity) { super.update(entity); this.setSpecifiedName(entity.getName()); this.setDefaultName(this.defaultName()); @@ -1132,12 +1131,12 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity this.setDefaultInheritanceStrategy(this.defaultInheritanceStrategy()); } - protected void updateSpecifiedSecondaryTables(Entity entity) { - ListIterator<XmlSecondaryTable> secondaryTables = specifiedSecondaryTables(); - ListIterator<SecondaryTable> resourceSecondaryTables = entity.getSecondaryTables().listIterator(); + protected void updateSpecifiedSecondaryTables(XmlEntity entity) { + ListIterator<GenericOrmSecondaryTable> secondaryTables = specifiedSecondaryTables(); + ListIterator<XmlSecondaryTable> resourceSecondaryTables = entity.getSecondaryTables().listIterator(); while (secondaryTables.hasNext()) { - XmlSecondaryTable secondaryTable = secondaryTables.next(); + GenericOrmSecondaryTable secondaryTable = secondaryTables.next(); if (resourceSecondaryTables.hasNext()) { secondaryTable.update(resourceSecondaryTables.next()); } @@ -1153,16 +1152,16 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity //if any secondary-tables are specified in the xml file, then all of the java secondaryTables are overriden protected void updateVirtualSecondaryTables() { - ListIterator<XmlSecondaryTable> secondaryTables = virtualSecondaryTables(); - ListIterator<IJavaSecondaryTable> javaSecondaryTables = EmptyListIterator.instance(); + ListIterator<GenericOrmSecondaryTable> secondaryTables = virtualSecondaryTables(); + ListIterator<JavaSecondaryTable> javaSecondaryTables = EmptyListIterator.instance(); if (javaEntity() != null && !isMetadataComplete() && specifiedSecondaryTablesSize() == 0) { javaSecondaryTables = javaEntity().secondaryTables(); } while (secondaryTables.hasNext()) { - XmlSecondaryTable virtualSecondaryTable = secondaryTables.next(); + GenericOrmSecondaryTable virtualSecondaryTable = secondaryTables.next(); if (javaSecondaryTables.hasNext()) { - IJavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); + JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); virtualSecondaryTable.setDefaultName(javaSecondaryTable.getName()); virtualSecondaryTable.setDefaultCatalog(javaSecondaryTable.getCatalog()); virtualSecondaryTable.setDefaultSchema(javaSecondaryTable.getSchema()); @@ -1174,19 +1173,19 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } while (javaSecondaryTables.hasNext()) { - IJavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); + JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); addVirtualSecondaryTable(createVirtualSecondaryTable(javaSecondaryTable)); } } - protected XmlSecondaryTable createSecondaryTable(SecondaryTable secondaryTable) { - XmlSecondaryTable xmlSecondaryTable = new XmlSecondaryTable(this); + protected GenericOrmSecondaryTable createSecondaryTable(XmlSecondaryTable secondaryTable) { + GenericOrmSecondaryTable xmlSecondaryTable = new GenericOrmSecondaryTable(this); xmlSecondaryTable.initialize(secondaryTable); return xmlSecondaryTable; } - protected XmlSecondaryTable createVirtualSecondaryTable(IJavaSecondaryTable javaSecondaryTable) { - XmlSecondaryTable virutalSecondaryTable = new XmlSecondaryTable(this); + protected GenericOrmSecondaryTable createVirtualSecondaryTable(JavaSecondaryTable javaSecondaryTable) { + GenericOrmSecondaryTable virutalSecondaryTable = new GenericOrmSecondaryTable(this); virutalSecondaryTable.setDefaultName(javaSecondaryTable.getName()); virutalSecondaryTable.setDefaultCatalog(javaSecondaryTable.getCatalog()); virutalSecondaryTable.setDefaultSchema(javaSecondaryTable.getSchema()); @@ -1194,7 +1193,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return virutalSecondaryTable; } - protected void updateTableGenerator(Entity entity) { + protected void updateTableGenerator(XmlEntity entity) { if (entity.getTableGenerator() == null) { if (getTableGenerator() != null) { setTableGenerator(null); @@ -1202,7 +1201,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } else { if (getTableGenerator() == null) { - setTableGenerator(new XmlTableGenerator(this)); + setTableGenerator(new GenericOrmTableGenerator(this)); getTableGenerator().initialize(entity.getTableGenerator()); } else { @@ -1211,7 +1210,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected void updateSequenceGenerator(Entity entity) { + protected void updateSequenceGenerator(XmlEntity entity) { if (entity.getSequenceGenerator() == null) { if (getSequenceGenerator() != null) { setSequenceGenerator(null); @@ -1219,7 +1218,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } else { if (getSequenceGenerator() == null) { - setSequenceGenerator(new XmlSequenceGenerator(this)); + setSequenceGenerator(new GenericOrmSequenceGenerator(this)); getSequenceGenerator().initialize(entity.getSequenceGenerator()); } else { @@ -1247,12 +1246,12 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity return rootEntity().getInheritanceStrategy(); } - protected void updateSpecifiedPrimaryKeyJoinColumns(Entity entity) { - ListIterator<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); - ListIterator<PrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = entity.getPrimaryKeyJoinColumns().listIterator(); + protected void updateSpecifiedPrimaryKeyJoinColumns(XmlEntity entity) { + ListIterator<GenericOrmPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); + ListIterator<XmlPrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = entity.getPrimaryKeyJoinColumns().listIterator(); while (primaryKeyJoinColumns.hasNext()) { - XmlPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); + GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); if (resourcePrimaryKeyJoinColumns.hasNext()) { primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next()); } @@ -1266,18 +1265,18 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected XmlPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) { - XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = new XmlPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + protected GenericOrmPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { + GenericOrmPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = new GenericOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); xmlPrimaryKeyJoinColumn.initialize(primaryKeyJoinColumn); return xmlPrimaryKeyJoinColumn; } - protected void updateSpecifiedAttributeOverrides(Entity entity) { - ListIterator<XmlAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); - ListIterator<AttributeOverride> resourceAttributeOverrides = entity.getAttributeOverrides().listIterator(); + protected void updateSpecifiedAttributeOverrides(XmlEntity entity) { + ListIterator<GenericOrmAttributeOverride> attributeOverrides = specifiedAttributeOverrides(); + ListIterator<XmlAttributeOverride> resourceAttributeOverrides = entity.getAttributeOverrides().listIterator(); while (attributeOverrides.hasNext()) { - XmlAttributeOverride attributeOverride = attributeOverrides.next(); + GenericOrmAttributeOverride attributeOverride = attributeOverrides.next(); if (resourceAttributeOverrides.hasNext()) { attributeOverride.update(resourceAttributeOverrides.next()); } @@ -1291,22 +1290,22 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected XmlAttributeOverride createAttributeOverride(AttributeOverride attributeOverride) { - XmlAttributeOverride xmlAttributeOverride = new XmlAttributeOverride(this, createAttributeOverrideOwner()); + protected GenericOrmAttributeOverride createAttributeOverride(XmlAttributeOverride attributeOverride) { + GenericOrmAttributeOverride xmlAttributeOverride = new GenericOrmAttributeOverride(this, createAttributeOverrideOwner()); xmlAttributeOverride.initialize(attributeOverride); return xmlAttributeOverride; } - protected IAttributeOverride.Owner createAttributeOverrideOwner() { + protected AttributeOverride.Owner createAttributeOverrideOwner() { return new AttributeOverrideOwner(); } - protected void updateSpecifiedAssociationOverrides(Entity entity) { - ListIterator<XmlAssociationOverride> associationOverrides = specifiedAssociationOverrides(); - ListIterator<AssociationOverride> resourceAssociationOverrides = entity.getAssociationOverrides().listIterator(); + protected void updateSpecifiedAssociationOverrides(XmlEntity entity) { + ListIterator<GenericOrmAssociationOverride> associationOverrides = specifiedAssociationOverrides(); + ListIterator<XmlAssociationOverride> resourceAssociationOverrides = entity.getAssociationOverrides().listIterator(); while (associationOverrides.hasNext()) { - XmlAssociationOverride associationOverride = associationOverrides.next(); + GenericOrmAssociationOverride associationOverride = associationOverrides.next(); if (resourceAssociationOverrides.hasNext()) { associationOverride.update(resourceAssociationOverrides.next()); } @@ -1320,22 +1319,22 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected XmlAssociationOverride createAssociationOverride(AssociationOverride associationOverride) { - XmlAssociationOverride xmlAssociationOverride = new XmlAssociationOverride(this, createAssociationOverrideOwner()); + protected GenericOrmAssociationOverride createAssociationOverride(XmlAssociationOverride associationOverride) { + GenericOrmAssociationOverride xmlAssociationOverride = new GenericOrmAssociationOverride(this, createAssociationOverrideOwner()); xmlAssociationOverride.initialize(associationOverride); return xmlAssociationOverride; } - protected IAssociationOverride.Owner createAssociationOverrideOwner() { + protected AssociationOverride.Owner createAssociationOverrideOwner() { return new AssociationOverrideOwner(); } - protected void updateNamedQueries(Entity entity) { - ListIterator<XmlNamedQuery> namedQueries = namedQueries(); - ListIterator<NamedQuery> resourceNamedQueries = entity.getNamedQueries().listIterator(); + protected void updateNamedQueries(XmlEntity entity) { + ListIterator<GenericOrmNamedQuery> namedQueries = namedQueries(); + ListIterator<XmlNamedQuery> resourceNamedQueries = entity.getNamedQueries().listIterator(); while (namedQueries.hasNext()) { - XmlNamedQuery namedQuery = namedQueries.next(); + GenericOrmNamedQuery namedQuery = namedQueries.next(); if (resourceNamedQueries.hasNext()) { namedQuery.update(resourceNamedQueries.next()); } @@ -1349,18 +1348,18 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected XmlNamedQuery createNamedQuery(NamedQuery namedQuery) { - XmlNamedQuery xmlNamedQuery = new XmlNamedQuery(this); + protected GenericOrmNamedQuery createNamedQuery(XmlNamedQuery namedQuery) { + GenericOrmNamedQuery xmlNamedQuery = new GenericOrmNamedQuery(this); xmlNamedQuery.initialize(namedQuery); return xmlNamedQuery; } - protected void updateNamedNativeQueries(Entity entity) { - ListIterator<XmlNamedNativeQuery> namedNativeQueries = namedNativeQueries(); - ListIterator<NamedNativeQuery> resourceNamedNativeQueries = entity.getNamedNativeQueries().listIterator(); + protected void updateNamedNativeQueries(XmlEntity entity) { + ListIterator<GenericOrmNamedNativeQuery> namedNativeQueries = namedNativeQueries(); + ListIterator<XmlNamedNativeQuery> resourceNamedNativeQueries = entity.getNamedNativeQueries().listIterator(); while (namedNativeQueries.hasNext()) { - XmlNamedNativeQuery namedQuery = namedNativeQueries.next(); + GenericOrmNamedNativeQuery namedQuery = namedNativeQueries.next(); if (resourceNamedNativeQueries.hasNext()) { namedQuery.update(resourceNamedNativeQueries.next()); } @@ -1374,8 +1373,8 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } } - protected XmlNamedNativeQuery createNamedNativeQuery(NamedNativeQuery namedQuery) { - XmlNamedNativeQuery xmlNamedNativeQuery = new XmlNamedNativeQuery(this); + protected GenericOrmNamedNativeQuery createNamedNativeQuery(XmlNamedNativeQuery namedQuery) { + GenericOrmNamedNativeQuery xmlNamedNativeQuery = new GenericOrmNamedNativeQuery(this); xmlNamedNativeQuery.initialize(namedQuery); return xmlNamedNativeQuery; } @@ -1385,16 +1384,16 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } public String primaryKeyColumnName() { - return JavaEntity.primaryKeyColumnName(persistentType().allAttributes()); + return GenericJavaEntity.primaryKeyColumnName(persistentType().allAttributes()); } - public IColumnMapping columnMapping(String attributeName) { + public ColumnMapping columnMapping(String attributeName) { // TODO Auto-generated method stub return null; } - public boolean isVirtual(IOverride override) { + public boolean isVirtual(BaseOverride override) { // TODO Auto-generated method stub return false; } @@ -1408,15 +1407,15 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity addIdMessages(messages, astRoot); - for (XmlSecondaryTable context : specifiedSecondaryTables) { + for (GenericOrmSecondaryTable context : specifiedSecondaryTables) { context.addToMessages(messages, astRoot); } - for (Iterator<XmlAttributeOverride> stream = this.attributeOverrides(); stream.hasNext();) { + for (Iterator<GenericOrmAttributeOverride> stream = this.attributeOverrides(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } - for (Iterator<XmlAssociationOverride> stream = this.associationOverrides(); stream.hasNext();) { + for (Iterator<GenericOrmAssociationOverride> stream = this.associationOverrides(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } @@ -1430,9 +1429,9 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity protected void addNoIdMessage(List<IMessage> messages, CompilationUnit astRoot) { if (entityHasNoId()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.ENTITY_NO_ID, + JpaValidationMessages.ENTITY_NO_ID, new String[] {this.getName()}, this, this.validationTextRange(astRoot)) ); @@ -1444,7 +1443,7 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } private boolean entityHasId() { - for (Iterator<IPersistentAttribute> stream = this.persistentType().allAttributes(); stream.hasNext(); ) { + for (Iterator<PersistentAttribute> stream = this.persistentType().allAttributes(); stream.hasNext(); ) { if (stream.next().isIdAttribute()) { return true; } @@ -1453,23 +1452,21 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return this; } - @Override - public void removeFromResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { entityMappings.getEntities().remove(this.typeMappingResource()); } - @Override - public Entity addToResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { - Entity entity = OrmFactory.eINSTANCE.createEntity(); + public XmlEntity addToResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { + XmlEntity entity = OrmFactory.eINSTANCE.createEntity(); persistentType().initialize(entity); entityMappings.getEntities().add(entity); return entity; @@ -1481,99 +1478,99 @@ public class XmlEntity extends XmlTypeMapping<Entity> implements IEntity sb.append(getName()); } - class PrimaryKeyJoinColumnOwner implements IAbstractJoinColumn.Owner + class PrimaryKeyJoinColumnOwner implements AbstractJoinColumn.Owner { - public ITextRange validationTextRange(CompilationUnit astRoot) { - return XmlEntity.this.validationTextRange(astRoot); + public TextRange validationTextRange(CompilationUnit astRoot) { + return GenericOrmEntity.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return XmlEntity.this; + public TypeMapping typeMapping() { + return GenericOrmEntity.this; } - public Table dbTable(String tableName) { - return XmlEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + return GenericOrmEntity.this.dbTable(tableName); } - public Table dbReferencedColumnTable() { - IEntity parentEntity = XmlEntity.this.parentEntity(); + public org.eclipse.jpt.db.internal.Table dbReferencedColumnTable() { + Entity parentEntity = GenericOrmEntity.this.parentEntity(); return (parentEntity == null) ? null : parentEntity.primaryDbTable(); } public int joinColumnsSize() { - return XmlEntity.this.primaryKeyJoinColumnsSize(); + return GenericOrmEntity.this.primaryKeyJoinColumnsSize(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlEntity.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericOrmEntity.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); } public String defaultColumnName() { if (joinColumnsSize() != 1) { return null; } - return XmlEntity.this.parentEntity().primaryKeyColumnName(); + return GenericOrmEntity.this.parentEntity().primaryKeyColumnName(); } } - class AttributeOverrideOwner implements IAttributeOverride.Owner { + class AttributeOverrideOwner implements AttributeOverride.Owner { - public IColumnMapping columnMapping(String attributeName) { + public ColumnMapping columnMapping(String attributeName) { if (attributeName == null) { return null; } - for (Iterator<IPersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute persAttribute = stream.next(); + for (Iterator<PersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute persAttribute = stream.next(); if (attributeName.equals(persAttribute.getName())) { - if (persAttribute.getMapping() instanceof IColumnMapping) { - return (IColumnMapping) persAttribute.getMapping(); + if (persAttribute.getMapping() instanceof ColumnMapping) { + return (ColumnMapping) persAttribute.getMapping(); } } } return null; } - public boolean isVirtual(IOverride override) { - return XmlEntity.this.defaultAttributeOverrides.contains(override); + public boolean isVirtual(BaseOverride override) { + return GenericOrmEntity.this.defaultAttributeOverrides.contains(override); } - public ITypeMapping typeMapping() { - return XmlEntity.this; + public TypeMapping typeMapping() { + return GenericOrmEntity.this; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } } - class AssociationOverrideOwner implements IAssociationOverride.Owner { + class AssociationOverrideOwner implements AssociationOverride.Owner { - public IRelationshipMapping relationshipMapping(String attributeName) { + public RelationshipMapping relationshipMapping(String attributeName) { if (attributeName == null) { return null; } - for (Iterator<IPersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute persAttribute = stream.next(); + for (Iterator<PersistentAttribute> stream = persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute persAttribute = stream.next(); if (attributeName.equals(persAttribute.getName())) { - if (persAttribute.getMapping() instanceof IRelationshipMapping) { - return (IRelationshipMapping) persAttribute.getMapping(); + if (persAttribute.getMapping() instanceof RelationshipMapping) { + return (RelationshipMapping) persAttribute.getMapping(); } } } return null; } - public boolean isVirtual(IOverride override) { - return XmlEntity.this.defaultAssociationOverrides.contains(override); + public boolean isVirtual(BaseOverride override) { + return GenericOrmEntity.this.defaultAssociationOverrides.contains(override); } - public ITypeMapping typeMapping() { - return XmlEntity.this; + public TypeMapping typeMapping() { + return GenericOrmEntity.this; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java index 379e9f281d..6599f81e4d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java @@ -10,14 +10,14 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.GenerationType; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.GeneratedValue; - -public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.GenerationType; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue; + +public class GenericOrmGeneratedValue extends AbstractJpaContextNode implements GeneratedValue { protected GenerationType specifiedStrategy; @@ -25,9 +25,9 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue protected String specifiedGenerator; protected String defaultGenerator; - protected GeneratedValue generatedValue; + protected XmlGeneratedValue generatedValue; - protected XmlGeneratedValue(IJpaContextNode parent) { + protected GenericOrmGeneratedValue(JpaContextNode parent) { super(parent); } @@ -37,7 +37,7 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue } public GenerationType getDefaultStrategy() { - return IGeneratedValue.DEFAULT_STRATEGY; + return GeneratedValue.DEFAULT_STRATEGY; } public GenerationType getSpecifiedStrategy() { @@ -88,7 +88,7 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue firePropertyChanged(SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newSpecifiedGenerator); } - public ITextRange generatorTextRange(CompilationUnit astRoot) { + public TextRange generatorTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @@ -102,7 +102,7 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue // ********** resource model -> java context model ********** - public void initialize(GeneratedValue generatedValue) { + public void initialize(XmlGeneratedValue generatedValue) { this.generatedValue = generatedValue; this.specifiedStrategy = this.strategy(generatedValue); this.specifiedGenerator = this.generator(generatedValue); @@ -110,7 +110,7 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue this.defaultGenerator = null; } - public void update(GeneratedValue generatedValue) { + public void update(XmlGeneratedValue generatedValue) { this.generatedValue = generatedValue; this.setSpecifiedStrategy_(this.strategy(generatedValue)); this.setSpecifiedGenerator_(this.generator(generatedValue)); @@ -118,11 +118,11 @@ public class XmlGeneratedValue extends JpaContextNode implements IGeneratedValue this.setDefaultGenerator(null); } - protected GenerationType strategy(GeneratedValue generatedValue) { + protected GenerationType strategy(XmlGeneratedValue generatedValue) { return GenerationType.fromOrmResourceModel(generatedValue.getStrategy()); } - protected String generator(GeneratedValue generatedValue) { + protected String generator(XmlGeneratedValue generatedValue) { return generatedValue.getGenerator(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java index b3e79b267b..98a57b164b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java @@ -10,40 +10,41 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.Id; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.orm.OrmColumnMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.db.internal.Table; -public class XmlIdMapping extends XmlAttributeMapping<Id> - implements IIdMapping, IXmlColumnMapping +public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> + implements IdMapping, OrmColumnMapping { - protected final XmlColumn column; + protected final GenericOrmColumn column; - protected XmlGeneratedValue generatedValue; + protected GenericOrmGeneratedValue generatedValue; protected TemporalType temporal; - protected XmlTableGenerator tableGenerator; - protected XmlSequenceGenerator sequenceGenerator; + protected GenericOrmTableGenerator tableGenerator; + protected GenericOrmSequenceGenerator sequenceGenerator; - protected XmlIdMapping(XmlPersistentAttribute parent) { + protected GenericOrmIdMapping(OrmPersistentAttribute parent) { super(parent); - this.column = new XmlColumn(this, this); + this.column = new GenericOrmColumn(this, this); } public String getKey() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } @Override @@ -52,19 +53,19 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlIdMapping(this); } @Override - public void initializeFromXmlColumnMapping(IXmlColumnMapping oldMapping) { + public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) { super.initializeFromXmlColumnMapping(oldMapping); setTemporal(oldMapping.getTemporal()); getColumn().initializeFrom(oldMapping.getColumn()); } - public XmlColumn getColumn() { + public GenericOrmColumn getColumn() { return this.column; } @@ -76,20 +77,20 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.attributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } protected void setTemporal_(TemporalType newTemporal) { TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } - public XmlGeneratedValue addGeneratedValue() { + public GenericOrmGeneratedValue addGeneratedValue() { if (getGeneratedValue() != null) { throw new IllegalStateException("gemeratedValue already exists"); } - this.generatedValue = new XmlGeneratedValue(this); + this.generatedValue = new GenericOrmGeneratedValue(this); this.attributeMapping().setGeneratedValue(OrmFactory.eINSTANCE.createGeneratedValueImpl()); firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue); return this.generatedValue; @@ -99,27 +100,27 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> if (getGeneratedValue() == null) { throw new IllegalStateException("gemeratedValue does not exist, cannot be removed"); } - XmlGeneratedValue oldGeneratedValue = this.generatedValue; + GenericOrmGeneratedValue oldGeneratedValue = this.generatedValue; this.generatedValue = null; this.attributeMapping().setGeneratedValue(null); firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, null); } - public XmlGeneratedValue getGeneratedValue() { + public GenericOrmGeneratedValue getGeneratedValue() { return this.generatedValue; } - protected void setGeneratedValue(XmlGeneratedValue newGeneratedValue) { - XmlGeneratedValue oldGeneratedValue = this.generatedValue; + protected void setGeneratedValue(GenericOrmGeneratedValue newGeneratedValue) { + GenericOrmGeneratedValue oldGeneratedValue = this.generatedValue; this.generatedValue = newGeneratedValue; firePropertyChanged(GENERATED_VALUE_PROPERTY, oldGeneratedValue, newGeneratedValue); } - public XmlSequenceGenerator addSequenceGenerator() { + public GenericOrmSequenceGenerator addSequenceGenerator() { if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = new XmlSequenceGenerator(this); + this.sequenceGenerator = new GenericOrmSequenceGenerator(this); this.attributeMapping().setSequenceGenerator(OrmFactory.eINSTANCE.createSequenceGeneratorImpl()); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; @@ -129,27 +130,27 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> if (getSequenceGenerator() == null) { throw new IllegalStateException("sequenceGenerator does not exist, cannot be removed"); } - XmlSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + GenericOrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = null; this.attributeMapping().setSequenceGenerator(null); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null); } - public XmlSequenceGenerator getSequenceGenerator() { + public GenericOrmSequenceGenerator getSequenceGenerator() { return this.sequenceGenerator; } - protected void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator) { - XmlSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; + protected void setSequenceGenerator(GenericOrmSequenceGenerator newSequenceGenerator) { + GenericOrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = newSequenceGenerator; firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, newSequenceGenerator); } - public XmlTableGenerator addTableGenerator() { + public GenericOrmTableGenerator addTableGenerator() { if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = new XmlTableGenerator(this); + this.tableGenerator = new GenericOrmTableGenerator(this); this.attributeMapping().setTableGenerator(OrmFactory.eINSTANCE.createTableGeneratorImpl()); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; @@ -159,18 +160,18 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> if (getTableGenerator() == null) { throw new IllegalStateException("tableGenerator does not exist, cannot be removed"); } - XmlTableGenerator oldTableGenerator = this.tableGenerator; + GenericOrmTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = null; this.attributeMapping().setTableGenerator(null); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldTableGenerator, null); } - public XmlTableGenerator getTableGenerator() { + public GenericOrmTableGenerator getTableGenerator() { return this.tableGenerator; } - protected void setTableGenerator(XmlTableGenerator newTableGenerator) { - XmlTableGenerator oldTableGenerator = this.tableGenerator; + protected void setTableGenerator(GenericOrmTableGenerator newTableGenerator) { + GenericOrmTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = newTableGenerator; firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, newTableGenerator); } @@ -192,15 +193,15 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } @Override - public Id addToResourceModel(TypeMapping typeMapping) { - Id id = OrmFactory.eINSTANCE.createIdImpl(); + public XmlId addToResourceModel(AbstractTypeMapping typeMapping) { + XmlId id = OrmFactory.eINSTANCE.createIdImpl(); persistentAttribute().initialize(id); typeMapping.getAttributes().getIds().add(id); return id; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getIds().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -219,13 +220,13 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> return typeMapping().tableName(); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @Override - public void initialize(Id id) { + public void initialize(XmlId id) { super.initialize(id); this.temporal = this.specifiedTemporal(id); this.column.initialize(id.getColumn()); @@ -234,29 +235,29 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> this.initializeGeneratedValue(id); } - protected void initializeSequenceGenerator(Id id) { + protected void initializeSequenceGenerator(XmlId id) { if (id.getSequenceGenerator() != null) { - this.sequenceGenerator = new XmlSequenceGenerator(this); + this.sequenceGenerator = new GenericOrmSequenceGenerator(this); this.sequenceGenerator.initialize(id.getSequenceGenerator()); } } - protected void initializeTableGenerator(Id id) { + protected void initializeTableGenerator(XmlId id) { if (id.getTableGenerator() != null) { - this.tableGenerator = new XmlTableGenerator(this); + this.tableGenerator = new GenericOrmTableGenerator(this); this.tableGenerator.initialize(id.getTableGenerator()); } } - protected void initializeGeneratedValue(Id id) { + protected void initializeGeneratedValue(XmlId id) { if (id.getGeneratedValue() != null) { - this.generatedValue = new XmlGeneratedValue(this); + this.generatedValue = new GenericOrmGeneratedValue(this); this.generatedValue.initialize(id.getGeneratedValue()); } } @Override - public void update(Id id) { + public void update(XmlId id) { super.update(id); this.setTemporal_(this.specifiedTemporal(id)); this.column.update(id.getColumn()); @@ -265,7 +266,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> this.updateGeneratedValue(id); } - protected void updateSequenceGenerator(Id id) { + protected void updateSequenceGenerator(XmlId id) { if (id.getSequenceGenerator() == null) { if (getSequenceGenerator() != null) { setSequenceGenerator(null); @@ -273,7 +274,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } else { if (getSequenceGenerator() == null) { - setSequenceGenerator(new XmlSequenceGenerator(this)); + setSequenceGenerator(new GenericOrmSequenceGenerator(this)); getSequenceGenerator().initialize(id.getSequenceGenerator()); } else { @@ -282,7 +283,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } } - protected void updateTableGenerator(Id id) { + protected void updateTableGenerator(XmlId id) { if (id.getTableGenerator() == null) { if (getTableGenerator() != null) { setTableGenerator(null); @@ -290,7 +291,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } else { if (getTableGenerator() == null) { - setTableGenerator(new XmlTableGenerator(this)); + setTableGenerator(new GenericOrmTableGenerator(this)); getTableGenerator().initialize(id.getTableGenerator()); } else { @@ -299,7 +300,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } } - protected void updateGeneratedValue(Id id) { + protected void updateGeneratedValue(XmlId id) { if (id.getGeneratedValue() == null) { if (getGeneratedValue() != null) { setGeneratedValue(null); @@ -307,7 +308,7 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } else { if (getGeneratedValue() == null) { - setGeneratedValue(new XmlGeneratedValue(this)); + setGeneratedValue(new GenericOrmGeneratedValue(this)); getGeneratedValue().initialize(id.getGeneratedValue()); } else { @@ -317,13 +318,13 @@ public class XmlIdMapping extends XmlAttributeMapping<Id> } - protected TemporalType specifiedTemporal(Id id) { + protected TemporalType specifiedTemporal(XmlId id) { return TemporalType.fromOrmResourceModel(id.getTemporal()); } //***************** IXmlColumn.Owner implementation **************** - public Column columnResource() { + public XmlColumn columnResource() { return this.attributeMapping().getColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java index 3a54a4e6ef..1d908e3812 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java @@ -10,27 +10,27 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; -public class XmlJoinColumn extends AbstractXmlColumn<JoinColumn> implements IJoinColumn +public class GenericOrmJoinColumn extends AbstractOrmColumn<XmlJoinColumn> implements JoinColumn { protected String specifiedReferencedColumnName; protected String defaultReferencedColumnName; - protected JoinColumn joinColumn; + protected XmlJoinColumn joinColumn; - protected XmlJoinColumn(IJpaContextNode parent, IJoinColumn.Owner owner) { + protected GenericOrmJoinColumn(JpaContextNode parent, JoinColumn.Owner owner) { super(parent, owner); } - public void initializeFrom(IJoinColumn oldColumn) { + public void initializeFrom(JoinColumn oldColumn) { super.initializeFrom(oldColumn); setSpecifiedReferencedColumnName(oldColumn.getSpecifiedReferencedColumnName()); } @@ -71,8 +71,8 @@ public class XmlJoinColumn extends AbstractXmlColumn<JoinColumn> implements IJoi } @Override - public IJoinColumn.Owner owner() { - return (IJoinColumn.Owner) this.owner; + public JoinColumn.Owner owner() { + return (JoinColumn.Owner) this.owner; } public Table dbReferencedColumnTable() { @@ -103,7 +103,7 @@ public class XmlJoinColumn extends AbstractXmlColumn<JoinColumn> implements IJoi // } @Override - protected JoinColumn columnResource() { + protected XmlJoinColumn columnResource() { return this.joinColumn; } @@ -119,14 +119,14 @@ public class XmlJoinColumn extends AbstractXmlColumn<JoinColumn> implements IJoi //when the XmlJoinColumn is removed/added to the XmlEntity collection } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @Override - protected void initialize(JoinColumn column) { + protected void initialize(XmlJoinColumn column) { this.joinColumn = column; super.initialize(column); this.specifiedReferencedColumnName = column.getReferencedColumnName(); @@ -134,7 +134,7 @@ public class XmlJoinColumn extends AbstractXmlColumn<JoinColumn> implements IJoi } @Override - protected void update(JoinColumn column) { + protected void update(XmlJoinColumn column) { this.joinColumn = column; super.update(column); this.setSpecifiedReferencedColumnName_(column.getReferencedColumnName()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java index c487b497f4..8fea28157d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java @@ -13,63 +13,62 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.JoinTable; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping; -import org.eclipse.jpt.db.internal.Table; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public class XmlJoinTable extends AbstractXmlTable implements IJoinTable +public class GenericOrmJoinTable extends AbstractOrmTable implements JoinTable { - protected final List<XmlJoinColumn> specifiedJoinColumns; + protected final List<GenericOrmJoinColumn> specifiedJoinColumns; - protected final List<XmlJoinColumn> defaultJoinColumns; + protected final List<GenericOrmJoinColumn> defaultJoinColumns; - protected final List<XmlJoinColumn> specifiedInverseJoinColumns; + protected final List<GenericOrmJoinColumn> specifiedInverseJoinColumns; - protected final List<XmlJoinColumn> defaultInverseJoinColumns; + protected final List<GenericOrmJoinColumn> defaultInverseJoinColumns; - protected RelationshipMapping relationshipMappingResource; + protected XmlRelationshipMapping relationshipMappingResource; - protected XmlJoinTable(XmlRelationshipMapping<? extends RelationshipMapping> parent) { + protected GenericOrmJoinTable(AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> parent) { super(parent); - this.specifiedJoinColumns = new ArrayList<XmlJoinColumn>(); - this.defaultJoinColumns = new ArrayList<XmlJoinColumn>(); - this.specifiedInverseJoinColumns = new ArrayList<XmlJoinColumn>(); - this.defaultInverseJoinColumns = new ArrayList<XmlJoinColumn>(); + this.specifiedJoinColumns = new ArrayList<GenericOrmJoinColumn>(); + this.defaultJoinColumns = new ArrayList<GenericOrmJoinColumn>(); + this.specifiedInverseJoinColumns = new ArrayList<GenericOrmJoinColumn>(); + this.defaultInverseJoinColumns = new ArrayList<GenericOrmJoinColumn>(); } @Override - public XmlRelationshipMapping<? extends RelationshipMapping> parent() { - return (XmlRelationshipMapping<? extends RelationshipMapping>) super.parent(); + public AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> parent() { + return (AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping>) super.parent(); } - public void initializeFrom(IJoinTable oldJoinTable) { + public void initializeFrom(JoinTable oldJoinTable) { super.initializeFrom(oldJoinTable); int index = 0; - for (IJoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedJoinColumns())) { - XmlJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++); + for (JoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedJoinColumns())) { + GenericOrmJoinColumn newJoinColumn = addSpecifiedJoinColumn(index++); newJoinColumn.initializeFrom(joinColumn); } index = 0; - for (IJoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedInverseJoinColumns())) { - XmlJoinColumn newJoinColumn = addSpecifiedInverseJoinColumn(index++); + for (JoinColumn joinColumn : CollectionTools.iterable(oldJoinTable.specifiedInverseJoinColumns())) { + GenericOrmJoinColumn newJoinColumn = addSpecifiedInverseJoinColumn(index++); newJoinColumn.initializeFrom(joinColumn); } } @@ -93,11 +92,11 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable if (tableName == null) { return null; } - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); if (targetEntity == null) { return null; } - ITable targetTable = targetEntity.getTable(); + Table targetTable = targetEntity.getTable(); return (targetTable == null) ? null : tableName + "_" + targetTable.getName(); } @@ -110,7 +109,7 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } - protected IEntity targetEntity() { + protected Entity targetEntity() { // String targetEntity = relationshipMapping().fullyQualifiedTargetEntity(defaultsContext.astRoot()); // if (targetEntity == null) { // return null; @@ -139,7 +138,7 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } @Override - protected JoinTable table() { + protected XmlJoinTable table() { return this.relationshipMappingResource.getJoinTable(); } @@ -147,7 +146,7 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> joinColumns() { + public ListIterator<GenericOrmJoinColumn> joinColumns() { return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumns() : this.specifiedJoinColumns(); } @@ -155,14 +154,14 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return this.specifiedJoinColumns.isEmpty() ? this.defaultJoinColumnsSize() : this.specifiedJoinColumnsSize(); } - public IJoinColumn getDefaultJoinColumn() { + public JoinColumn getDefaultJoinColumn() { // TODO Auto-generated method stub return null; } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> defaultJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.defaultJoinColumns); + public ListIterator<GenericOrmJoinColumn> defaultJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.defaultJoinColumns); } public int defaultJoinColumnsSize() { @@ -170,8 +169,8 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> specifiedJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.specifiedJoinColumns); + public ListIterator<GenericOrmJoinColumn> specifiedJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.specifiedJoinColumns); } public int specifiedJoinColumnsSize() { @@ -182,49 +181,49 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return !this.specifiedJoinColumns.isEmpty(); } - public XmlJoinColumn addSpecifiedJoinColumn(int index) { + public GenericOrmJoinColumn addSpecifiedJoinColumn(int index) { if (table() == null) { addTableResource(); } - XmlJoinColumn joinColumn = new XmlJoinColumn(this, new JoinColumnOwner()); + GenericOrmJoinColumn joinColumn = new GenericOrmJoinColumn(this, new JoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); this.table().getJoinColumns().add(index, OrmFactory.eINSTANCE.createJoinColumnImpl()); - this.fireItemAdded(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } - protected void addSpecifiedJoinColumn(int index, XmlJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedJoinColumns, IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST); + protected void addSpecifiedJoinColumn(int index, GenericOrmJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST); } public void removeSpecifiedJoinColumn(int index) { - XmlJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); + GenericOrmJoinColumn removedJoinColumn = this.specifiedJoinColumns.remove(index); this.table().getJoinColumns().remove(index); - fireItemRemoved(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, index, removedJoinColumn); } - public void removeSpecifiedJoinColumn(IJoinColumn joinColumn) { + public void removeSpecifiedJoinColumn(JoinColumn joinColumn) { // TODO Auto-generated method stub } - public void removeSpecifiedInverseJoinColumn(IJoinColumn joinColumn) { + public void removeSpecifiedInverseJoinColumn(JoinColumn joinColumn) { // TODO Auto-generated method stub } - protected void removeSpecifiedJoinColumn(XmlJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedJoinColumns, IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST); + protected void removeSpecifiedJoinColumn(GenericOrmJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedJoinColumns, JoinTable.SPECIFIED_JOIN_COLUMNS_LIST); } public void moveSpecifiedJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedJoinColumns, targetIndex, sourceIndex); this.table().getJoinColumns().move(targetIndex, sourceIndex); - fireItemMoved(IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTable.SPECIFIED_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> inverseJoinColumns() { + public ListIterator<GenericOrmJoinColumn> inverseJoinColumns() { return this.specifiedInverseJoinColumns.isEmpty() ? this.defaultInverseJoinColumns() : this.specifiedInverseJoinColumns(); } @@ -232,14 +231,14 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return this.specifiedInverseJoinColumns.isEmpty() ? this.defaultInverseJoinColumnsSize() : this.specifiedInverseJoinColumnsSize(); } - public IJoinColumn getDefaultInverseJoinColumn() { + public JoinColumn getDefaultInverseJoinColumn() { // TODO Auto-generated method stub return null; } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> defaultInverseJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.defaultInverseJoinColumns); + public ListIterator<GenericOrmJoinColumn> defaultInverseJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.defaultInverseJoinColumns); } public int defaultInverseJoinColumnsSize() { @@ -247,8 +246,8 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } @SuppressWarnings("unchecked") - public ListIterator<XmlJoinColumn> specifiedInverseJoinColumns() { - return new CloneListIterator<XmlJoinColumn>(this.specifiedInverseJoinColumns); + public ListIterator<GenericOrmJoinColumn> specifiedInverseJoinColumns() { + return new CloneListIterator<GenericOrmJoinColumn>(this.specifiedInverseJoinColumns); } public int specifiedInverseJoinColumnsSize() { @@ -259,39 +258,39 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return !this.specifiedInverseJoinColumns.isEmpty(); } - public XmlJoinColumn addSpecifiedInverseJoinColumn(int index) { + public GenericOrmJoinColumn addSpecifiedInverseJoinColumn(int index) { if (table() == null) { addTableResource(); } - XmlJoinColumn joinColumn = new XmlJoinColumn(this, new InverseJoinColumnOwner()); + GenericOrmJoinColumn joinColumn = new GenericOrmJoinColumn(this, new InverseJoinColumnOwner()); this.specifiedInverseJoinColumns.add(index, joinColumn); this.table().getInverseJoinColumns().add(index, OrmFactory.eINSTANCE.createJoinColumnImpl()); - this.fireItemAdded(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, joinColumn); + this.fireItemAdded(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } - protected void addSpecifiedInverseJoinColumn(int index, XmlJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.specifiedInverseJoinColumns, IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); + protected void addSpecifiedInverseJoinColumn(int index, GenericOrmJoinColumn joinColumn) { + addItemToList(index, joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); } public void removeSpecifiedInverseJoinColumn(int index) { - XmlJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index); + GenericOrmJoinColumn removedJoinColumn = this.specifiedInverseJoinColumns.remove(index); this.table().getInverseJoinColumns().remove(index); - fireItemRemoved(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn); + fireItemRemoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, index, removedJoinColumn); } - protected void removeSpecifiedInverseJoinColumn(XmlJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); + protected void removeSpecifiedInverseJoinColumn(GenericOrmJoinColumn joinColumn) { + removeItemFromList(joinColumn, this.specifiedInverseJoinColumns, JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST); } public void moveSpecifiedInverseJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedInverseJoinColumns, targetIndex, sourceIndex); this.table().getInverseJoinColumns().move(targetIndex, sourceIndex); - fireItemMoved(IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } - public XmlRelationshipMapping<? extends RelationshipMapping> relationshipMapping() { + public AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> relationshipMapping() { return parent(); } @@ -317,55 +316,55 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } - public void initialize(RelationshipMapping relationshipMapping) { + public void initialize(XmlRelationshipMapping relationshipMapping) { this.relationshipMappingResource = relationshipMapping; this.initialize(this.table()); } - public void update(RelationshipMapping relationshipMapping) { + public void update(XmlRelationshipMapping relationshipMapping) { this.relationshipMappingResource = relationshipMapping; this.update(this.table()); } - protected void initialize(JoinTable joinTable) { + protected void initialize(XmlJoinTable joinTable) { super.initialize(joinTable); this.initializeSpecifiedJoinColumns(joinTable); this.initializeSpecifiedInverseJoinColumns(joinTable); } - protected void initializeSpecifiedJoinColumns(JoinTable joinTable) { + protected void initializeSpecifiedJoinColumns(XmlJoinTable joinTable) { if (joinTable == null) { return; } - for (JoinColumn joinColumn : joinTable.getJoinColumns()) { + for (XmlJoinColumn joinColumn : joinTable.getJoinColumns()) { this.specifiedJoinColumns.add(createJoinColumn(joinColumn)); } } - protected void initializeSpecifiedInverseJoinColumns(JoinTable joinTable) { + protected void initializeSpecifiedInverseJoinColumns(XmlJoinTable joinTable) { if (joinTable == null) { return; } - for (JoinColumn joinColumn : joinTable.getInverseJoinColumns()) { + for (XmlJoinColumn joinColumn : joinTable.getInverseJoinColumns()) { this.specifiedInverseJoinColumns.add(createInverseJoinColumn(joinColumn)); } } - protected void update(JoinTable joinTable) { + protected void update(XmlJoinTable joinTable) { super.update(joinTable); this.updateSpecifiedJoinColumns(joinTable); this.updateSpecifiedInverseJoinColumns(joinTable); } - protected void updateSpecifiedJoinColumns(JoinTable joinTable) { - ListIterator<XmlJoinColumn> joinColumns = specifiedJoinColumns(); - ListIterator<JoinColumn> resourceJoinColumns = EmptyListIterator.instance(); + protected void updateSpecifiedJoinColumns(XmlJoinTable joinTable) { + ListIterator<GenericOrmJoinColumn> joinColumns = specifiedJoinColumns(); + ListIterator<XmlJoinColumn> resourceJoinColumns = EmptyListIterator.instance(); if (joinTable != null) { resourceJoinColumns = joinTable.getJoinColumns().listIterator(); } while (joinColumns.hasNext()) { - XmlJoinColumn joinColumn = joinColumns.next(); + GenericOrmJoinColumn joinColumn = joinColumns.next(); if (resourceJoinColumns.hasNext()) { joinColumn.update(resourceJoinColumns.next()); } @@ -379,15 +378,15 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } } - protected void updateSpecifiedInverseJoinColumns(JoinTable joinTable) { - ListIterator<XmlJoinColumn> inverseJoinColumns = specifiedInverseJoinColumns(); - ListIterator<JoinColumn> resourceInverseJoinColumns = EmptyListIterator.instance(); + protected void updateSpecifiedInverseJoinColumns(XmlJoinTable joinTable) { + ListIterator<GenericOrmJoinColumn> inverseJoinColumns = specifiedInverseJoinColumns(); + ListIterator<XmlJoinColumn> resourceInverseJoinColumns = EmptyListIterator.instance(); if (joinTable != null) { resourceInverseJoinColumns = joinTable.getInverseJoinColumns().listIterator(); } while (inverseJoinColumns.hasNext()) { - XmlJoinColumn joinColumn = inverseJoinColumns.next(); + GenericOrmJoinColumn joinColumn = inverseJoinColumns.next(); if (resourceInverseJoinColumns.hasNext()) { joinColumn.update(resourceInverseJoinColumns.next()); } @@ -401,14 +400,14 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } } - protected XmlJoinColumn createJoinColumn(JoinColumn joinColumn) { - XmlJoinColumn xmlJoinColumn = new XmlJoinColumn(this, new JoinColumnOwner()); + protected GenericOrmJoinColumn createJoinColumn(XmlJoinColumn joinColumn) { + GenericOrmJoinColumn xmlJoinColumn = new GenericOrmJoinColumn(this, new JoinColumnOwner()); xmlJoinColumn.initialize(joinColumn); return xmlJoinColumn; } - protected XmlJoinColumn createInverseJoinColumn(JoinColumn joinColumn) { - XmlJoinColumn xmlJoinColumn = new XmlJoinColumn(this, new InverseJoinColumnOwner()); + protected GenericOrmJoinColumn createInverseJoinColumn(XmlJoinColumn joinColumn) { + GenericOrmJoinColumn xmlJoinColumn = new GenericOrmJoinColumn(this, new InverseJoinColumnOwner()); xmlJoinColumn.initialize(joinColumn); return xmlJoinColumn; } @@ -416,17 +415,17 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable /** * just a little common behavior */ - abstract class AbstractJoinColumnOwner implements IJoinColumn.Owner + abstract class AbstractJoinColumnOwner implements JoinColumn.Owner { AbstractJoinColumnOwner() { super(); } - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return relationshipMapping().typeMapping(); } - public IRelationshipMapping relationshipMapping() { - return XmlJoinTable.this.relationshipMapping(); + public RelationshipMapping relationshipMapping() { + return GenericOrmJoinTable.this.relationshipMapping(); } /** @@ -448,11 +447,11 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable // return this.joinTable.validationTextRange(); // } - public Table dbTable(String tableName) { - if (XmlJoinTable.this.getName() == null) { + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + if (GenericOrmJoinTable.this.getName() == null) { return null; } - return (XmlJoinTable.this.getName().equals(tableName)) ? XmlJoinTable.this.dbTable() : null; + return (GenericOrmJoinTable.this.getName().equals(tableName)) ? GenericOrmJoinTable.this.dbTable() : null; } } @@ -467,31 +466,31 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable super(); } - public IEntity targetEntity() { - return XmlJoinTable.this.relationshipMapping().getResolvedTargetEntity(); + public Entity targetEntity() { + return GenericOrmJoinTable.this.relationshipMapping().getResolvedTargetEntity(); } public String attributeName() { - return XmlJoinTable.this.relationshipMapping().getName(); + return GenericOrmJoinTable.this.relationshipMapping().getName(); } @Override - public Table dbTable(String tableName) { - Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + org.eclipse.jpt.db.internal.Table dbTable = super.dbTable(tableName); if (dbTable != null) { return dbTable; } - IEntity targetEntity = targetEntity(); + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.dbTable(tableName); } - public Table dbReferencedColumnTable() { - IEntity targetEntity = targetEntity(); + public org.eclipse.jpt.db.internal.Table dbReferencedColumnTable() { + Entity targetEntity = targetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlJoinTable.this.defaultInverseJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericOrmJoinTable.this.defaultInverseJoinColumns.contains(joinColumn); } public String defaultColumnName() { @@ -504,13 +503,13 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return null; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } public int joinColumnsSize() { - return XmlJoinTable.this.inverseJoinColumnsSize(); + return GenericOrmJoinTable.this.inverseJoinColumnsSize(); } } @@ -526,21 +525,21 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable super(); } - public IEntity targetEntity() { - return XmlJoinTable.this.relationshipMapping().getEntity(); + public Entity targetEntity() { + return GenericOrmJoinTable.this.relationshipMapping().getEntity(); } public String attributeName() { - IEntity targetEntity = XmlJoinTable.this.relationshipMapping().getResolvedTargetEntity(); + Entity targetEntity = GenericOrmJoinTable.this.relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; } - String attributeName = XmlJoinTable.this.relationshipMapping().getName(); - for (Iterator<IPersistentAttribute> stream = targetEntity.persistentType().allAttributes(); stream.hasNext();) { - IPersistentAttribute attribute = stream.next(); - IAttributeMapping mapping = attribute.getMapping(); - if (mapping instanceof INonOwningMapping) { - String mappedBy = ((INonOwningMapping) mapping).getMappedBy(); + String attributeName = GenericOrmJoinTable.this.relationshipMapping().getName(); + for (Iterator<PersistentAttribute> stream = targetEntity.persistentType().allAttributes(); stream.hasNext();) { + PersistentAttribute attribute = stream.next(); + AttributeMapping mapping = attribute.getMapping(); + if (mapping instanceof NonOwningMapping) { + String mappedBy = ((NonOwningMapping) mapping).getMappedBy(); if ((mappedBy != null) && mappedBy.equals(attributeName)) { return attribute.getName(); } @@ -550,20 +549,20 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable } @Override - public Table dbTable(String tableName) { - Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.internal.Table dbTable(String tableName) { + org.eclipse.jpt.db.internal.Table dbTable = super.dbTable(tableName); if (dbTable != null) { return dbTable; } return typeMapping().dbTable(tableName); } - public Table dbReferencedColumnTable() { + public org.eclipse.jpt.db.internal.Table dbReferencedColumnTable() { return typeMapping().primaryDbTable(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlJoinTable.this.defaultJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericOrmJoinTable.this.defaultJoinColumns.contains(joinColumn); } public String defaultColumnName() { @@ -576,13 +575,13 @@ public class XmlJoinTable extends AbstractXmlTable implements IJoinTable return null; } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } public int joinColumnsSize() { - return XmlJoinTable.this.joinColumnsSize(); + return GenericOrmJoinTable.this.joinColumnsSize(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java index 12e1f71178..acd0a452f5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java @@ -9,34 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.ManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlManyToMany; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlManyToManyMapping extends XmlMultiRelationshipMapping<ManyToMany> - implements IManyToManyMapping +public class GenericOrmManyToManyMapping extends AbstractOrmMultiRelationshipMapping<XmlManyToMany> + implements ManyToManyMapping { - protected XmlManyToManyMapping(XmlPersistentAttribute parent) { + protected GenericOrmManyToManyMapping(OrmPersistentAttribute parent) { super(parent); } public String getKey() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlManyToManyMapping(this); } @Override - public void initializeFromXmlNonOwningMapping(INonOwningMapping oldMapping) { + public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) { super.initializeFromXmlNonOwningMapping(oldMapping); setMappedBy(oldMapping.getMappedBy()); } @@ -48,21 +48,21 @@ public class XmlManyToManyMapping extends XmlMultiRelationshipMapping<ManyToMany // ********** INonOwningMapping implementation ********** @Override - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); } @Override - public ManyToMany addToResourceModel(TypeMapping typeMapping) { - ManyToMany manyToMany = OrmFactory.eINSTANCE.createManyToManyImpl(); + public XmlManyToMany addToResourceModel(AbstractTypeMapping typeMapping) { + XmlManyToMany manyToMany = OrmFactory.eINSTANCE.createManyToManyImpl(); persistentAttribute().initialize(manyToMany); typeMapping.getAttributes().getManyToManys().add(manyToMany); return manyToMany; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getManyToManys().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java index c6f413bc4c..a35a0d480c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java @@ -10,19 +10,19 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.ManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlManyToOne; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlManyToOneMapping extends XmlSingleRelationshipMapping<ManyToOne> - implements IManyToOneMapping +public class GenericOrmManyToOneMapping extends AbstractOrmSingleRelationshipMapping<XmlManyToOne> + implements ManyToOneMapping { - protected XmlManyToOneMapping(XmlPersistentAttribute parent) { + protected GenericOrmManyToOneMapping(OrmPersistentAttribute parent) { super(parent); } @@ -32,7 +32,7 @@ public class XmlManyToOneMapping extends XmlSingleRelationshipMapping<ManyToOne> } public String getKey() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } //ManyToOne mapping is always the owning side @@ -41,7 +41,7 @@ public class XmlManyToOneMapping extends XmlSingleRelationshipMapping<ManyToOne> } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlManyToOneMapping(this); } @@ -52,15 +52,15 @@ public class XmlManyToOneMapping extends XmlSingleRelationshipMapping<ManyToOne> @Override - public ManyToOne addToResourceModel(TypeMapping typeMapping) { - ManyToOne manyToOne = OrmFactory.eINSTANCE.createManyToOneImpl(); + public XmlManyToOne addToResourceModel(AbstractTypeMapping typeMapping) { + XmlManyToOne manyToOne = OrmFactory.eINSTANCE.createManyToOneImpl(); persistentAttribute().initialize(manyToOne); typeMapping.getAttributes().getManyToOnes().add(manyToOne); return manyToOne; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getManyToOnes().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -69,20 +69,20 @@ public class XmlManyToOneMapping extends XmlSingleRelationshipMapping<ManyToOne> @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> joinColumns() { + public ListIterator<GenericOrmJoinColumn> joinColumns() { return super.joinColumns(); } @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> specifiedJoinColumns() { + public ListIterator<GenericOrmJoinColumn> specifiedJoinColumns() { // TODO Auto-generated method stub return super.specifiedJoinColumns(); } @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> defaultJoinColumns() { + public ListIterator<GenericOrmJoinColumn> defaultJoinColumns() { // TODO Auto-generated method stub return super.defaultJoinColumns(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java index 34956c24e7..72283808a6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java @@ -10,26 +10,27 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.core.internal.resource.orm.EntityMappings; -import org.eclipse.jpt.core.internal.resource.orm.IdClass; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.resource.orm.EntityMappings; +import org.eclipse.jpt.core.resource.orm.IdClass; +import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> - implements IMappedSuperclass +public class GenericOrmMappedSuperclass extends AbstractOrmTypeMapping<XmlMappedSuperclass> + implements MappedSuperclass { protected String idClass; - public XmlMappedSuperclass(XmlPersistentType parent) { + public GenericOrmMappedSuperclass(OrmPersistentType parent) { super(parent); } @@ -52,13 +53,13 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> idClassResource().setClassName(newIdClass); } } - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected void setIdClass_(String newIdClass) { String oldIdClass = this.idClass; this.idClass = newIdClass; - firePropertyChanged(IEntity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); + firePropertyChanged(Entity.ID_CLASS_PROPERTY, oldIdClass, newIdClass); } protected IdClass idClassResource() { @@ -74,7 +75,7 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> } public String getKey() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } public boolean tableNameIsInvalid(String tableName) { @@ -85,11 +86,11 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> return EmptyIterator.instance(); } - public Iterator<ITable> associatedTables() { + public Iterator<Table> associatedTables() { return EmptyIterator.instance(); } - public Iterator<ITable> associatedTablesIncludingInherited() { + public Iterator<Table> associatedTablesIncludingInherited() { return EmptyIterator.instance(); } @@ -98,10 +99,10 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> return this.namesOf(this.overridableAttributes()); } - public Iterator<IPersistentAttribute> overridableAttributes() { - return new FilteringIterator<XmlPersistentAttribute, IPersistentAttribute>(this.persistentType().attributes()) { + public Iterator<PersistentAttribute> overridableAttributes() { + return new FilteringIterator<OrmPersistentAttribute, PersistentAttribute>(this.persistentType().attributes()) { @Override - protected boolean accept(XmlPersistentAttribute o) { + protected boolean accept(OrmPersistentAttribute o) { return o.isOverridableAttribute(); } }; @@ -112,41 +113,38 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> return this.namesOf(this.overridableAssociations()); } - public Iterator<IPersistentAttribute> overridableAssociations() { - return new FilteringIterator<XmlPersistentAttribute, IPersistentAttribute>(this.persistentType().attributes()) { + public Iterator<PersistentAttribute> overridableAssociations() { + return new FilteringIterator<OrmPersistentAttribute, PersistentAttribute>(this.persistentType().attributes()) { @Override - protected boolean accept(XmlPersistentAttribute o) { + protected boolean accept(OrmPersistentAttribute o) { return o.isOverridableAssociation(); } }; } - private Iterator<String> namesOf(Iterator<IPersistentAttribute> attributes) { - return new TransformationIterator<IPersistentAttribute, String>(attributes) { + private Iterator<String> namesOf(Iterator<PersistentAttribute> attributes) { + return new TransformationIterator<PersistentAttribute, String>(attributes) { @Override - protected String transform(IPersistentAttribute attribute) { + protected String transform(PersistentAttribute attribute) { return attribute.getName(); } }; } - @Override public int xmlSequence() { return 0; } - protected Boolean metadataComplete(MappedSuperclass mappedSuperclass) { + protected Boolean metadataComplete(XmlMappedSuperclass mappedSuperclass) { return mappedSuperclass.getMetadataComplete(); } - @Override - public void removeFromResourceModel(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void removeFromResourceModel(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { entityMappings.getMappedSuperclasses().remove(this.typeMappingResource()); } - @Override - public MappedSuperclass addToResourceModel(EntityMappings entityMappings) { - MappedSuperclass mappedSuperclass = OrmFactory.eINSTANCE.createMappedSuperclass(); + public XmlMappedSuperclass addToResourceModel(EntityMappings entityMappings) { + XmlMappedSuperclass mappedSuperclass = OrmFactory.eINSTANCE.createMappedSuperclass(); persistentType().initialize(mappedSuperclass); entityMappings.getMappedSuperclasses().add(mappedSuperclass); return mappedSuperclass; @@ -155,7 +153,7 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> @Override - public void initialize(MappedSuperclass mappedSuperclass) { + public void initialize(XmlMappedSuperclass mappedSuperclass) { super.initialize(mappedSuperclass); this.initializeIdClass(this.idClassResource()); } @@ -165,7 +163,7 @@ public class XmlMappedSuperclass extends XmlTypeMapping<MappedSuperclass> } @Override - public void update(MappedSuperclass mappedSuperclass) { + public void update(XmlMappedSuperclass mappedSuperclass) { super.update(mappedSuperclass); this.updateIdClass(this.idClassResource()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedNativeQuery.java index 63a70a761d..8afb0df6a7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedNativeQuery.java @@ -10,13 +10,13 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.INamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.NamedNativeQuery; +import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery; -public class XmlNamedNativeQuery extends AbstractXmlQuery<NamedNativeQuery> - implements INamedNativeQuery +public class GenericOrmNamedNativeQuery extends AbstractOrmQuery<XmlNamedNativeQuery> + implements NamedNativeQuery { protected String resultClass; @@ -24,7 +24,7 @@ public class XmlNamedNativeQuery extends AbstractXmlQuery<NamedNativeQuery> protected String resultSetMapping; - protected XmlNamedNativeQuery(IJpaContextNode parent) { + protected GenericOrmNamedNativeQuery(JpaContextNode parent) { super(parent); } @@ -36,7 +36,7 @@ public class XmlNamedNativeQuery extends AbstractXmlQuery<NamedNativeQuery> String oldResultClass = this.resultClass; this.resultClass = newResultClass; queryResource().setResultClass(newResultClass); - firePropertyChanged(INamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass); + firePropertyChanged(NamedNativeQuery.RESULT_CLASS_PROPERTY, oldResultClass, newResultClass); } public String getResultSetMapping() { @@ -47,19 +47,19 @@ public class XmlNamedNativeQuery extends AbstractXmlQuery<NamedNativeQuery> String oldResultSetMapping = this.resultSetMapping; this.resultSetMapping = newResultSetMapping; queryResource().setResultSetMapping(newResultSetMapping); - firePropertyChanged(INamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping); + firePropertyChanged(NamedNativeQuery.RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping); } @Override - public void initialize(NamedNativeQuery queryResource) { + public void initialize(XmlNamedNativeQuery queryResource) { super.initialize(queryResource); this.resultClass = queryResource.getResultClass(); this.resultSetMapping = queryResource.getResultSetMapping(); } @Override - public void update(NamedNativeQuery queryResource) { + public void update(XmlNamedNativeQuery queryResource) { super.update(queryResource); this.setResultClass(queryResource.getResultClass()); this.setResultSetMapping(queryResource.getResultSetMapping()); @@ -67,7 +67,7 @@ public class XmlNamedNativeQuery extends AbstractXmlQuery<NamedNativeQuery> @Override @SuppressWarnings("unchecked") - public ListIterator<XmlQueryHint> hints() { + public ListIterator<GenericOrmQueryHint> hints() { return super.hints(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedQuery.java index 09b82bbec8..50f8e7efcf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNamedQuery.java @@ -10,22 +10,22 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.INamedQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedQuery; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.NamedQuery; +import org.eclipse.jpt.core.resource.orm.XmlNamedQuery; -public class XmlNamedQuery extends AbstractXmlQuery<NamedQuery> implements INamedQuery +public class GenericOrmNamedQuery extends AbstractOrmQuery<XmlNamedQuery> implements NamedQuery { - protected XmlNamedQuery(IJpaContextNode parent) { + protected GenericOrmNamedQuery(JpaContextNode parent) { super(parent); } @Override @SuppressWarnings("unchecked") - public ListIterator<XmlQueryHint> hints() { + public ListIterator<GenericOrmQueryHint> hints() { return super.hints(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java index 89c6781dcd..3aa14f2829 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlNullAttributeMapping extends XmlAttributeMapping<AttributeMapping> +public class GenericOrmNullAttributeMapping extends AbstractOrmAttributeMapping<XmlAttributeMapping> { - protected XmlNullAttributeMapping(XmlPersistentAttribute parent) { + protected GenericOrmNullAttributeMapping(OrmPersistentAttribute parent) { super(parent); } @@ -26,7 +26,7 @@ public class XmlNullAttributeMapping extends XmlAttributeMapping<AttributeMappin } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlAttributeMapping(this); } @@ -36,12 +36,12 @@ public class XmlNullAttributeMapping extends XmlAttributeMapping<AttributeMappin @Override //TODO throwing an exception correct here? - public AttributeMapping addToResourceModel(TypeMapping typeMapping) { + public XmlAttributeMapping addToResourceModel(AbstractTypeMapping typeMapping) { throw new UnsupportedOperationException(); } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { throw new UnsupportedOperationException(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java index f82d6f7816..bade323f03 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java @@ -9,35 +9,35 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.OneToMany; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlOneToMany; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlOneToManyMapping extends XmlMultiRelationshipMapping<OneToMany> - implements IOneToManyMapping +public class GenericOrmOneToManyMapping extends AbstractOrmMultiRelationshipMapping<XmlOneToMany> + implements OneToManyMapping { - protected XmlOneToManyMapping(XmlPersistentAttribute parent) { + protected GenericOrmOneToManyMapping(OrmPersistentAttribute parent) { super(parent); } public String getKey() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlOneToManyMapping(this); } @Override - public void initializeFromXmlNonOwningMapping(INonOwningMapping oldMapping) { + public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) { super.initializeFromXmlNonOwningMapping(oldMapping); setMappedBy(oldMapping.getMappedBy()); } @@ -49,21 +49,21 @@ public class XmlOneToManyMapping extends XmlMultiRelationshipMapping<OneToMany> // ********** INonOwningMapping implementation ********** @Override - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); } @Override - public OneToMany addToResourceModel(TypeMapping typeMapping) { - OneToMany oneToMany = OrmFactory.eINSTANCE.createOneToManyImpl(); + public XmlOneToMany addToResourceModel(AbstractTypeMapping typeMapping) { + XmlOneToMany oneToMany = OrmFactory.eINSTANCE.createOneToManyImpl(); persistentAttribute().initialize(oneToMany); typeMapping.getAttributes().getOneToManys().add(oneToMany); return oneToMany; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getOneToManys().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java index e0e85ce056..915cd2117a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java @@ -11,35 +11,35 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.OneToOne; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlOneToOne; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlOneToOneMapping extends XmlSingleRelationshipMapping<OneToOne> - implements IOneToOneMapping +public class GenericOrmOneToOneMapping extends AbstractOrmSingleRelationshipMapping<XmlOneToOne> + implements OneToOneMapping { protected String mappedBy; - protected XmlOneToOneMapping(XmlPersistentAttribute parent) { + protected GenericOrmOneToOneMapping(OrmPersistentAttribute parent) { super(parent); } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlOneToOneMapping(this); } @Override - public void initializeFromXmlNonOwningMapping(INonOwningMapping oldMapping) { + public void initializeFromXmlNonOwningMapping(NonOwningMapping oldMapping) { super.initializeFromXmlNonOwningMapping(oldMapping); setMappedBy(oldMapping.getMappedBy()); } @@ -65,12 +65,12 @@ public class XmlOneToOneMapping extends XmlSingleRelationshipMapping<OneToOne> firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); } - public boolean mappedByIsValid(IAttributeMapping mappedByMapping) { + public boolean mappedByIsValid(AttributeMapping mappedByMapping) { String mappedByKey = mappedByMapping.getKey(); - return (mappedByKey == IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + return (mappedByKey == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return null; // if (node == null) { // return typeMapping().validationTextRange(); @@ -85,7 +85,7 @@ public class XmlOneToOneMapping extends XmlSingleRelationshipMapping<OneToOne> } public String getKey() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } @Override @@ -94,15 +94,15 @@ public class XmlOneToOneMapping extends XmlSingleRelationshipMapping<OneToOne> } @Override - public OneToOne addToResourceModel(TypeMapping typeMapping) { - OneToOne oneToOne = OrmFactory.eINSTANCE.createOneToOneImpl(); + public XmlOneToOne addToResourceModel(AbstractTypeMapping typeMapping) { + XmlOneToOne oneToOne = OrmFactory.eINSTANCE.createOneToOneImpl(); persistentAttribute().initialize(oneToOne); typeMapping.getAttributes().getOneToOnes().add(oneToOne); return oneToOne; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getOneToOnes().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -110,33 +110,33 @@ public class XmlOneToOneMapping extends XmlSingleRelationshipMapping<OneToOne> } @Override - public void initialize(OneToOne oneToOne) { + public void initialize(XmlOneToOne oneToOne) { super.initialize(oneToOne); this.mappedBy = oneToOne.getMappedBy(); } @Override - public void update(OneToOne oneToOne) { + public void update(XmlOneToOne oneToOne) { super.update(oneToOne); this.setMappedBy_(oneToOne.getMappedBy()); } @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> joinColumns() { + public ListIterator<GenericOrmJoinColumn> joinColumns() { return super.joinColumns(); } @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> specifiedJoinColumns() { + public ListIterator<GenericOrmJoinColumn> specifiedJoinColumns() { // TODO Auto-generated method stub return super.specifiedJoinColumns(); } @SuppressWarnings("unchecked") @Override - public ListIterator<XmlJoinColumn> defaultJoinColumns() { + public ListIterator<GenericOrmJoinColumn> defaultJoinColumns() { // TODO Auto-generated method stub return super.defaultJoinColumns(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java new file mode 100644 index 0000000000..c02726bef9 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java @@ -0,0 +1,822 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 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.core.internal.context.orm; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping; +import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; +import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTransientMapping; +import org.eclipse.jpt.core.context.java.JavaVersionMapping; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmStructureNodes; +import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.Attributes; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddable; +import org.eclipse.jpt.core.resource.orm.XmlEmbedded; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.jpt.core.resource.orm.XmlManyToMany; +import org.eclipse.jpt.core.resource.orm.XmlManyToOne; +import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass; +import org.eclipse.jpt.core.resource.orm.XmlOneToMany; +import org.eclipse.jpt.core.resource.orm.XmlOneToOne; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlTransient; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlVersion; +import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.utility.internal.iterators.ChainIterator; +import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator; +import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; + + +public class GenericOrmPersistentType extends AbstractJpaContextNode implements OrmPersistentType +{ + protected final List<OrmPersistentAttribute> specifiedPersistentAttributes; + + protected final List<OrmPersistentAttribute> virtualPersistentAttributes; + + protected final Collection<OrmTypeMappingProvider> typeMappingProviders; + + protected OrmTypeMapping<? extends AbstractTypeMapping> ormTypeMapping; + + protected PersistentType parentPersistentType; + + public GenericOrmPersistentType(EntityMappings parent, String mappingKey) { + super(parent); + this.typeMappingProviders = buildTypeMappingProviders(); + this.ormTypeMapping = buildOrmTypeMapping(mappingKey); + this.specifiedPersistentAttributes = new ArrayList<OrmPersistentAttribute>(); + this.virtualPersistentAttributes = new ArrayList<OrmPersistentAttribute>(); + } + + public String getId() { + return OrmStructureNodes.PERSISTENT_TYPE_ID; + } + + public boolean isFor(String fullyQualifiedTypeName) { + String className = getMapping().getClass_(); + if (className == null) { + return false; + } + if (className.equals(fullyQualifiedTypeName)) { + return true; + } + if ((entityMappings().getPackage() + className).equals(fullyQualifiedTypeName)) { + return true; + } + return false; + } + + protected OrmTypeMapping<? extends AbstractTypeMapping> buildOrmTypeMapping(String key) { + return typeMappingProvider(key).buildTypeMapping(jpaFactory(), this); + } + + protected Collection<OrmTypeMappingProvider> buildTypeMappingProviders() { + Collection<OrmTypeMappingProvider> collection = new ArrayList<OrmTypeMappingProvider>(); + collection.add(new OrmEntityProvider()); + collection.add(new OrmMappedSuperclassProvider()); + collection.add(new OrmEmbeddableProvider()); + return collection; + } + + protected OrmTypeMappingProvider typeMappingProvider(String key) { + for (OrmTypeMappingProvider provider : this.typeMappingProviders) { + if (provider.key().equals(key)) { + return provider; + } + } + throw new IllegalArgumentException(); + } + + public OrmTypeMapping<? extends AbstractTypeMapping> getMapping() { + return this.ormTypeMapping; + } + + public void setMappingKey(String newMappingKey) { + if (this.mappingKey() == newMappingKey) { + return; + } + OrmTypeMapping<? extends AbstractTypeMapping> oldMapping = getMapping(); + this.ormTypeMapping = buildOrmTypeMapping(newMappingKey); + entityMappings().changeMapping(this, oldMapping, this.ormTypeMapping); + firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.ormTypeMapping); + } + + protected void setMappingKey_(String newMappingKey) { + if (this.mappingKey() == newMappingKey) { + return; + } + OrmTypeMapping<? extends AbstractTypeMapping> oldMapping = getMapping(); + this.ormTypeMapping = buildOrmTypeMapping(newMappingKey); + firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.ormTypeMapping); + } + + public Iterator<PersistentType> inheritanceHierarchy() { + // using a chain iterator to traverse up the inheritance tree + return new ChainIterator<PersistentType>(this) { + @Override + protected PersistentType nextLink(PersistentType pt) { + return pt.parentPersistentType(); + } + }; + } + + public PersistentType parentPersistentType() { + return this.parentPersistentType; + } + + public AccessType access() { + return getMapping().getAccess(); + } + public void changeMapping(OrmPersistentAttribute xmlPersistentAttribute, AbstractOrmAttributeMapping<? extends XmlAttributeMapping> oldMapping, AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { + int sourceIndex = this.specifiedPersistentAttributes.indexOf(xmlPersistentAttribute); + this.specifiedPersistentAttributes.remove(sourceIndex); + oldMapping.removeFromResourceModel(getMapping().typeMappingResource()); + if (getMapping().typeMappingResource().getAttributes() == null) { + getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); + } + int targetIndex = insertionIndex(xmlPersistentAttribute); + this.specifiedPersistentAttributes.add(targetIndex, xmlPersistentAttribute); + newMapping.addToResourceModel(getMapping().typeMappingResource()); + oldMapping.initializeOn(newMapping); + //TODO are the source and target correct in this case, or is target off by one??? + fireItemMoved(SPECIFIED_ATTRIBUTES_LIST, targetIndex, sourceIndex); + } + +// protected void changeMapping(XmlAttributeMapping oldMapping, String newMappingKey) { +// boolean virtual = oldMapping.isVirtual(); +// XmlAttributeMapping newAttributeMapping = buildAttributeMapping(oldMapping.getPersistentAttribute().attributeMappingProviders(), newMappingKey); +// // we can't set the attribute to null, but we can set it to a dummy placeholder one +// // we do this to get the translators to *wake up* and remove adapters from the attribute +// XmlPersistentAttribute nullAttribute = OrmFactory.eINSTANCE.createXmlPersistentAttribute(); +// XmlPersistentAttribute attribute = oldMapping.getPersistentAttribute(); +// oldMapping.setPersistentAttribute(nullAttribute); +// if (virtual) { +// getVirtualPersistentAttributes().remove(attribute); +// getVirtualAttributeMappings().remove(oldMapping); +// } +// else { +// getSpecifiedPersistentAttributes().remove(attribute); +// getSpecifiedAttributeMappings().remove(oldMapping); +// } +// newAttributeMapping.setPersistentAttribute(attribute); +// oldMapping.initializeOn(newAttributeMapping); +// if (virtual) { +// insertAttributeMapping(newAttributeMapping, getVirtualAttributeMappings()); +// } +// else { +// insertAttributeMapping(newAttributeMapping, getSpecifiedAttributeMappings()); +// } +// } + + public void setPersistentAttributeVirtual(OrmPersistentAttribute xmlPersistentAttribute, boolean virtual) { + boolean oldVirtual = xmlPersistentAttribute.isVirtual(); + if (oldVirtual == virtual) { + return; + } + if (virtual) { + OrmPersistentAttribute virtualPersistentAttribute = createVirtualPersistentAttribute(xmlPersistentAttribute.getMapping().javaPersistentAttribute()); + this.virtualPersistentAttributes.add(virtualPersistentAttribute); + this.removeSpecifiedXmlPersistentAttribute(xmlPersistentAttribute); + fireItemAdded(VIRTUAL_ATTRIBUTES_LIST, virtualAttributesSize(), virtualPersistentAttribute); + } + else { + int index = this.virtualPersistentAttributes.indexOf(xmlPersistentAttribute); + this.virtualPersistentAttributes.remove(xmlPersistentAttribute); + addSpecifiedPersistentAttribute(xmlPersistentAttribute.mappingKey(), xmlPersistentAttribute.getName()); + fireItemRemoved(VIRTUAL_ATTRIBUTES_LIST, index, xmlPersistentAttribute); + } + } + + + + public Iterator<String> allAttributeNames() { + return this.attributeNames(this.allAttributes()); + } + + public Iterator<PersistentAttribute> allAttributes() { + return new CompositeIterator<PersistentAttribute>(new TransformationIterator<PersistentType, Iterator<PersistentAttribute>>(this.inheritanceHierarchy()) { + @Override + protected Iterator<PersistentAttribute> transform(PersistentType pt) { + return pt.attributes(); + } + }); + } + + protected Iterator<OrmPersistentAttribute> attributesNamed(final String attributeName) { + return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(attributes()) { + @Override + protected boolean accept(OrmPersistentAttribute o) { + return attributeName.equals(o.getName()); + } + }; + } + + public OrmPersistentAttribute attributeNamed(String attributeName) { + Iterator<OrmPersistentAttribute> stream = attributesNamed(attributeName); + return (stream.hasNext()) ? stream.next() : null; + } + + public Iterator<String> attributeNames() { + return this.attributeNames(this.attributes()); + } + + protected Iterator<String> attributeNames(Iterator<? extends PersistentAttribute> attrs) { + return new TransformationIterator<PersistentAttribute, String>(attrs) { + @Override + protected String transform(PersistentAttribute attribute) { + return attribute.getName(); + } + }; + } + + protected OrmPersistentAttribute specifiedAttributeNamed(String attributeName) { + Iterator<OrmPersistentAttribute> stream = specifiedAttributesNamed(attributeName); + return (stream.hasNext()) ? stream.next() : null; + + } + + protected Iterator<OrmPersistentAttribute> specifiedAttributesNamed(final String attributeName) { + return new FilteringIterator<OrmPersistentAttribute, OrmPersistentAttribute>(specifiedAttributes()) { + @Override + protected boolean accept(OrmPersistentAttribute xmlPersistentAttribute) { + return attributeName.equals(xmlPersistentAttribute.getName()); + } + }; + } + + @SuppressWarnings("unchecked") + public ListIterator<OrmPersistentAttribute> attributes() { + return new CompositeListIterator<OrmPersistentAttribute>(specifiedAttributes(), virtualAttributes()); + } + + public int attributesSize() { + return specifiedAttributesSize() + virtualAttributesSize(); + } + + public ListIterator<OrmPersistentAttribute> specifiedAttributes() { + return new CloneListIterator<OrmPersistentAttribute>(this.specifiedPersistentAttributes); + } + + public int specifiedAttributesSize() { + return this.specifiedPersistentAttributes.size(); + } + + public ListIterator<OrmPersistentAttribute> virtualAttributes() { + return new CloneListIterator<OrmPersistentAttribute>(this.virtualPersistentAttributes); + } + + public int virtualAttributesSize() { + return this.virtualPersistentAttributes.size(); + } + + protected void addVirtualPersistentAttribute(OrmPersistentAttribute xmlPersistentAttribute) { + addItemToList(xmlPersistentAttribute, this.virtualPersistentAttributes, OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST); + } + + protected void removeVirtualPersistentAttribute(OrmPersistentAttribute xmlPersistentAttribute) { + removeItemFromList(xmlPersistentAttribute, this.virtualPersistentAttributes, OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST); + } + + protected boolean containsVirtualPersistentAttribute(OrmPersistentAttribute xmlPersistentAttribute) { + return this.virtualPersistentAttributes.contains(xmlPersistentAttribute); + } + + public OrmPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName) { + OrmPersistentAttribute persistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, mappingKey); + int index = insertionIndex(persistentAttribute); + if (getMapping().typeMappingResource().getAttributes() == null) { + getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); + } + this.specifiedPersistentAttributes.add(index, persistentAttribute); + XmlAttributeMapping attributeMapping = persistentAttribute.getMapping().addToResourceModel(getMapping().typeMappingResource()); + + attributeMapping.setName(attributeName); + fireItemAdded(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, persistentAttribute); + return persistentAttribute; + } + + protected int insertionIndex(OrmPersistentAttribute persistentAttribute) { + return CollectionTools.insertionIndexOf(this.specifiedPersistentAttributes, persistentAttribute, buildMappingComparator()); + } + + protected Comparator<OrmPersistentAttribute> buildMappingComparator() { + return new Comparator<OrmPersistentAttribute>() { + public int compare(OrmPersistentAttribute o1, OrmPersistentAttribute o2) { + int o1Sequence = o1.getMapping().xmlSequence(); + int o2Sequence = o2.getMapping().xmlSequence(); + if (o1Sequence < o2Sequence) { + return -1; + } + if (o1Sequence == o2Sequence) { + return 0; + } + return 1; + } + }; + } + + + protected void addSpecifiedPersistentAttribute_(OrmPersistentAttribute xmlPersistentAttribute) { + addItemToList(xmlPersistentAttribute, this.specifiedPersistentAttributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST); + } + + protected void removeSpecifiedPersistentAttribute_(OrmPersistentAttribute xmlPersistentAttribute) { + removeItemFromList(xmlPersistentAttribute, this.specifiedPersistentAttributes, PersistentType.SPECIFIED_ATTRIBUTES_LIST); + } + + public void removeSpecifiedXmlPersistentAttribute(OrmPersistentAttribute xmlPersistentAttribute) { + int index = this.specifiedPersistentAttributes.indexOf(xmlPersistentAttribute); + this.specifiedPersistentAttributes.remove(xmlPersistentAttribute); + xmlPersistentAttribute.getMapping().removeFromResourceModel(this.ormTypeMapping.typeMappingResource()); + fireItemRemoved(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, xmlPersistentAttribute); + } + + public String getName() { + return getMapping().getClass_(); + } + + public void classChanged(String oldClass, String newClass) { + firePropertyChanged(NAME_PROPERTY, oldClass, newClass); + } + + public boolean isMapped() { + return true; + } + + public String mappingKey() { + return getMapping().getKey(); + } + + public JavaPersistentType javaPersistentType() { + return getMapping().getJavaPersistentType(); + } + + + //TODO is there a way to avoid a method for every mapping type? + //I am trying to take adavantage of generics here, but it sure is + //leading to a lot of duplicated code. - KFM + public void initialize(XmlEntity entity) { + ((GenericOrmEntity) getMapping()).initialize(entity); + this.initializeParentPersistentType(); + this.initializePersistentAttributes(entity); + } + + public void initialize(XmlMappedSuperclass mappedSuperclass) { + ((GenericOrmMappedSuperclass) getMapping()).initialize(mappedSuperclass); + this.initializeParentPersistentType(); + this.initializePersistentAttributes(mappedSuperclass); + } + + public void initialize(XmlEmbeddable embeddable) { + ((GenericOrmEmbeddable) getMapping()).initialize(embeddable); + this.initializeParentPersistentType(); + this.initializePersistentAttributes(embeddable); + } + + protected void initializePersistentAttributes(AbstractTypeMapping typeMapping) { + Attributes attributes = typeMapping.getAttributes(); + if (attributes != null) { + this.initializeSpecifiedPersistentAttributes(attributes); + } + this.initializeVirtualPersistentAttributes(); + } + + protected void initializeSpecifiedPersistentAttributes(Attributes attributes) { + for (XmlId id : attributes.getIds()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(id); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlEmbeddedId embeddedId : attributes.getEmbeddedIds()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(embeddedId); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlBasic basic : attributes.getBasics()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(basic); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlVersion version : attributes.getVersions()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(version); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlManyToOne manyToOne : attributes.getManyToOnes()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(manyToOne); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlOneToMany oneToMany : attributes.getOneToManys()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(oneToMany); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlOneToOne oneToOne : attributes.getOneToOnes()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(oneToOne); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlManyToMany manyToMany : attributes.getManyToManys()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(manyToMany); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlEmbedded embedded : attributes.getEmbeddeds()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(embedded); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + for (XmlTransient transientResource : attributes.getTransients()) { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(transientResource); + this.specifiedPersistentAttributes.add(xmlPersistentAttribute); + } + } + + protected void initializeVirtualPersistentAttributes() { + ListIterator<JavaPersistentAttribute> javaAttributes = javaPersistentAttributes(); + + while (javaAttributes.hasNext()) { + JavaPersistentAttribute javaPersistentAttribute = javaAttributes.next(); + if (specifiedAttributeNamed(javaPersistentAttribute.getName()) == null) { + OrmPersistentAttribute xmlPersistentAttribute = createVirtualPersistentAttribute(javaPersistentAttribute); + this.virtualPersistentAttributes.add(xmlPersistentAttribute); + } + } + } + + protected ListIterator<JavaPersistentAttribute> javaPersistentAttributes() { + JavaPersistentType javaPersistentType = javaPersistentType(); + if (javaPersistentType != null) { + return javaPersistentType.attributes(); + } + return EmptyListIterator.instance(); + } + + protected void initializeParentPersistentType() { + JavaPersistentType javaPersistentType = javaPersistentType(); + if (javaPersistentType != null) { + this.parentPersistentType = javaPersistentType.parentPersistentType(); + } + } + + public void update(XmlEntity entity) { + if (mappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { + ((GenericOrmEntity) getMapping()).update(entity); + } + else { + setMappingKey_(MappingKeys.ENTITY_TYPE_MAPPING_KEY); + ((GenericOrmEntity) getMapping()).initialize(entity); + } + this.updateParentPersistentType(); + this.updatePersistentAttributes(entity); + } + + public void update(XmlMappedSuperclass mappedSuperclass) { + if (mappingKey() == MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY) { + ((GenericOrmMappedSuperclass) getMapping()).update(mappedSuperclass); + } + else { + setMappingKey_(MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); + ((GenericOrmMappedSuperclass) getMapping()).initialize(mappedSuperclass); + } + this.updateParentPersistentType(); + this.updatePersistentAttributes(mappedSuperclass); + } + + public void update(XmlEmbeddable embeddable) { + if (mappingKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) { + ((GenericOrmEmbeddable) getMapping()).update(embeddable); + } + else { + setMappingKey_(MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); + ((GenericOrmEmbeddable) getMapping()).initialize(embeddable); + } + this.updateParentPersistentType(); + this.updatePersistentAttributes(embeddable); + } + + protected void updateParentPersistentType() { + JavaPersistentType javaPersistentType = javaPersistentType(); + if (javaPersistentType == null) { + //TODO change notification for this? + this.parentPersistentType = null; + return; + } + this.parentPersistentType = javaPersistentType.parentPersistentType(); + } + + protected void updatePersistentAttributes(org.eclipse.jpt.core.resource.orm.AbstractTypeMapping typeMapping) { + ListIterator<OrmPersistentAttribute> xmlPersistentAttributes = this.specifiedAttributes(); + if (typeMapping.getAttributes() != null) { + this.updateIds(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateEmbeddedIds(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateBasics(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateVersions(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateManyToOnes(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateOneToManys(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateOneToOnes(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateManyToManys(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateEmbeddeds(typeMapping.getAttributes(), xmlPersistentAttributes); + this.updateTransients(typeMapping.getAttributes(), xmlPersistentAttributes); + } + while (xmlPersistentAttributes.hasNext()) { + this.removeSpecifiedPersistentAttribute_(xmlPersistentAttributes.next()); + } + this.updateVirtualPersistentAttributes(); + } + + protected void updateVirtualAttribute(OrmPersistentAttribute xmlAttribute, JavaPersistentAttribute javaAttribute) { + if (javaAttribute.mappingKey() == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualBasic((JavaBasicMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualEmbedded((JavaEmbeddedMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualEmbeddedId((JavaEmbeddedIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualId((JavaIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualManyToMany((JavaManyToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualManyToOne((JavaManyToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualOneToMany((JavaOneToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualOneToOne((JavaOneToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualTransient((JavaTransientMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { + xmlAttribute.update(new VirtualVersion((JavaVersionMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + } + + protected void updateVirtualPersistentAttributes() { + ListIterator<JavaPersistentAttribute> javaAttributes = this.javaPersistentAttributes(); + ListIterator<OrmPersistentAttribute> xmlVirtualAttributes = this.virtualAttributes(); + for (JavaPersistentAttribute javaAttribute : CollectionTools.iterable(javaAttributes)) { + if (specifiedAttributeNamed(javaAttribute.getName()) == null) { + if (xmlVirtualAttributes.hasNext()) { + updateVirtualAttribute(xmlVirtualAttributes.next(), javaAttribute); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = createVirtualPersistentAttribute(javaAttribute); + addVirtualPersistentAttribute(xmlPersistentAttribute); + } + } + } + + while (xmlVirtualAttributes.hasNext()) { + this.removeVirtualPersistentAttribute(xmlVirtualAttributes.next()); + } + + } + + protected void addVirtualPersistentAttribute(JavaPersistentAttribute javaAttribute) { + addVirtualPersistentAttribute(createVirtualPersistentAttribute(javaAttribute)); + } + + protected OrmPersistentAttribute createVirtualPersistentAttribute(JavaPersistentAttribute javaAttribute) { + OrmPersistentAttribute xmlPersistentAttribute = new OrmPersistentAttribute(this, javaAttribute.mappingKey()); + if (javaAttribute.mappingKey() == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualBasic((JavaBasicMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualEmbeddedId((JavaEmbeddedIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualEmbedded((JavaEmbeddedMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualId((JavaIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualManyToMany((JavaManyToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualManyToOne((JavaManyToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualOneToMany((JavaOneToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualOneToOne((JavaOneToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualTransient((JavaTransientMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + else if (javaAttribute.mappingKey() == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { + xmlPersistentAttribute.initialize(new VirtualVersion((JavaVersionMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); + } + return xmlPersistentAttribute; + } + + protected void updateIds(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlId id : attributes.getIds()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(id); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(id); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + protected void updateEmbeddedIds(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlEmbeddedId embeddedId : attributes.getEmbeddedIds()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(embeddedId); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(embeddedId); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + protected void updateBasics(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlBasic basic : attributes.getBasics()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(basic); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(basic); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + protected void updateVersions(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlVersion version : attributes.getVersions()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(version); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(version); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + protected void updateManyToOnes(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlManyToOne manyToOne : attributes.getManyToOnes()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(manyToOne); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(manyToOne); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + protected void updateOneToManys(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlOneToMany oneToMany : attributes.getOneToManys()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(oneToMany); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(oneToMany); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + protected void updateOneToOnes(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlOneToOne oneToOne : attributes.getOneToOnes()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(oneToOne); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(oneToOne); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + protected void updateManyToManys(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlManyToMany manyToMany : attributes.getManyToManys()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(manyToMany); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(manyToMany); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + protected void updateEmbeddeds(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlEmbedded embedded : attributes.getEmbeddeds()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(embedded); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(embedded); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + protected void updateTransients(org.eclipse.jpt.core.resource.orm.Attributes attributes, ListIterator<OrmPersistentAttribute> xmlPersistentAttributes) { + for (XmlTransient transientResource : attributes.getTransients()) { + if (xmlPersistentAttributes.hasNext()) { + xmlPersistentAttributes.next().update(transientResource); + } + else { + OrmPersistentAttribute xmlPersistentAttribute = jpaFactory().buildXmlPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + xmlPersistentAttribute.initialize(transientResource); + addSpecifiedPersistentAttribute_(xmlPersistentAttribute); + } + } + } + + public PersistentAttribute resolveAttribute(String attributeName) { + Iterator<OrmPersistentAttribute> attributes = attributesNamed(attributeName); + if (attributes.hasNext()) { + OrmPersistentAttribute attribute = attributes.next(); + return attributes.hasNext() ? null /* more than one */: attribute; + } + else if (parentPersistentType() != null) { + return parentPersistentType().resolveAttribute(attributeName); + } + else { + return null; + } + } + + @Override + public OrmPersistentType ormPersistentType() { + return this; + } + + public JpaStructureNode structureNode(int textOffset) { + for (OrmPersistentAttribute attribute : CollectionTools.iterable(specifiedAttributes())) { + if (attribute.containsOffset(textOffset)) { + return attribute; + } + } + return this; + } + + public boolean containsOffset(int textOffset) { + return this.ormTypeMapping.containsOffset(textOffset); + } + + public TextRange selectionTextRange() { + return this.ormTypeMapping.selectionTextRange(); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java index 03be7d4960..7161e833bd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java @@ -10,29 +10,29 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.Table; -public class XmlPrimaryKeyJoinColumn extends AbstractXmlNamedColumn<PrimaryKeyJoinColumn> - implements IPrimaryKeyJoinColumn +public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPrimaryKeyJoinColumn> + implements PrimaryKeyJoinColumn { protected String specifiedReferencedColumnName; protected String defaultReferencedColumnName; - protected PrimaryKeyJoinColumn primaryKeyJoinColumn; + protected XmlPrimaryKeyJoinColumn primaryKeyJoinColumn; - protected XmlPrimaryKeyJoinColumn(IJpaContextNode parent, IAbstractJoinColumn.Owner owner) { + protected GenericOrmPrimaryKeyJoinColumn(JpaContextNode parent, AbstractJoinColumn.Owner owner) { super(parent, owner); } @Override - protected PrimaryKeyJoinColumn columnResource() { + protected XmlPrimaryKeyJoinColumn columnResource() { return this.primaryKeyJoinColumn; } @@ -74,8 +74,8 @@ public class XmlPrimaryKeyJoinColumn extends AbstractXmlNamedColumn<PrimaryKeyJo } @Override - public IAbstractJoinColumn.Owner owner() { - return (IAbstractJoinColumn.Owner) this.owner; + public AbstractJoinColumn.Owner owner() { + return (AbstractJoinColumn.Owner) this.owner; } public Column dbReferencedColumn() { @@ -96,7 +96,7 @@ public class XmlPrimaryKeyJoinColumn extends AbstractXmlNamedColumn<PrimaryKeyJo return dbReferencedColumn() != null; } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @@ -119,7 +119,7 @@ public class XmlPrimaryKeyJoinColumn extends AbstractXmlNamedColumn<PrimaryKeyJo } @Override - protected void initialize(PrimaryKeyJoinColumn column) { + protected void initialize(XmlPrimaryKeyJoinColumn column) { this.primaryKeyJoinColumn = column; super.initialize(column); this.specifiedReferencedColumnName = column.getReferencedColumnName(); @@ -127,7 +127,7 @@ public class XmlPrimaryKeyJoinColumn extends AbstractXmlNamedColumn<PrimaryKeyJo } @Override - protected void update(PrimaryKeyJoinColumn column) { + protected void update(XmlPrimaryKeyJoinColumn column) { this.primaryKeyJoinColumn = column; super.update(column); this.setSpecifiedReferencedColumnName(column.getReferencedColumnName()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java index 5b10162054..9262d67c3a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java @@ -9,21 +9,21 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.IQueryHint; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.QueryHint; +import org.eclipse.jpt.core.context.QueryHint; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlQueryHint; -public class XmlQueryHint extends JpaContextNode implements IQueryHint +public class GenericOrmQueryHint extends AbstractJpaContextNode implements QueryHint { protected String name; protected String value; - protected QueryHint queryHint; + protected XmlQueryHint queryHint; - public XmlQueryHint(AbstractXmlQuery<?> parent) { + public GenericOrmQueryHint(AbstractOrmQuery<?> parent) { super(parent); } @@ -35,7 +35,7 @@ public class XmlQueryHint extends JpaContextNode implements IQueryHint String oldName = this.name; this.name = newName; this.queryHint.setName(newName); - firePropertyChanged(IQueryHint.NAME_PROPERTY, oldName, newName); + firePropertyChanged(QueryHint.NAME_PROPERTY, oldName, newName); } public String getValue() { @@ -46,16 +46,16 @@ public class XmlQueryHint extends JpaContextNode implements IQueryHint String oldValue = this.value; this.value = newValue; this.queryHint.setValue(newValue); - firePropertyChanged(IQueryHint.VALUE_PROPERTY, oldValue, newValue); + firePropertyChanged(QueryHint.VALUE_PROPERTY, oldValue, newValue); } - public void initialize(QueryHint queryHint) { + public void initialize(XmlQueryHint queryHint) { this.queryHint = queryHint; this.name = queryHint.getName(); this.value = queryHint.getValue(); } - public void update(QueryHint queryHint) { + public void update(XmlQueryHint queryHint) { this.queryHint = queryHint; this.setName(queryHint.getName()); this.setValue(queryHint.getValue()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java index b534a9f71c..94e2c76fc2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java @@ -13,62 +13,62 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AbstractTable; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.SecondaryTable; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAbstractTable; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlSecondaryTable; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class XmlSecondaryTable extends AbstractXmlTable - implements ISecondaryTable +public class GenericOrmSecondaryTable extends AbstractOrmTable + implements SecondaryTable { - protected SecondaryTable secondaryTable; + protected XmlSecondaryTable secondaryTable; - protected final List<XmlPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; + protected final List<GenericOrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns; - protected final List<XmlPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns; + protected final List<GenericOrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns; - protected XmlSecondaryTable(XmlEntity parent) { + protected GenericOrmSecondaryTable(GenericOrmEntity parent) { super(parent); - this.specifiedPrimaryKeyJoinColumns = new ArrayList<XmlPrimaryKeyJoinColumn>(); - this.defaultPrimaryKeyJoinColumns = new ArrayList<XmlPrimaryKeyJoinColumn>(); + this.specifiedPrimaryKeyJoinColumns = new ArrayList<GenericOrmPrimaryKeyJoinColumn>(); + this.defaultPrimaryKeyJoinColumns = new ArrayList<GenericOrmPrimaryKeyJoinColumn>(); // this.getDefaultPrimaryKeyJoinColumns().add(this.createPrimaryKeyJoinColumn(0)); } @Override - public XmlEntity parent() { - return (XmlEntity) super.parent(); + public GenericOrmEntity parent() { + return (GenericOrmEntity) super.parent(); } - public XmlEntity xmlEntity() { + public GenericOrmEntity xmlEntity() { return parent(); } - public ListIterator<XmlPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { - return new CloneListIterator<XmlPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumns); + public ListIterator<GenericOrmPrimaryKeyJoinColumn> defaultPrimaryKeyJoinColumns() { + return new CloneListIterator<GenericOrmPrimaryKeyJoinColumn>(this.defaultPrimaryKeyJoinColumns); } - public IPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { + public PrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { // TODO Auto-generated method stub return null; } @SuppressWarnings("unchecked") - public ListIterator<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns() { + public ListIterator<GenericOrmPrimaryKeyJoinColumn> primaryKeyJoinColumns() { return this.specifiedPrimaryKeyJoinColumns.isEmpty() ? this.defaultPrimaryKeyJoinColumns() : this.specifiedPrimaryKeyJoinColumns(); } @SuppressWarnings("unchecked") - public ListIterator<XmlPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { - return new CloneListIterator<XmlPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); + public ListIterator<GenericOrmPrimaryKeyJoinColumn> specifiedPrimaryKeyJoinColumns() { + return new CloneListIterator<GenericOrmPrimaryKeyJoinColumn>(this.specifiedPrimaryKeyJoinColumns); } public int specifiedPrimaryKeyJoinColumnsSize() { @@ -87,40 +87,40 @@ public class XmlSecondaryTable extends AbstractXmlTable return !this.specifiedPrimaryKeyJoinColumns.isEmpty(); } - public XmlPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { - XmlPrimaryKeyJoinColumn primaryKeyJoinColumn = new XmlPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + public GenericOrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { + GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn = new GenericOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); this.secondaryTable.getPrimaryKeyJoinColumns().add(index, OrmFactory.eINSTANCE.createPrimaryKeyJoinColumn()); - this.fireItemAdded(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); + this.fireItemAdded(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); return primaryKeyJoinColumn; } - protected IAbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { + protected AbstractJoinColumn.Owner createPrimaryKeyJoinColumnOwner() { return new PrimaryKeyJoinColumnOwner(); } - protected void addSpecifiedPrimaryKeyJoinColumn(int index, XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { - addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void addSpecifiedPrimaryKeyJoinColumn(int index, GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn) { + addItemToList(index, primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } - public void removeSpecifiedPrimaryKeyJoinColumn(IPrimaryKeyJoinColumn pkJoinColumn) { + public void removeSpecifiedPrimaryKeyJoinColumn(PrimaryKeyJoinColumn pkJoinColumn) { this.removeSpecifiedPrimaryKeyJoinColumn(this.specifiedPrimaryKeyJoinColumns.indexOf(pkJoinColumn)); } public void removeSpecifiedPrimaryKeyJoinColumn(int index) { - XmlPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); + GenericOrmPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); this.secondaryTable.getPrimaryKeyJoinColumns().remove(index); - fireItemRemoved(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); + fireItemRemoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); } - protected void removeSpecifiedPrimaryKeyJoinColumn_(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { - removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); + protected void removeSpecifiedPrimaryKeyJoinColumn_(GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn) { + removeItemFromList(primaryKeyJoinColumn, this.specifiedPrimaryKeyJoinColumns, SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST); } public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex); this.secondaryTable.getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex); - fireItemMoved(ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } @@ -141,34 +141,34 @@ public class XmlSecondaryTable extends AbstractXmlTable } @Override - protected AbstractTable table() { + protected XmlAbstractTable table() { return this.secondaryTable; } - public void initialize(SecondaryTable secondaryTable) { + public void initialize(XmlSecondaryTable secondaryTable) { this.secondaryTable = secondaryTable; super.initialize(secondaryTable); this.initializeSpecifiedPrimaryKeyJoinColumns(secondaryTable); } - protected void initializeSpecifiedPrimaryKeyJoinColumns(SecondaryTable secondaryTable) { - for (PrimaryKeyJoinColumn primaryKeyJoinColumn : secondaryTable.getPrimaryKeyJoinColumns()) { + protected void initializeSpecifiedPrimaryKeyJoinColumns(XmlSecondaryTable secondaryTable) { + for (XmlPrimaryKeyJoinColumn primaryKeyJoinColumn : secondaryTable.getPrimaryKeyJoinColumns()) { this.specifiedPrimaryKeyJoinColumns.add(createPrimaryKeyJoinColumn(primaryKeyJoinColumn)); } } - public void update(SecondaryTable secondaryTable) { + public void update(XmlSecondaryTable secondaryTable) { this.secondaryTable = secondaryTable; super.update(secondaryTable); this.updateSpecifiedPrimaryKeyJoinColumns(secondaryTable); } - protected void updateSpecifiedPrimaryKeyJoinColumns(SecondaryTable secondaryTable) { - ListIterator<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); - ListIterator<PrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = secondaryTable.getPrimaryKeyJoinColumns().listIterator(); + protected void updateSpecifiedPrimaryKeyJoinColumns(XmlSecondaryTable secondaryTable) { + ListIterator<GenericOrmPrimaryKeyJoinColumn> primaryKeyJoinColumns = specifiedPrimaryKeyJoinColumns(); + ListIterator<XmlPrimaryKeyJoinColumn> resourcePrimaryKeyJoinColumns = secondaryTable.getPrimaryKeyJoinColumns().listIterator(); while (primaryKeyJoinColumns.hasNext()) { - XmlPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); + GenericOrmPrimaryKeyJoinColumn primaryKeyJoinColumn = primaryKeyJoinColumns.next(); if (resourcePrimaryKeyJoinColumns.hasNext()) { primaryKeyJoinColumn.update(resourcePrimaryKeyJoinColumns.next()); } @@ -182,8 +182,8 @@ public class XmlSecondaryTable extends AbstractXmlTable } } - protected XmlPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(PrimaryKeyJoinColumn primaryKeyJoinColumn) { - XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = new XmlPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + protected GenericOrmPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { + GenericOrmPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn = new GenericOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); xmlPrimaryKeyJoinColumn.initialize(primaryKeyJoinColumn); return xmlPrimaryKeyJoinColumn; } @@ -204,19 +204,19 @@ public class XmlSecondaryTable extends AbstractXmlTable return entityMappings().getSchema(); } - class PrimaryKeyJoinColumnOwner implements IAbstractJoinColumn.Owner + class PrimaryKeyJoinColumnOwner implements AbstractJoinColumn.Owner { - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { //TODO textRange return null;//return XmlSecondaryTable.this.validationTextRange(astRoot); } - public ITypeMapping typeMapping() { - return XmlSecondaryTable.this.xmlEntity(); + public TypeMapping typeMapping() { + return GenericOrmSecondaryTable.this.xmlEntity(); } public Table dbTable(String tableName) { - return XmlSecondaryTable.this.dbTable(); + return GenericOrmSecondaryTable.this.dbTable(); } public Table dbReferencedColumnTable() { @@ -224,11 +224,11 @@ public class XmlSecondaryTable extends AbstractXmlTable } public int joinColumnsSize() { - return XmlSecondaryTable.this.primaryKeyJoinColumnsSize(); + return GenericOrmSecondaryTable.this.primaryKeyJoinColumnsSize(); } - public boolean isVirtual(IAbstractJoinColumn joinColumn) { - return XmlSecondaryTable.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); + public boolean isVirtual(AbstractJoinColumn joinColumn) { + return GenericOrmSecondaryTable.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); } public String defaultColumnName() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSequenceGenerator.java index b3f020eeba..1ee090c875 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSequenceGenerator.java @@ -9,20 +9,20 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator; -public class XmlSequenceGenerator extends XmlGenerator<SequenceGenerator> - implements ISequenceGenerator +public class GenericOrmSequenceGenerator extends AbstractOrmGenerator<XmlSequenceGenerator> + implements SequenceGenerator { protected String specifiedSequenceName; protected String defaultSequenceName; - protected XmlSequenceGenerator(IJpaContextNode parent) { + protected GenericOrmSequenceGenerator(JpaContextNode parent) { super(parent); } @@ -58,20 +58,20 @@ public class XmlSequenceGenerator extends XmlGenerator<SequenceGenerator> } @Override - public void initialize(SequenceGenerator sequenceGenerator) { + public void initialize(XmlSequenceGenerator sequenceGenerator) { super.initialize(sequenceGenerator); this.specifiedSequenceName = this.specifiedSequenceName(sequenceGenerator); //TODO default sequence name } @Override - public void update(SequenceGenerator sequenceGenerator) { + public void update(XmlSequenceGenerator sequenceGenerator) { super.update(sequenceGenerator); this.setSpecifiedSequenceName_(this.specifiedSequenceName(sequenceGenerator)); //TODO default sequence name } - protected String specifiedSequenceName(SequenceGenerator generatorResource) { + protected String specifiedSequenceName(XmlSequenceGenerator generatorResource) { return generatorResource.getSequenceName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java index f6823a9e9a..2edf4d161f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java @@ -12,32 +12,32 @@ package org.eclipse.jpt.core.internal.context.orm; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; -import org.eclipse.jpt.core.internal.context.java.IJavaEntity; -import org.eclipse.jpt.core.internal.context.java.IJavaTable; -import org.eclipse.jpt.core.internal.resource.orm.AbstractTable; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.InheritanceType; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaTable; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.orm.XmlAbstractTable; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class XmlTable extends AbstractXmlTable +public class GenericOrmTable extends AbstractOrmTable { - protected Entity entity; + protected XmlEntity entity; - public XmlTable(XmlEntity parent) { + public GenericOrmTable(GenericOrmEntity parent) { super(parent); } - public XmlEntity xmlEntity() { - return (XmlEntity) super.parent(); + public GenericOrmEntity xmlEntity() { + return (GenericOrmEntity) super.parent(); } @Override - protected AbstractTable table() { + protected XmlAbstractTable table() { return this.entity.getTable(); } @@ -52,8 +52,8 @@ public class XmlTable extends AbstractXmlTable } - protected IJavaTable javaTable() { - IJavaEntity javaEntity = xmlEntity().javaEntity(); + protected JavaTable javaTable() { + JavaEntity javaEntity = xmlEntity().javaEntity(); if (javaEntity != null) { return javaEntity.getTable(); } @@ -61,26 +61,26 @@ public class XmlTable extends AbstractXmlTable } - public void initialize(Entity entity) { + public void initialize(XmlEntity entity) { this.entity = entity; this.initialize(this.table()); } - public void update(Entity entity) { + public void update(XmlEntity entity) { this.entity = entity; this.update(this.table()); } @Override protected String defaultName() { - IJavaTable javaTable = javaTable(); + JavaTable javaTable = javaTable(); if (javaTable != null) { if (xmlEntity().isMetadataComplete() || (table() != null)) { return javaTable.getDefaultName(); } return javaTable.getName(); } - IEntity rootEntity = xmlEntity().rootEntity(); + Entity rootEntity = xmlEntity().rootEntity(); if (rootEntity != xmlEntity()) { if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) { return rootEntity.getTable().getName(); @@ -91,14 +91,14 @@ public class XmlTable extends AbstractXmlTable @Override protected String defaultSchema() { - IJavaTable javaTable = javaTable(); + JavaTable javaTable = javaTable(); if (javaTable != null ) { if (xmlEntity().isMetadataComplete() || (table() != null)) { return javaTable.getDefaultSchema(); } return javaTable.getSchema(); } - IEntity rootEntity = xmlEntity().rootEntity(); + Entity rootEntity = xmlEntity().rootEntity(); if (rootEntity != xmlEntity()) { if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) { return rootEntity.getTable().getSchema(); @@ -109,14 +109,14 @@ public class XmlTable extends AbstractXmlTable @Override protected String defaultCatalog() { - IJavaTable javaTable = javaTable(); + JavaTable javaTable = javaTable(); if (javaTable != null) { if (xmlEntity().isMetadataComplete() || (table() != null)) { return javaTable.getDefaultCatalog(); } return javaTable.getCatalog(); } - IEntity rootEntity = xmlEntity().rootEntity(); + Entity rootEntity = xmlEntity().rootEntity(); if (rootEntity != xmlEntity()) { if (rootEntity.getInheritanceStrategy() == InheritanceType.SINGLE_TABLE) { return rootEntity.getTable().getCatalog(); @@ -136,9 +136,9 @@ public class XmlTable extends AbstractXmlTable if (doContinue && ! this.hasResolvedSchema()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.TABLE_UNRESOLVED_SCHEMA, + JpaValidationMessages.TABLE_UNRESOLVED_SCHEMA, new String[] {schema, this.getName()}, this, this.schemaTextRange(astRoot)) ); @@ -147,9 +147,9 @@ public class XmlTable extends AbstractXmlTable if (doContinue && ! this.isResolved()) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.TABLE_UNRESOLVED_NAME, + JpaValidationMessages.TABLE_UNRESOLVED_NAME, new String[] {this.getName()}, this, this.nameTextRange(astRoot)) ); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java index 278c520a41..280af78457 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java @@ -9,13 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.core.internal.resource.orm.TableGenerator; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.core.resource.orm.XmlTableGenerator; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; -public class XmlTableGenerator extends XmlGenerator<TableGenerator> implements ITableGenerator +public class GenericOrmTableGenerator extends AbstractOrmGenerator<XmlTableGenerator> implements TableGenerator { protected String specifiedTable; protected String defaultTable; @@ -38,7 +38,7 @@ public class XmlTableGenerator extends XmlGenerator<TableGenerator> implements I // protected EList<IUniqueConstraint> uniqueConstraints; - protected XmlTableGenerator(IJpaContextNode parent) { + protected GenericOrmTableGenerator(JpaContextNode parent) { super(parent); } @@ -254,7 +254,7 @@ public class XmlTableGenerator extends XmlGenerator<TableGenerator> implements I // ********** orm resource model -> context model ********** @Override - public void initialize(TableGenerator tableGenerator) { + public void initialize(XmlTableGenerator tableGenerator) { super.initialize(tableGenerator); this.specifiedTable = this.specifiedTable(tableGenerator); this.specifiedCatalog = this.specifiedCatalog(tableGenerator); @@ -267,7 +267,7 @@ public class XmlTableGenerator extends XmlGenerator<TableGenerator> implements I } @Override - public void update(TableGenerator tableGenerator) { + public void update(XmlTableGenerator tableGenerator) { super.update(tableGenerator); this.setSpecifiedTable_(this.specifiedTable(tableGenerator)); this.setSpecifiedCatalog_(this.specifiedCatalog(tableGenerator)); @@ -279,27 +279,27 @@ public class XmlTableGenerator extends XmlGenerator<TableGenerator> implements I //this.updateUniqueConstraintsFromJava(astRoot); } - protected String specifiedTable(TableGenerator tableGenerator) { + protected String specifiedTable(XmlTableGenerator tableGenerator) { return tableGenerator.getTable(); } - protected String specifiedCatalog(TableGenerator tableGenerator) { + protected String specifiedCatalog(XmlTableGenerator tableGenerator) { return tableGenerator.getCatalog(); } - protected String specifiedSchema(TableGenerator tableGenerator) { + protected String specifiedSchema(XmlTableGenerator tableGenerator) { return tableGenerator.getSchema(); } - protected String specifiedPkColumnName(TableGenerator tableGenerator) { + protected String specifiedPkColumnName(XmlTableGenerator tableGenerator) { return tableGenerator.getPkColumnName(); } - protected String specifiedValueColumnName(TableGenerator tableGenerator) { + protected String specifiedValueColumnName(XmlTableGenerator tableGenerator) { return tableGenerator.getValueColumnName(); } - protected String specifiedPkColumnValue(TableGenerator tableGenerator) { + protected String specifiedPkColumnValue(XmlTableGenerator tableGenerator) { return tableGenerator.getPkColumnValue(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java index 4fc7b292cc..0eb0083ac1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java @@ -9,23 +9,23 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.Transient; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlTransient; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; -public class XmlTransientMapping extends XmlAttributeMapping<Transient> implements ITransientMapping +public class GenericOrmTransientMapping extends AbstractOrmAttributeMapping<XmlTransient> implements TransientMapping { - protected XmlTransientMapping(XmlPersistentAttribute parent) { + protected GenericOrmTransientMapping(OrmPersistentAttribute parent) { super(parent); } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlTransientMapping(this); } @@ -35,19 +35,19 @@ public class XmlTransientMapping extends XmlAttributeMapping<Transient> implemen } public String getKey() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } @Override - public Transient addToResourceModel(TypeMapping typeMapping) { - Transient transientResource = OrmFactory.eINSTANCE.createTransientImpl(); + public XmlTransient addToResourceModel(AbstractTypeMapping typeMapping) { + XmlTransient transientResource = OrmFactory.eINSTANCE.createTransientImpl(); persistentAttribute().initialize(transientResource); typeMapping.getAttributes().getTransients().add(transientResource); return transientResource; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getTransients().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -55,12 +55,12 @@ public class XmlTransientMapping extends XmlAttributeMapping<Transient> implemen } @Override - public void initialize(Transient transientResource) { + public void initialize(XmlTransient transientResource) { super.initialize(transientResource); } @Override - public void update(Transient transientResource) { + public void update(XmlTransient transientResource) { super.update(transientResource); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java index c4b3f004d6..0a28b9eb7d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java @@ -10,29 +10,30 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Version; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.core.context.orm.OrmColumnMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.core.resource.orm.XmlVersion; import org.eclipse.jpt.db.internal.Table; -public class XmlVersionMapping extends XmlAttributeMapping<Version> - implements IVersionMapping, IXmlColumnMapping +public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVersion> + implements VersionMapping, OrmColumnMapping { - protected final XmlColumn column; + protected final GenericOrmColumn column; protected TemporalType temporal; - protected XmlVersionMapping(XmlPersistentAttribute parent) { + protected GenericOrmVersionMapping(OrmPersistentAttribute parent) { super(parent); - this.column = new XmlColumn(this, this); + this.column = new GenericOrmColumn(this, this); } @Override @@ -41,21 +42,21 @@ public class XmlVersionMapping extends XmlAttributeMapping<Version> } public String getKey() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } @Override - protected void initializeOn(XmlAttributeMapping<? extends AttributeMapping> newMapping) { + protected void initializeOn(AbstractOrmAttributeMapping<? extends XmlAttributeMapping> newMapping) { newMapping.initializeFromXmlVersionMapping(this); } @Override - public void initializeFromXmlColumnMapping(IXmlColumnMapping oldMapping) { + public void initializeFromXmlColumnMapping(OrmColumnMapping oldMapping) { super.initializeFromXmlColumnMapping(oldMapping); setTemporal(oldMapping.getTemporal()); getColumn().initializeFrom(oldMapping.getColumn()); } - public XmlColumn getColumn() { + public GenericOrmColumn getColumn() { return this.column; } @@ -67,25 +68,25 @@ public class XmlVersionMapping extends XmlAttributeMapping<Version> TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; this.attributeMapping().setTemporal(TemporalType.toOrmResourceModel(newTemporal)); - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } protected void setTemporal_(TemporalType newTemporal) { TemporalType oldTemporal = this.temporal; this.temporal = newTemporal; - firePropertyChanged(IColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); + firePropertyChanged(ColumnMapping.TEMPORAL_PROPERTY, oldTemporal, newTemporal); } @Override - public Version addToResourceModel(TypeMapping typeMapping) { - Version version = OrmFactory.eINSTANCE.createVersionImpl(); + public XmlVersion addToResourceModel(AbstractTypeMapping typeMapping) { + XmlVersion version = OrmFactory.eINSTANCE.createVersionImpl(); persistentAttribute().initialize(version); typeMapping.getAttributes().getVersions().add(version); return version; } @Override - public void removeFromResourceModel(TypeMapping typeMapping) { + public void removeFromResourceModel(AbstractTypeMapping typeMapping) { typeMapping.getAttributes().getVersions().remove(this.attributeMapping()); if (typeMapping.getAttributes().isAllFeaturesUnset()) { typeMapping.setAttributes(null); @@ -104,32 +105,32 @@ public class XmlVersionMapping extends XmlAttributeMapping<Version> return typeMapping().dbTable(tableName); } - public ITextRange validationTextRange(CompilationUnit astRoot) { + public TextRange validationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } @Override - public void initialize(Version version) { + public void initialize(XmlVersion version) { super.initialize(version); this.temporal = this.specifiedTemporal(version); this.column.initialize(version.getColumn()); } @Override - public void update(Version version) { + public void update(XmlVersion version) { super.update(version); this.setTemporal_(this.specifiedTemporal(version)); this.column.update(version.getColumn()); } - protected TemporalType specifiedTemporal(Version version) { + protected TemporalType specifiedTemporal(XmlVersion version) { return TemporalType.fromOrmResourceModel(version.getTemporal()); } //***************** IXmlColumn.Owner implementation **************** - public Column columnResource() { + public XmlColumn columnResource() { return this.attributeMapping().getColumn(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitDefaultsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java index cd8a3c32db..819fc92c68 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitDefaultsImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java @@ -9,11 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmFactory; -public class PersistenceUnitDefaultsImpl extends JpaContextNode +public class GenericPersistenceUnitDefaults extends AbstractJpaContextNode implements PersistenceUnitDefaults { protected String schema; @@ -24,9 +26,9 @@ public class PersistenceUnitDefaultsImpl extends JpaContextNode protected boolean cascadePersist; - protected org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings; + protected org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings; - public PersistenceUnitDefaultsImpl(PersistenceUnitMetadata parent) { + public GenericPersistenceUnitDefaults(PersistenceUnitMetadata parent) { super(parent); } @@ -166,7 +168,7 @@ public class PersistenceUnitDefaultsImpl extends JpaContextNode firePropertyChanged(PersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY, oldCascadePersist, newCascadePersist); } - public void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.entityMappings = entityMappings; if (this.persistenceUnitDefaults() != null) { this.access = AccessType.fromXmlResourceModel(this.persistenceUnitDefaults().getAccess()); @@ -177,7 +179,7 @@ public class PersistenceUnitDefaultsImpl extends JpaContextNode } - public void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.entityMappings = entityMappings; if (this.persistenceUnitDefaults() != null) { this.setAccess_(AccessType.fromXmlResourceModel(this.persistenceUnitDefaults().getAccess())); @@ -193,14 +195,14 @@ public class PersistenceUnitDefaultsImpl extends JpaContextNode } } - protected org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults persistenceUnitDefaults() { + protected org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults persistenceUnitDefaults() { if (persistenceUnitMetadata() != null) { return persistenceUnitMetadata().getPersistenceUnitDefaults(); } return null; } - protected org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata persistenceUnitMetadata() { + protected org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata persistenceUnitMetadata() { return this.entityMappings.getPersistenceUnitMetadata(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitMetadataImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java index c9217c7884..84310fd16b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/PersistenceUnitMetadataImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java @@ -9,21 +9,24 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmFactory; -public class PersistenceUnitMetadataImpl extends JpaContextNode +public class GenericPersistenceUnitMetadata extends AbstractJpaContextNode implements PersistenceUnitMetadata { protected boolean xmlMappingMetadataComplete; protected final PersistenceUnitDefaults persistenceUnitDefaults; - protected org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings; + protected org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings; - public PersistenceUnitMetadataImpl(EntityMappings parent) { + public GenericPersistenceUnitMetadata(EntityMappings parent) { super(parent); - this.persistenceUnitDefaults = jpaFactory().createPersistenceUnitDefaults(this); + this.persistenceUnitDefaults = jpaFactory().buildPersistenceUnitDefaults(this); } public boolean isXmlMappingMetadataComplete() { @@ -58,7 +61,7 @@ public class PersistenceUnitMetadataImpl extends JpaContextNode return this.persistenceUnitDefaults; } - public void initialize(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void initialize(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.entityMappings = entityMappings; if (this.persistenceUnitMetadata() != null) { this.xmlMappingMetadataComplete = this.persistenceUnitMetadata().isXmlMappingMetadataComplete(); @@ -66,7 +69,7 @@ public class PersistenceUnitMetadataImpl extends JpaContextNode this.persistenceUnitDefaults.initialize(entityMappings); } - public void update(org.eclipse.jpt.core.internal.resource.orm.EntityMappings entityMappings) { + public void update(org.eclipse.jpt.core.resource.orm.EntityMappings entityMappings) { this.entityMappings = entityMappings; if (this.persistenceUnitMetadata() != null) { setXmlMappingMetadataComplete_(this.persistenceUnitMetadata().isXmlMappingMetadataComplete()); @@ -77,7 +80,7 @@ public class PersistenceUnitMetadataImpl extends JpaContextNode this.persistenceUnitDefaults.update(entityMappings); } - protected org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata persistenceUnitMetadata() { + protected org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata persistenceUnitMetadata() { return this.entityMappings.getPersistenceUnitMetadata(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlColumnMapping.java deleted file mode 100644 index 0a064b4ee9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/IXmlColumnMapping.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.orm; - -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; - - -public interface IXmlColumnMapping extends IColumnMapping, IXmlColumn.Owner -{ - - XmlColumn getColumn(); -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java index 0547876499..4634c8859c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlBasicMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlBasicMappingProvider implements IXmlAttributeMappingProvider +public class OrmBasicMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlBasicMappingProvider INSTANCE = new XmlBasicMappingProvider(); + private static final OrmBasicMappingProvider INSTANCE = new OrmBasicMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlBasicMappingProvider() { + private OrmBasicMappingProvider() { super(); } public String key() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } - public XmlBasicMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlBasicMapping(parent); + public GenericOrmBasicMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmBasicMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java index e175bd769d..63ddb06002 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlCascade.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java @@ -9,14 +9,14 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.CascadeType; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.CascadeType; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping; -public class XmlCascade extends JpaContextNode implements ICascade +public class OrmCascade extends AbstractJpaContextNode implements Cascade { protected boolean all; @@ -30,13 +30,13 @@ public class XmlCascade extends JpaContextNode implements ICascade protected boolean refresh; - protected RelationshipMapping relationshipMapping; + protected XmlRelationshipMapping relationshipMapping; - protected XmlCascade(XmlRelationshipMapping<? extends RelationshipMapping> parent) { + protected OrmCascade(AbstractOrmRelationshipMapping<? extends XmlRelationshipMapping> parent) { super(parent); } - public void initializeFrom(ICascade oldCascade) { + public void initializeFrom(Cascade oldCascade) { setAll(oldCascade.isAll()); setPersist(oldCascade.isPersist()); setMerge(oldCascade.isMerge()); @@ -198,7 +198,7 @@ public class XmlCascade extends JpaContextNode implements ICascade this.relationshipMapping.setCascade(OrmFactory.eINSTANCE.createCascadeTypeImpl()); } - public void initialize(RelationshipMapping relationshipMapping) { + public void initialize(XmlRelationshipMapping relationshipMapping) { this.relationshipMapping = relationshipMapping; CascadeType cascade = cascadeResource(); this.all = this.all(cascade); @@ -208,7 +208,7 @@ public class XmlCascade extends JpaContextNode implements ICascade this.refresh = this.refresh(cascade); } - public void update(RelationshipMapping relationshipMapping) { + public void update(XmlRelationshipMapping relationshipMapping) { this.relationshipMapping = relationshipMapping; CascadeType cascade = cascadeResource(); this.setAll_(this.all(cascade)); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java new file mode 100644 index 0000000000..38f2ecd0bd --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java @@ -0,0 +1,30 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.internal.context.orm; + +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddable; + + +public class OrmEmbeddableProvider implements OrmTypeMappingProvider +{ + + public OrmTypeMapping<XmlEmbeddable> buildTypeMapping(JpaBaseContextFactory factory, OrmPersistentType parent) { + return factory.buildXmlEmbeddable(parent); + } + + public String key() { + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java index 3c400451c7..8c8dc756e1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlManyToOneMappingProvider implements IXmlAttributeMappingProvider +public class OrmEmbeddedIdMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlManyToOneMappingProvider INSTANCE = new XmlManyToOneMappingProvider(); + private static final OrmEmbeddedIdMappingProvider INSTANCE = new OrmEmbeddedIdMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlManyToOneMappingProvider() { + private OrmEmbeddedIdMappingProvider() { super(); } - - public String key() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + + public GenericOrmEmbeddedIdMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmEmbeddedIdMapping(parent); } - public XmlManyToOneMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlManyToOneMapping(parent); + public String key() { + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java index a54455b53d..6f47c70d30 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlEmbeddedIdMappingProvider implements IXmlAttributeMappingProvider +public class OrmEmbeddedMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlEmbeddedIdMappingProvider INSTANCE = new XmlEmbeddedIdMappingProvider(); + private static final OrmEmbeddedMappingProvider INSTANCE = new OrmEmbeddedMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlEmbeddedIdMappingProvider() { + private OrmEmbeddedMappingProvider() { super(); } - public XmlEmbeddedIdMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlEmbeddedIdMapping(parent); + public GenericOrmEmbeddedMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmEmbeddedMapping(parent); } public String key() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java new file mode 100644 index 0000000000..92d2c493d5 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.internal.context.orm; + +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.orm.XmlEntity; + + +public class OrmEntityProvider implements OrmTypeMappingProvider +{ + public OrmTypeMapping<XmlEntity> buildTypeMapping(JpaBaseContextFactory factory, OrmPersistentType parent) { + return factory.buildXmlEntity(parent); + } + + public String key() { + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java index c9d25b6163..f169129557 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java @@ -9,32 +9,33 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlIdMappingProvider implements IXmlAttributeMappingProvider +public class OrmIdMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlIdMappingProvider INSTANCE = new XmlIdMappingProvider(); + private static final OrmIdMappingProvider INSTANCE = new OrmIdMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlIdMappingProvider() { + private OrmIdMappingProvider() { super(); } public String key() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } - public XmlIdMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlIdMapping(parent); + public GenericOrmIdMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmIdMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java index ed823add08..5546cb3f00 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlOneToManyMappingProvider implements IXmlAttributeMappingProvider +public class OrmManyToManyMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlOneToManyMappingProvider INSTANCE = new XmlOneToManyMappingProvider(); + private static final OrmManyToManyMappingProvider INSTANCE = new OrmManyToManyMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlOneToManyMappingProvider() { + private OrmManyToManyMappingProvider() { super(); } public String key() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public XmlOneToManyMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlOneToManyMapping(parent); + public GenericOrmManyToManyMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmManyToManyMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java index dcd469b105..a11c1fb398 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlOneToOneMappingProvider implements IXmlAttributeMappingProvider +public class OrmManyToOneMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlOneToOneMappingProvider INSTANCE = new XmlOneToOneMappingProvider(); + private static final OrmManyToOneMappingProvider INSTANCE = new OrmManyToOneMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlOneToOneMappingProvider() { + private OrmManyToOneMappingProvider() { super(); } public String key() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - public XmlOneToOneMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlOneToOneMapping(parent); + public GenericOrmManyToOneMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmManyToOneMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java new file mode 100644 index 0000000000..a4eba5142f --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java @@ -0,0 +1,29 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.internal.context.orm; + +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmTypeMappingProvider; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; +import org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass; + + +public class OrmMappedSuperclassProvider implements OrmTypeMappingProvider +{ + public OrmTypeMapping<XmlMappedSuperclass> buildTypeMapping(JpaBaseContextFactory factory, OrmPersistentType parent) { + return factory.buildXmlMappedSuperclass(parent); + } + + public String key() { + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java index f2eda1cc82..da973c2327 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlNullAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlNullAttributeMappingProvider implements IXmlAttributeMappingProvider +public class OrmNullAttributeMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlNullAttributeMappingProvider INSTANCE = new XmlNullAttributeMappingProvider(); + private static final OrmNullAttributeMappingProvider INSTANCE = new OrmNullAttributeMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlNullAttributeMappingProvider() { + private OrmNullAttributeMappingProvider() { super(); } public String key() { - return IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; } - public XmlNullAttributeMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlNullAttributeMapping(parent); + public GenericOrmNullAttributeMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmNullAttributeMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java index d1aaeab092..4cc4c43f43 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddedMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlEmbeddedMappingProvider implements IXmlAttributeMappingProvider +public class OrmOneToManyMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlEmbeddedMappingProvider INSTANCE = new XmlEmbeddedMappingProvider(); + private static final OrmOneToManyMappingProvider INSTANCE = new OrmOneToManyMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlEmbeddedMappingProvider() { + private OrmOneToManyMappingProvider() { super(); } - - public XmlEmbeddedMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlEmbeddedMapping(parent); + + public String key() { + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public String key() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + public GenericOrmOneToManyMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmOneToManyMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java index 1685937401..b6cc74308d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlVersionMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlVersionMappingProvider implements IXmlAttributeMappingProvider +public class OrmOneToOneMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlVersionMappingProvider INSTANCE = new XmlVersionMappingProvider(); + private static final OrmOneToOneMappingProvider INSTANCE = new OrmOneToOneMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlVersionMappingProvider() { + private OrmOneToOneMappingProvider() { super(); } public String key() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - public XmlVersionMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlVersionMapping(parent); + public GenericOrmOneToOneMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmOneToOneMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmPersistentAttribute.java new file mode 100644 index 0000000000..337c763111 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmPersistentAttribute.java @@ -0,0 +1,345 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.core.internal.context.orm; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.orm.OrmStructureNodes; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.XmlEmbedded; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.jpt.core.resource.orm.XmlManyToMany; +import org.eclipse.jpt.core.resource.orm.XmlManyToOne; +import org.eclipse.jpt.core.resource.orm.XmlOneToMany; +import org.eclipse.jpt.core.resource.orm.XmlOneToOne; +import org.eclipse.jpt.core.resource.orm.XmlTransient; +import org.eclipse.jpt.core.resource.orm.XmlVersion; + + +public class OrmPersistentAttribute extends AbstractJpaContextNode + implements PersistentAttribute +{ + + protected List<OrmAttributeMappingProvider> attributeMappingProviders; + + protected AbstractOrmAttributeMapping<? extends XmlAttributeMapping> attributeMapping; + + public OrmPersistentAttribute(OrmPersistentType parent, String mappingKey) { + super(parent); + this.attributeMappingProviders = buildAttributeMappingProviders(); + this.attributeMapping = buildAttributeMapping(mappingKey); + } + + protected List<OrmAttributeMappingProvider> buildAttributeMappingProviders() { + List<OrmAttributeMappingProvider> list = new ArrayList<OrmAttributeMappingProvider>(); + list.add(OrmEmbeddedMappingProvider.instance()); //bug 190344 need to test default embedded before basic + list.add(OrmBasicMappingProvider.instance()); + list.add(OrmTransientMappingProvider.instance()); + list.add(OrmIdMappingProvider.instance()); + list.add(OrmManyToManyMappingProvider.instance()); + list.add(OrmOneToManyMappingProvider.instance()); + list.add(OrmManyToOneMappingProvider.instance()); + list.add(OrmOneToOneMappingProvider.instance()); + list.add(OrmVersionMappingProvider.instance()); + list.add(OrmEmbeddedIdMappingProvider.instance()); + return list; + } + + protected OrmAttributeMappingProvider attributeMappingProvider(String key) { + for (OrmAttributeMappingProvider provider : this.attributeMappingProviders) { + if (provider.key().equals(key)) { + return provider; + } + } + return OrmNullAttributeMappingProvider.instance(); + } + + protected AbstractOrmAttributeMapping<? extends XmlAttributeMapping> buildAttributeMapping(String key) { + return this.attributeMappingProvider(key).buildAttributeMapping(jpaFactory(), this); + } + + public String getId() { + return OrmStructureNodes.PERSISTENT_ATTRIBUTE_ID; + } + + public String getName() { + return getMapping().getName(); + } + + protected void nameChanged(String oldName, String newName) { + firePropertyChanged(NAME_PROPERTY, oldName, newName); + } + + public AttributeMapping getSpecifiedMapping() { + return this.attributeMapping; + } + + public AbstractOrmAttributeMapping<? extends XmlAttributeMapping> getMapping() { + return this.attributeMapping; + } + + public String mappingKey() { + return this.getMapping().getKey(); + } + + public String defaultMappingKey() { + return null; + } + + public void setSpecifiedMappingKey(String newMappingKey) { + if (this.mappingKey() == newMappingKey) { + return; + } + AbstractOrmAttributeMapping<? extends XmlAttributeMapping> oldMapping = getMapping(); + this.attributeMapping = buildAttributeMapping(newMappingKey); + persistentType().changeMapping(this, oldMapping, this.attributeMapping); + firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping); + } + + protected void setSpecifiedMappingKey_(String newMappingKey) { + if (this.mappingKey() == newMappingKey) { + return; + } + AbstractOrmAttributeMapping<? extends XmlAttributeMapping> oldMapping = getMapping(); + this.attributeMapping = buildAttributeMapping(newMappingKey); + firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping); + } + + public Collection<OrmAttributeMappingProvider> attributeMappingProviders() { + return this.attributeMappingProviders; + } + + public GenericOrmPersistentType persistentType() { + return (GenericOrmPersistentType) parent(); + } + + public OrmTypeMapping<?> typeMapping() { + return persistentType().getMapping(); + } + + public boolean isVirtual() { + return persistentType().containsVirtualPersistentAttribute(this); + } + + public void setVirtual(boolean virtual) { + ormPersistentType().setPersistentAttributeVirtual(this, virtual); + } + + public String primaryKeyColumnName() { + return getMapping().primaryKeyColumnName(); + } + +// @Override +// public ITextRange fullTextRange() { +// return (this.isVirtual()) ? null : super.fullTextRange(); +// } +// +// @Override +// public ITextRange validationTextRange() { +// return (this.isVirtual()) ? this.persistentType().attributesTextRange() : this.getMapping().validationTextRange(); +// } +// +// @Override +// public ITextRange selectionTextRange() { +// return (isVirtual()) ? null : this.getMapping().selectionTextRange(); +// } +// +// public ITextRange nameTextRange() { +// return getMapping().nameTextRange(); +// } + + public boolean isOverridableAttribute() { + return this.getMapping().isOverridableAttributeMapping(); + } + + public boolean isOverridableAssociation() { + return this.getMapping().isOverridableAssociationMapping(); + } + + public boolean isIdAttribute() { + return this.getMapping().isIdMapping(); + } + + //TODO is there a way to avoid a method for every mapping type? + //I am trying to take adavantage of generics here, but it sure is + //leading to a lot of duplicated code. - KFM + public void initialize(XmlBasic basic) { + ((GenericOrmBasicMapping) getMapping()).initialize(basic); + } + + public void initialize(XmlEmbedded embedded) { + ((GenericOrmEmbeddedMapping) getMapping()).initialize(embedded); + } + + public void initialize(XmlVersion version) { + ((GenericOrmVersionMapping) getMapping()).initialize(version); + } + + public void initialize(XmlManyToOne manyToOne) { + ((GenericOrmManyToOneMapping) getMapping()).initialize(manyToOne); + } + + public void initialize(XmlOneToMany oneToMany) { + ((GenericOrmOneToManyMapping) getMapping()).initialize(oneToMany); + } + + public void initialize(XmlOneToOne oneToOne) { + ((GenericOrmOneToOneMapping) getMapping()).initialize(oneToOne); + } + + public void initialize(XmlManyToMany manyToMany) { + ((GenericOrmManyToManyMapping) getMapping()).initialize(manyToMany); + } + + public void initialize(XmlId id) { + ((GenericOrmIdMapping) getMapping()).initialize(id); + } + + public void initialize(XmlEmbeddedId embeddedId) { + ((GenericOrmEmbeddedIdMapping) getMapping()).initialize(embeddedId); + } + + public void initialize(XmlTransient transientResource) { + ((GenericOrmTransientMapping) getMapping()).initialize(transientResource); + } + + public void update(XmlId id) { + if (mappingKey() == MappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmIdMapping) getMapping()).update(id); + } + else { + setSpecifiedMappingKey_(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmIdMapping) getMapping()).initialize(id); + } + } + + public void update(XmlEmbeddedId embeddedId) { + if (mappingKey() == MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmEmbeddedIdMapping) getMapping()).update(embeddedId); + } + else { + setSpecifiedMappingKey_(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmEmbeddedIdMapping) getMapping()).initialize(embeddedId); + } + } + + public void update(XmlBasic basic) { + if (mappingKey() == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmBasicMapping) getMapping()).update(basic); + } + else { + setSpecifiedMappingKey_(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmBasicMapping) getMapping()).initialize(basic); + } + } + + public void update(XmlVersion version) { + if (mappingKey() == MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmVersionMapping) getMapping()).update(version); + } + else { + setSpecifiedMappingKey_(MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmVersionMapping) getMapping()).initialize(version); + } + } + public void update(XmlManyToOne manyToOne) { + if (mappingKey() == MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmManyToOneMapping) getMapping()).update(manyToOne); + } + else { + setSpecifiedMappingKey_(MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmManyToOneMapping) getMapping()).initialize(manyToOne); + } + } + public void update(XmlOneToMany oneToMany) { + if (mappingKey() == MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmOneToManyMapping) getMapping()).update(oneToMany); + } + else { + setSpecifiedMappingKey_(MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmOneToManyMapping) getMapping()).initialize(oneToMany); + } + } + public void update(XmlOneToOne oneToOne) { + if (mappingKey() == MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmOneToOneMapping) getMapping()).update(oneToOne); + } + else { + setSpecifiedMappingKey_(MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmOneToOneMapping) getMapping()).initialize(oneToOne); + } + } + public void update(XmlManyToMany manyToMany) { + if (mappingKey() == MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmManyToManyMapping) getMapping()).update(manyToMany); + } + else { + setSpecifiedMappingKey_(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmManyToManyMapping) getMapping()).initialize(manyToMany); + } + } + + public void update(XmlEmbedded embedded) { + if (mappingKey() == MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmEmbeddedMapping) getMapping()).update(embedded); + } + else { + setSpecifiedMappingKey_(MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmEmbeddedMapping) getMapping()).initialize(embedded); + } + } + + public void update(XmlTransient transientResource) { + if (mappingKey() == MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { + ((GenericOrmTransientMapping) getMapping()).update(transientResource); + } + else { + setSpecifiedMappingKey_(MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + ((GenericOrmTransientMapping) getMapping()).initialize(transientResource); + } + } + + public JpaStructureNode structureNode(int offset) { + return this; + } + + public boolean containsOffset(int textOffset) { + if (isVirtual()) { + return false; + } + return attributeMapping.containsOffset(textOffset); + } + + public TextRange selectionTextRange() { + if (isVirtual()) { + return persistentType().selectionTextRange(); + } + return attributeMapping.selectionTextRange(); + } + + + @Override + public void toString(StringBuilder sb) { + super.toString(sb); + sb.append(getName()); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java index 23243f0fe7..9222876aee 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlTransientMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlTransientMappingProvider implements IXmlAttributeMappingProvider +public class OrmTransientMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlTransientMappingProvider INSTANCE = new XmlTransientMappingProvider(); + private static final OrmTransientMappingProvider INSTANCE = new OrmTransientMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlTransientMappingProvider() { + private OrmTransientMappingProvider() { super(); } public String key() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } - public XmlTransientMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlTransientMapping(parent); + public GenericOrmTransientMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmTransientMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java index 08108fe28d..df57d14968 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlManyToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java @@ -9,33 +9,34 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.orm.OrmAttributeMappingProvider; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; -public class XmlManyToManyMappingProvider implements IXmlAttributeMappingProvider +public class OrmVersionMappingProvider implements OrmAttributeMappingProvider { // singleton - private static final XmlManyToManyMappingProvider INSTANCE = new XmlManyToManyMappingProvider(); + private static final OrmVersionMappingProvider INSTANCE = new OrmVersionMappingProvider(); /** * Return the singleton. */ - public static IXmlAttributeMappingProvider instance() { + public static OrmAttributeMappingProvider instance() { return INSTANCE; } /** * Ensure non-instantiability. */ - private XmlManyToManyMappingProvider() { + private OrmVersionMappingProvider() { super(); } public String key() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } - public XmlManyToManyMapping buildAttributeMapping(IJpaBaseContextFactory factory, XmlPersistentAttribute parent) { - return new XmlManyToManyMapping(parent); + public GenericOrmVersionMapping buildAttributeMapping(JpaBaseContextFactory factory, OrmPersistentAttribute parent) { + return new GenericOrmVersionMapping(parent); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java index 1d23e6e6e8..c9740b7cd0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java @@ -11,14 +11,18 @@ package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.core.resources.IResource; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.OrmResource; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmResource; -public class OrmXmlImpl extends JpaContextNode +public class OrmXmlImpl extends AbstractJpaContextNode implements OrmXml { protected OrmResource ormResource; @@ -26,7 +30,7 @@ public class OrmXmlImpl extends JpaContextNode protected EntityMappings entityMappings; - public OrmXmlImpl(IMappingFileRef parent) { + public OrmXmlImpl(MappingFileRef parent) { super(parent); } @@ -35,7 +39,7 @@ public class OrmXmlImpl extends JpaContextNode return null; } - public XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName) { + public OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName) { if (getEntityMappings() != null) { return getEntityMappings().persistentTypeFor(fullyQualifiedTypeName); } @@ -64,7 +68,7 @@ public class OrmXmlImpl extends JpaContextNode throw new IllegalStateException(); } - org.eclipse.jpt.core.internal.resource.orm.EntityMappings ormEntityMappings = OrmFactory.eINSTANCE.createEntityMappings(); + org.eclipse.jpt.core.resource.orm.EntityMappings ormEntityMappings = OrmFactory.eINSTANCE.createEntityMappings(); this.entityMappings = createEntityMappings(ormEntityMappings); this.ormResource.getContents().add(ormEntityMappings); firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, null, this.entityMappings); @@ -78,7 +82,7 @@ public class OrmXmlImpl extends JpaContextNode EntityMappings oldEntityMappings = this.entityMappings; this.entityMappings = null; - org.eclipse.jpt.core.internal.resource.orm.EntityMappings ormEntityMappings = this.ormResource.getEntityMappings(); //TODO helper removeEntityMappings method on ormResource?? + org.eclipse.jpt.core.resource.orm.EntityMappings ormEntityMappings = this.ormResource.getEntityMappings(); //TODO helper removeEntityMappings method on ormResource?? this.ormResource.getContents().remove(ormEntityMappings); firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, oldEntityMappings, null); } @@ -115,8 +119,8 @@ public class OrmXmlImpl extends JpaContextNode } } - protected EntityMappings createEntityMappings(org.eclipse.jpt.core.internal.resource.orm.EntityMappings ormEntityMappings) { - EntityMappings entityMappings = jpaFactory().createEntityMappings(this); + protected EntityMappings createEntityMappings(org.eclipse.jpt.core.resource.orm.EntityMappings ormEntityMappings) { + EntityMappings entityMappings = jpaFactory().buildEntityMappings(this); entityMappings.initialize(ormEntityMappings); return entityMappings; } @@ -124,7 +128,7 @@ public class OrmXmlImpl extends JpaContextNode // ************************************************************************* - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { if (entityMappings.containsOffset(textOffset)) { return entityMappings.structureNode(textOffset); } @@ -132,11 +136,11 @@ public class OrmXmlImpl extends JpaContextNode } // never actually selected - public ITextRange selectionTextRange() { - return ITextRange.Empty.instance(); + public TextRange selectionTextRange() { + return TextRange.Empty.instance(); } - public ITextRange validationTextRange() { - return ITextRange.Empty.instance(); + public TextRange validationTextRange() { + return TextRange.Empty.instance(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualAttributeOverride.java index 26986f20ed..baa078c0c8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualAttributeOverride.java @@ -7,21 +7,23 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeOverride; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlColumn; -public class VirtualAttributeOverride extends JpaEObject implements AttributeOverride +public class VirtualAttributeOverride extends AbstractJpaEObject implements XmlAttributeOverride { - protected IJavaAttributeOverride javaAttributeOverride; + protected JavaAttributeOverride javaAttributeOverride; protected final VirtualColumn column; protected boolean metadataComplete; - protected VirtualAttributeOverride(IJavaAttributeOverride javaAttributeOverride, boolean metadataComplete) { + protected VirtualAttributeOverride(JavaAttributeOverride javaAttributeOverride, boolean metadataComplete) { super(); this.javaAttributeOverride = javaAttributeOverride; this.metadataComplete = metadataComplete; @@ -41,15 +43,15 @@ public class VirtualAttributeOverride extends JpaEObject implements AttributeOve } - public Column getColumn() { + public XmlColumn getColumn() { return this.column; } - public void setColumn(Column value) { + public void setColumn(XmlColumn value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaAttributeOverride javaAttributeOverride) { + public void update(JavaAttributeOverride javaAttributeOverride) { this.javaAttributeOverride = javaAttributeOverride; this.column.update(javaAttributeOverride.getColumn()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualBasic.java index 575c94c858..2c9087c4db 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualBasic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualBasic.java @@ -7,27 +7,29 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaBasicMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; -import org.eclipse.jpt.core.internal.resource.orm.EnumType; -import org.eclipse.jpt.core.internal.resource.orm.FetchType; -import org.eclipse.jpt.core.internal.resource.orm.TemporalType; +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.EnumType; +import org.eclipse.jpt.core.resource.orm.FetchType; +import org.eclipse.jpt.core.resource.orm.TemporalType; /** * VirtualBasic is an implementation of Basic used when there is * no tag in the orm.xml and an underlying javaBasicMapping exists. */ -public class VirtualBasic extends JpaEObject implements Basic +public class VirtualBasic extends AbstractJpaEObject implements XmlBasic { - IJavaBasicMapping javaBasicMapping; + JavaBasicMapping javaBasicMapping; protected final VirtualColumn column; protected boolean metadataComplete; - public VirtualBasic(IJavaBasicMapping javaBasicMapping, boolean metadataComplete) { + public VirtualBasic(JavaBasicMapping javaBasicMapping, boolean metadataComplete) { super(); this.javaBasicMapping = javaBasicMapping; this.metadataComplete = metadataComplete; @@ -42,22 +44,22 @@ public class VirtualBasic extends JpaEObject implements Basic throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public Column getColumn() { + public XmlColumn getColumn() { return this.column; } - public void setColumn(Column value) { + public void setColumn(XmlColumn value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } public FetchType getFetch() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaBasicMapping.getDefaultFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaBasicMapping.getDefaultFetch()); } - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaBasicMapping.getFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaBasicMapping.getFetch()); } - public void setFetch(org.eclipse.jpt.core.internal.resource.orm.FetchType newFetch) { + public void setFetch(org.eclipse.jpt.core.resource.orm.FetchType newFetch) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -87,7 +89,7 @@ public class VirtualBasic extends JpaEObject implements Basic if (this.metadataComplete) { return null; } - return org.eclipse.jpt.core.internal.context.base.TemporalType.toOrmResourceModel(this.javaBasicMapping.getTemporal()); + return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaBasicMapping.getTemporal()); } public void setTemporal(TemporalType newTemporal){ @@ -96,9 +98,9 @@ public class VirtualBasic extends JpaEObject implements Basic public EnumType getEnumerated() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.EnumType.toOrmResourceModel(this.javaBasicMapping.getDefaultEnumerated()); + return org.eclipse.jpt.core.context.EnumType.toOrmResourceModel(this.javaBasicMapping.getDefaultEnumerated()); } - return org.eclipse.jpt.core.internal.context.base.EnumType.toOrmResourceModel(this.javaBasicMapping.getEnumerated()); + return org.eclipse.jpt.core.context.EnumType.toOrmResourceModel(this.javaBasicMapping.getEnumerated()); } public void setEnumerated(EnumType newEnumerated) { @@ -106,7 +108,7 @@ public class VirtualBasic extends JpaEObject implements Basic } - public void update(IJavaBasicMapping javaBasicMapping) { + public void update(JavaBasicMapping javaBasicMapping) { this.javaBasicMapping = javaBasicMapping; this.column.update(javaBasicMapping.getColumn()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualCascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualCascadeType.java index 75f805767d..b5f5c117d7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualCascadeType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualCascadeType.java @@ -7,24 +7,25 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.CascadeType; -public class VirtualCascadeType extends JpaEObject implements CascadeType +public class VirtualCascadeType extends AbstractJpaEObject implements CascadeType { - ICascade javaCascade; + Cascade javaCascade; protected boolean metadataComplete; - public VirtualCascadeType(ICascade javaCascade, boolean metadataComplete) { + public VirtualCascadeType(Cascade javaCascade, boolean metadataComplete) { super(); this.javaCascade = javaCascade; this.metadataComplete = metadataComplete; } - public void update(ICascade javaCascade) { + public void update(Cascade javaCascade) { this.javaCascade = javaCascade; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualColumn.java index 3c06763bc5..dbe6d05d38 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualColumn.java @@ -7,19 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaColumn; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlColumn; -public class VirtualColumn extends JpaEObject implements Column +public class VirtualColumn extends AbstractJpaEObject implements XmlColumn { - protected IJavaColumn javaColumn; + protected JavaColumn javaColumn; protected boolean metadataComplete; - protected VirtualColumn(IJavaColumn javaColumn, boolean metadataComplete) { + protected VirtualColumn(JavaColumn javaColumn, boolean metadataComplete) { super(); this.javaColumn = javaColumn; this.metadataComplete = metadataComplete; @@ -135,7 +136,7 @@ public class VirtualColumn extends JpaEObject implements Column throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaColumn javaColumn) { + public void update(JavaColumn javaColumn) { this.javaColumn = javaColumn; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualEmbedded.java index 79f575ab1f..32963dd308 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualEmbedded.java @@ -7,38 +7,40 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlEmbedded; /** * VirtualEmbedded is an implementation of Embedded used when there is * no tag in the orm.xml and an underlying javaEmbeddedMapping exists. */ -public class VirtualEmbedded extends JpaEObject implements Embedded +public class VirtualEmbedded extends AbstractJpaEObject implements XmlEmbedded { - IJavaEmbeddedMapping javaEmbeddedMapping; + JavaEmbeddedMapping javaEmbeddedMapping; protected boolean metadataComplete; - protected EList<AttributeOverride> virtualAttributeOverrides; + protected EList<XmlAttributeOverride> virtualAttributeOverrides; - public VirtualEmbedded(IJavaEmbeddedMapping javaEmbeddedMapping, boolean metadataComplete) { + public VirtualEmbedded(JavaEmbeddedMapping javaEmbeddedMapping, boolean metadataComplete) { super(); this.javaEmbeddedMapping = javaEmbeddedMapping; this.metadataComplete = metadataComplete; this.initializeAttributeOverrides(javaEmbeddedMapping); } - protected void initializeAttributeOverrides(IJavaEmbeddedMapping javaEmbeddedMapping) { - this.virtualAttributeOverrides = new BasicEList<AttributeOverride>(); - ListIterator<IJavaAttributeOverride> javaAttributesOverrides; + protected void initializeAttributeOverrides(JavaEmbeddedMapping javaEmbeddedMapping) { + this.virtualAttributeOverrides = new BasicEList<XmlAttributeOverride>(); + ListIterator<JavaAttributeOverride> javaAttributesOverrides; if (this.metadataComplete) { javaAttributesOverrides = this.javaEmbeddedMapping.defaultAttributeOverrides(); } @@ -60,18 +62,18 @@ public class VirtualEmbedded extends JpaEObject implements Embedded } - public EList<AttributeOverride> getAttributeOverrides() { + public EList<XmlAttributeOverride> getAttributeOverrides() { return this.virtualAttributeOverrides; } - public void update(IJavaEmbeddedMapping javaEmbeddedMapping) { + public void update(JavaEmbeddedMapping javaEmbeddedMapping) { this.javaEmbeddedMapping = javaEmbeddedMapping; this.updateAttributeOverrides(javaEmbeddedMapping); } - protected void updateAttributeOverrides(IJavaEmbeddedMapping javaEmbeddedMapping) { - ListIterator<IJavaAttributeOverride> javaAttributesOverrides; - ListIterator<AttributeOverride> virtualAttributeOverrides = this.virtualAttributeOverrides.listIterator(); + protected void updateAttributeOverrides(JavaEmbeddedMapping javaEmbeddedMapping) { + ListIterator<JavaAttributeOverride> javaAttributesOverrides; + ListIterator<XmlAttributeOverride> virtualAttributeOverrides = this.virtualAttributeOverrides.listIterator(); if (this.metadataComplete) { javaAttributesOverrides = this.javaEmbeddedMapping.defaultAttributeOverrides(); } @@ -80,7 +82,7 @@ public class VirtualEmbedded extends JpaEObject implements Embedded } while (javaAttributesOverrides.hasNext()) { - IJavaAttributeOverride javaAttributeOverride = javaAttributesOverrides.next(); + JavaAttributeOverride javaAttributeOverride = javaAttributesOverrides.next(); if (virtualAttributeOverrides.hasNext()) { VirtualAttributeOverride virtualAttributeOverride = (VirtualAttributeOverride) virtualAttributeOverrides.next(); virtualAttributeOverride.update(javaAttributeOverride); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualEmbeddedId.java index ee62a0c87f..aeb0f4ca68 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualEmbeddedId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualEmbeddedId.java @@ -7,38 +7,40 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; +import org.eclipse.jpt.core.resource.orm.XmlEmbeddedId; /** * VirtualEmbeddedId is an implementation of EmbeddedId used when there is * no tag in the orm.xml and an underlying javaEmbeddedIdMapping exists. */ -public class VirtualEmbeddedId extends JpaEObject implements EmbeddedId +public class VirtualEmbeddedId extends AbstractJpaEObject implements XmlEmbeddedId { - IJavaEmbeddedIdMapping javaEmbeddedIdMapping; + JavaEmbeddedIdMapping javaEmbeddedIdMapping; protected boolean metadataComplete; - protected EList<AttributeOverride> virtualAttributeOverrides; + protected EList<XmlAttributeOverride> virtualAttributeOverrides; - public VirtualEmbeddedId(IJavaEmbeddedIdMapping javaEmbeddedIdMapping, boolean metadataComplete) { + public VirtualEmbeddedId(JavaEmbeddedIdMapping javaEmbeddedIdMapping, boolean metadataComplete) { super(); this.javaEmbeddedIdMapping = javaEmbeddedIdMapping; this.metadataComplete = metadataComplete; this.initializeAttributeOverrides(javaEmbeddedIdMapping); } - protected void initializeAttributeOverrides(IJavaEmbeddedIdMapping javaEmbeddedIdMapping) { - this.virtualAttributeOverrides = new BasicEList<AttributeOverride>(); - ListIterator<IJavaAttributeOverride> javaAttributesOverrides; + protected void initializeAttributeOverrides(JavaEmbeddedIdMapping javaEmbeddedIdMapping) { + this.virtualAttributeOverrides = new BasicEList<XmlAttributeOverride>(); + ListIterator<JavaAttributeOverride> javaAttributesOverrides; if (this.metadataComplete) { javaAttributesOverrides = this.javaEmbeddedIdMapping.defaultAttributeOverrides(); } @@ -60,18 +62,18 @@ public class VirtualEmbeddedId extends JpaEObject implements EmbeddedId } - public EList<AttributeOverride> getAttributeOverrides() { + public EList<XmlAttributeOverride> getAttributeOverrides() { return this.virtualAttributeOverrides; } - public void update(IJavaEmbeddedIdMapping javaEmbeddedIdMapping) { + public void update(JavaEmbeddedIdMapping javaEmbeddedIdMapping) { this.javaEmbeddedIdMapping = javaEmbeddedIdMapping; this.updateAttributeOverrides(javaEmbeddedIdMapping); } - protected void updateAttributeOverrides(IJavaEmbeddedIdMapping javaEmbeddedIdMapping) { - ListIterator<IJavaAttributeOverride> javaAttributesOverrides; - ListIterator<AttributeOverride> virtualAttributeOverrides = this.virtualAttributeOverrides.listIterator(); + protected void updateAttributeOverrides(JavaEmbeddedIdMapping javaEmbeddedIdMapping) { + ListIterator<JavaAttributeOverride> javaAttributesOverrides; + ListIterator<XmlAttributeOverride> virtualAttributeOverrides = this.virtualAttributeOverrides.listIterator(); if (this.metadataComplete) { javaAttributesOverrides = this.javaEmbeddedIdMapping.defaultAttributeOverrides(); } @@ -80,7 +82,7 @@ public class VirtualEmbeddedId extends JpaEObject implements EmbeddedId } while (javaAttributesOverrides.hasNext()) { - IJavaAttributeOverride javaAttributeOverride = javaAttributesOverrides.next(); + JavaAttributeOverride javaAttributeOverride = javaAttributesOverrides.next(); if (virtualAttributeOverrides.hasNext()) { VirtualAttributeOverride virtualAttributeOverride = (VirtualAttributeOverride) virtualAttributeOverrides.next(); virtualAttributeOverride.update(javaAttributeOverride); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualGeneratedValue.java index 5da46542a7..ade83d60b6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualGeneratedValue.java @@ -7,19 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaGeneratedValue; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaGeneratedValue; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue; +import org.eclipse.jpt.core.resource.orm.GenerationType; -public class VirtualGeneratedValue extends JpaEObject implements GeneratedValue +public class VirtualGeneratedValue extends AbstractJpaEObject implements XmlGeneratedValue { - IJavaGeneratedValue javaGeneratedValue; + JavaGeneratedValue javaGeneratedValue; protected boolean metadataComplete; - public VirtualGeneratedValue(IJavaGeneratedValue javaGeneratedValue, boolean metadataComplete) { + public VirtualGeneratedValue(JavaGeneratedValue javaGeneratedValue, boolean metadataComplete) { super(); this.javaGeneratedValue = javaGeneratedValue; this.metadataComplete = metadataComplete; @@ -37,7 +39,7 @@ public class VirtualGeneratedValue extends JpaEObject implements GeneratedValue if (this.metadataComplete) { return null; } - return org.eclipse.jpt.core.internal.context.base.GenerationType.toOrmResourceModel(this.javaGeneratedValue.getStrategy()); + return org.eclipse.jpt.core.context.GenerationType.toOrmResourceModel(this.javaGeneratedValue.getStrategy()); } public void setGenerator(String value) { @@ -50,7 +52,7 @@ public class VirtualGeneratedValue extends JpaEObject implements GeneratedValue - public void update(IJavaGeneratedValue javaGeneratedValue) { + public void update(JavaGeneratedValue javaGeneratedValue) { this.javaGeneratedValue = javaGeneratedValue; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualId.java index 2eac9b83da..372ac26e9c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualId.java @@ -7,19 +7,24 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaIdMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; -import org.eclipse.jpt.core.internal.resource.orm.TemporalType; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.XmlGeneratedValue; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator; +import org.eclipse.jpt.core.resource.orm.XmlTableGenerator; +import org.eclipse.jpt.core.resource.orm.TemporalType; /** * VirtualId is an implementation of Id used when there is * no tag in the orm.xml and an underlying javaIdMapping exists. */ -public class VirtualId extends JpaEObject implements Id +public class VirtualId extends AbstractJpaEObject implements XmlId { - IJavaIdMapping javaIdMapping; + JavaIdMapping javaIdMapping; protected boolean metadataComplete; @@ -33,7 +38,7 @@ public class VirtualId extends JpaEObject implements Id - public VirtualId(IJavaIdMapping javaIdMapping, boolean metadataComplete) { + public VirtualId(JavaIdMapping javaIdMapping, boolean metadataComplete) { super(); this.javaIdMapping = javaIdMapping; this.metadataComplete = metadataComplete; @@ -51,11 +56,11 @@ public class VirtualId extends JpaEObject implements Id throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public Column getColumn() { + public XmlColumn getColumn() { return this.column; } - public void setColumn(Column value) { + public void setColumn(XmlColumn value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -63,7 +68,7 @@ public class VirtualId extends JpaEObject implements Id if (this.metadataComplete) { return null; } - return org.eclipse.jpt.core.internal.context.base.TemporalType.toOrmResourceModel(this.javaIdMapping.getTemporal()); + return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaIdMapping.getTemporal()); } public void setTemporal(TemporalType newTemporal){ @@ -71,7 +76,7 @@ public class VirtualId extends JpaEObject implements Id } - public GeneratedValue getGeneratedValue() { + public XmlGeneratedValue getGeneratedValue() { if (this.metadataComplete) { return null; } @@ -81,11 +86,11 @@ public class VirtualId extends JpaEObject implements Id return null; } - public void setGeneratedValue(GeneratedValue value) { + public void setGeneratedValue(XmlGeneratedValue value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public SequenceGenerator getSequenceGenerator() { + public XmlSequenceGenerator getSequenceGenerator() { if (this.metadataComplete) { return null; } @@ -95,11 +100,11 @@ public class VirtualId extends JpaEObject implements Id return null; } - public void setSequenceGenerator(SequenceGenerator value) { + public void setSequenceGenerator(XmlSequenceGenerator value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public TableGenerator getTableGenerator() { + public XmlTableGenerator getTableGenerator() { if (this.metadataComplete) { return null; } @@ -109,12 +114,12 @@ public class VirtualId extends JpaEObject implements Id return null; } - public void setTableGenerator(TableGenerator value) { + public void setTableGenerator(XmlTableGenerator value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaIdMapping javaIdMapping) { + public void update(JavaIdMapping javaIdMapping) { this.javaIdMapping = javaIdMapping; this.column.update(javaIdMapping.getColumn()); this.virtualGeneratedValue.update(javaIdMapping.getGeneratedValue()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualJoinColumn.java index 8846997e87..5914e92bb0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualJoinColumn.java @@ -7,18 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinColumn; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; -public class VirtualJoinColumn extends JpaEObject implements JoinColumn +public class VirtualJoinColumn extends AbstractJpaEObject implements XmlJoinColumn { - protected IJavaJoinColumn javaJoinColumn; + protected JavaJoinColumn javaJoinColumn; protected boolean metadataComplete; - protected VirtualJoinColumn(IJavaJoinColumn javaJoinColumn, boolean metadataComplete) { + protected VirtualJoinColumn(JavaJoinColumn javaJoinColumn, boolean metadataComplete) { super(); this.javaJoinColumn = javaJoinColumn; this.metadataComplete = metadataComplete; @@ -112,7 +113,7 @@ public class VirtualJoinColumn extends JpaEObject implements JoinColumn throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaJoinColumn javaJoinColumn) { + public void update(JavaJoinColumn javaJoinColumn) { this.javaJoinColumn = javaJoinColumn; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualJoinTable.java index 14b1596adc..bd7e10e01e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualJoinTable.java @@ -7,31 +7,34 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinTable; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.UniqueConstraint; -public class VirtualJoinTable extends JpaEObject implements JoinTable +public class VirtualJoinTable extends AbstractJpaEObject implements XmlJoinTable { - protected IJavaJoinTable javaJoinTable; + protected JavaJoinTable javaJoinTable; protected boolean metadataComplete; - protected VirtualJoinTable(IJavaJoinTable javaJoinTable, boolean metadataComplete) { + protected VirtualJoinTable(JavaJoinTable javaJoinTable, boolean metadataComplete) { super(); this.javaJoinTable = javaJoinTable; this.metadataComplete = metadataComplete; } - public EList<JoinColumn> getInverseJoinColumns() { + public EList<XmlJoinColumn> getInverseJoinColumns() { // TODO Auto-generated method stub return null; } - public EList<JoinColumn> getJoinColumns() { + public EList<XmlJoinColumn> getJoinColumns() { // TODO Auto-generated method stub return null; } @@ -74,7 +77,7 @@ public class VirtualJoinTable extends JpaEObject implements JoinTable return null; } - public void update(IJavaJoinTable javaJoinTable) { + public void update(JavaJoinTable javaJoinTable) { this.javaJoinTable = javaJoinTable; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualManyToMany.java index 325d0a22be..ef4ca17a62 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualManyToMany.java @@ -7,20 +7,25 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToManyMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; -import org.eclipse.jpt.core.internal.resource.orm.FetchType; +import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.CascadeType; +import org.eclipse.jpt.core.resource.orm.FetchType; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.XmlManyToMany; +import org.eclipse.jpt.core.resource.orm.MapKey; /** * VirtualManyToMany is an implementation of ManyToMany used when there is * no tag in the orm.xml and an underlying javaManyToManyMapping exists. */ -public class VirtualManyToMany extends JpaEObject implements ManyToMany +public class VirtualManyToMany extends AbstractJpaEObject implements XmlManyToMany { - IJavaManyToManyMapping javaManyToManyMapping; + JavaManyToManyMapping javaManyToManyMapping; protected boolean metadataComplete; @@ -33,7 +38,7 @@ public class VirtualManyToMany extends JpaEObject implements ManyToMany //TODO joinColumns not yet supported in the context model // protected EList<JoinColumn> virtualJoinColumns; - public VirtualManyToMany(IJavaManyToManyMapping javaManyToManyMapping, boolean metadataComplete) { + public VirtualManyToMany(JavaManyToManyMapping javaManyToManyMapping, boolean metadataComplete) { super(); this.javaManyToManyMapping = javaManyToManyMapping; this.metadataComplete = metadataComplete; @@ -68,16 +73,16 @@ public class VirtualManyToMany extends JpaEObject implements ManyToMany public FetchType getFetch() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getDefaultFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getDefaultFetch()); } - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToManyMapping.getFetch()); } - public void setFetch(org.eclipse.jpt.core.internal.resource.orm.FetchType newFetch) { + public void setFetch(org.eclipse.jpt.core.resource.orm.FetchType newFetch) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public EList<JoinColumn> getJoinColumns() { + public EList<XmlJoinColumn> getJoinColumns() { return null; } @@ -89,12 +94,12 @@ public class VirtualManyToMany extends JpaEObject implements ManyToMany throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public JoinTable getJoinTable() { + public XmlJoinTable getJoinTable() { //TODO we don't yet support JoinTable in the context model for many-to-one mappings return null;//this.virtualJoinTable; } - public void setJoinTable(JoinTable value) { + public void setJoinTable(XmlJoinTable value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -140,7 +145,7 @@ public class VirtualManyToMany extends JpaEObject implements ManyToMany throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaManyToManyMapping javaManyToManyMapping) { + public void update(JavaManyToManyMapping javaManyToManyMapping) { this.javaManyToManyMapping = javaManyToManyMapping; this.virtualCascadeType.update(javaManyToManyMapping.getCascade()); this.virtualJoinTable.update(javaManyToManyMapping.getJoinTable()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualManyToOne.java index cdbf5860fd..dd5c3864bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualManyToOne.java @@ -7,14 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToOneMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.CascadeType; +import org.eclipse.jpt.core.resource.orm.FetchType; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.XmlManyToOne; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; @@ -22,9 +27,9 @@ import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; * VirtualManyToOne is an implementation of ManyToOne used when there is * no tag in the orm.xml and an underlying javaManyToOneMapping exists. */ -public class VirtualManyToOne extends JpaEObject implements ManyToOne +public class VirtualManyToOne extends AbstractJpaEObject implements XmlManyToOne { - IJavaManyToOneMapping javaManyToOneMapping; + JavaManyToOneMapping javaManyToOneMapping; protected boolean metadataComplete; @@ -32,9 +37,9 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne protected final VirtualCascadeType virtualCascadeType; - protected EList<JoinColumn> virtualJoinColumns; + protected EList<XmlJoinColumn> virtualJoinColumns; - public VirtualManyToOne(IJavaManyToOneMapping javaManyToOneMapping, boolean metadataComplete) { + public VirtualManyToOne(JavaManyToOneMapping javaManyToOneMapping, boolean metadataComplete) { super(); this.javaManyToOneMapping = javaManyToOneMapping; this.metadataComplete = metadataComplete; @@ -42,16 +47,16 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne this.virtualCascadeType = new VirtualCascadeType(javaManyToOneMapping.getCascade(), this.metadataComplete); } - protected void initializeJoinColumns(IJavaManyToOneMapping javaManyToOneMapping) { - this.virtualJoinColumns = new BasicEList<JoinColumn>(); - ListIterator<IJavaJoinColumn> javaJoinColumns; + protected void initializeJoinColumns(JavaManyToOneMapping javaManyToOneMapping) { + this.virtualJoinColumns = new BasicEList<XmlJoinColumn>(); + ListIterator<JavaJoinColumn> javaJoinColumns; if (this.metadataComplete) { //TODO still need a default join column in xml if (javaManyToOneMapping.getDefaultJoinColumn() == null) { javaJoinColumns = EmptyListIterator.instance(); } else { - javaJoinColumns = new SingleElementListIterator<IJavaJoinColumn>(javaManyToOneMapping.getDefaultJoinColumn()); + javaJoinColumns = new SingleElementListIterator<JavaJoinColumn>(javaManyToOneMapping.getDefaultJoinColumn()); } } else { @@ -73,12 +78,12 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne public FetchType getFetch() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getDefaultFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getDefaultFetch()); } - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaManyToOneMapping.getFetch()); } - public void setFetch(org.eclipse.jpt.core.internal.resource.orm.FetchType newFetch) { + public void setFetch(org.eclipse.jpt.core.resource.orm.FetchType newFetch) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -93,7 +98,7 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public EList<JoinColumn> getJoinColumns() { + public EList<XmlJoinColumn> getJoinColumns() { return this.virtualJoinColumns; } @@ -105,12 +110,12 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public JoinTable getJoinTable() { + public XmlJoinTable getJoinTable() { //TODO we don't yet support JoinTable in the context model for many-to-one mappings return null;//this.virtualJoinTable; } - public void setJoinTable(JoinTable value) { + public void setJoinTable(XmlJoinTable value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -125,22 +130,22 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaManyToOneMapping javaManyToOneMapping) { + public void update(JavaManyToOneMapping javaManyToOneMapping) { this.javaManyToOneMapping = javaManyToOneMapping; this.virtualCascadeType.update(javaManyToOneMapping.getCascade()); this.updateJoinColumns(javaManyToOneMapping); } - protected void updateJoinColumns(IJavaManyToOneMapping javaManyToOneMapping) { - ListIterator<IJavaJoinColumn> javaJoinColumns; - ListIterator<JoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator(); + protected void updateJoinColumns(JavaManyToOneMapping javaManyToOneMapping) { + ListIterator<JavaJoinColumn> javaJoinColumns; + ListIterator<XmlJoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator(); if (this.metadataComplete) { //TODO still need a default join column in xml if (javaManyToOneMapping.getDefaultJoinColumn() == null) { javaJoinColumns = EmptyListIterator.instance(); } else { - javaJoinColumns = new SingleElementListIterator<IJavaJoinColumn>(javaManyToOneMapping.getDefaultJoinColumn()); + javaJoinColumns = new SingleElementListIterator<JavaJoinColumn>(javaManyToOneMapping.getDefaultJoinColumn()); } } else { @@ -148,7 +153,7 @@ public class VirtualManyToOne extends JpaEObject implements ManyToOne } while (javaJoinColumns.hasNext()) { - IJavaJoinColumn javaJoinColumn = javaJoinColumns.next(); + JavaJoinColumn javaJoinColumn = javaJoinColumns.next(); if (virtualJoinColumns.hasNext()) { VirtualJoinColumn virtualJoinColumn = (VirtualJoinColumn) virtualJoinColumns.next(); virtualJoinColumn.update(javaJoinColumn); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualMapKey.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualMapKey.java index e74f79bff7..f354af95fe 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualMapKey.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualMapKey.java @@ -7,18 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaMultiRelationshipMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaMultiRelationshipMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.MapKey; -public class VirtualMapKey extends JpaEObject implements MapKey +public class VirtualMapKey extends AbstractJpaEObject implements MapKey { - IJavaMultiRelationshipMapping javaMultiRelationshipMapping; + JavaMultiRelationshipMapping javaMultiRelationshipMapping; protected boolean metadataComplete; - public VirtualMapKey(IJavaMultiRelationshipMapping javaMultiRelationshipMapping, boolean metadataComplete) { + public VirtualMapKey(JavaMultiRelationshipMapping javaMultiRelationshipMapping, boolean metadataComplete) { super(); this.javaMultiRelationshipMapping = javaMultiRelationshipMapping; this.metadataComplete = metadataComplete; @@ -35,7 +36,7 @@ public class VirtualMapKey extends JpaEObject implements MapKey throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaMultiRelationshipMapping javaMultiRelationshipMapping) { + public void update(JavaMultiRelationshipMapping javaMultiRelationshipMapping) { this.javaMultiRelationshipMapping = javaMultiRelationshipMapping; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualOneToMany.java index 6190856a28..98dbd92b81 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualOneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualOneToMany.java @@ -7,20 +7,25 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToManyMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; -import org.eclipse.jpt.core.internal.resource.orm.FetchType; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.CascadeType; +import org.eclipse.jpt.core.resource.orm.FetchType; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.MapKey; +import org.eclipse.jpt.core.resource.orm.XmlOneToMany; /** * VirtualOneToMany is an implementation of OneToMany used when there is * no tag in the orm.xml and an underlying javaOneToManyMapping exists. */ -public class VirtualOneToMany extends JpaEObject implements OneToMany +public class VirtualOneToMany extends AbstractJpaEObject implements XmlOneToMany { - IJavaOneToManyMapping javaOneToManyMapping; + JavaOneToManyMapping javaOneToManyMapping; protected boolean metadataComplete; @@ -33,7 +38,7 @@ public class VirtualOneToMany extends JpaEObject implements OneToMany //TODO joinColumns not yet supported in the context model // protected EList<JoinColumn> virtualJoinColumns; - public VirtualOneToMany(IJavaOneToManyMapping javaOneToManyMapping, boolean metadataComplete) { + public VirtualOneToMany(JavaOneToManyMapping javaOneToManyMapping, boolean metadataComplete) { super(); this.javaOneToManyMapping = javaOneToManyMapping; this.metadataComplete = metadataComplete; @@ -68,16 +73,16 @@ public class VirtualOneToMany extends JpaEObject implements OneToMany public FetchType getFetch() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getDefaultFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getDefaultFetch()); } - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToManyMapping.getFetch()); } - public void setFetch(org.eclipse.jpt.core.internal.resource.orm.FetchType newFetch) { + public void setFetch(org.eclipse.jpt.core.resource.orm.FetchType newFetch) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public EList<JoinColumn> getJoinColumns() { + public EList<XmlJoinColumn> getJoinColumns() { return null; } @@ -89,12 +94,12 @@ public class VirtualOneToMany extends JpaEObject implements OneToMany throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public JoinTable getJoinTable() { + public XmlJoinTable getJoinTable() { //TODO we don't yet support JoinTable in the context model for many-to-one mappings return null;//this.virtualJoinTable; } - public void setJoinTable(JoinTable value) { + public void setJoinTable(XmlJoinTable value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -140,7 +145,7 @@ public class VirtualOneToMany extends JpaEObject implements OneToMany throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaOneToManyMapping javaOneToManyMapping) { + public void update(JavaOneToManyMapping javaOneToManyMapping) { this.javaOneToManyMapping = javaOneToManyMapping; this.virtualCascadeType.update(javaOneToManyMapping.getCascade()); this.virtualJoinTable.update(javaOneToManyMapping.getJoinTable()); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualOneToOne.java index 1c3d0b3994..0ab8059f08 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualOneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualOneToOne.java @@ -7,14 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import java.util.ListIterator; import org.eclipse.emf.common.util.BasicEList; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToOneMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.CascadeType; +import org.eclipse.jpt.core.resource.orm.FetchType; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.resource.orm.XmlOneToOne; +import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; @@ -22,9 +28,9 @@ import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; * VirtualOneToOne is an implementation of OneToOne used when there is * no tag in the orm.xml and an underlying javaOneToOneMapping exists. */ -public class VirtualOneToOne extends JpaEObject implements OneToOne +public class VirtualOneToOne extends AbstractJpaEObject implements XmlOneToOne { - IJavaOneToOneMapping javaOneToOneMapping; + JavaOneToOneMapping javaOneToOneMapping; protected boolean metadataComplete; @@ -32,11 +38,11 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne protected final VirtualCascadeType virtualCascadeType; - protected EList<JoinColumn> virtualJoinColumns; + protected EList<XmlJoinColumn> virtualJoinColumns; // protected EList<PrimaryKeyJoinColumn> virtualPrimaryKeyJoinColumns; - public VirtualOneToOne(IJavaOneToOneMapping javaOneToOneMapping, boolean metadataComplete) { + public VirtualOneToOne(JavaOneToOneMapping javaOneToOneMapping, boolean metadataComplete) { super(); this.javaOneToOneMapping = javaOneToOneMapping; this.metadataComplete = metadataComplete; @@ -45,16 +51,16 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne this.virtualCascadeType = new VirtualCascadeType(javaOneToOneMapping.getCascade(), this.metadataComplete); } - protected void initializeJoinColumns(IJavaOneToOneMapping javaOneToOneMapping) { - this.virtualJoinColumns = new BasicEList<JoinColumn>(); - ListIterator<IJavaJoinColumn> javaJoinColumns; + protected void initializeJoinColumns(JavaOneToOneMapping javaOneToOneMapping) { + this.virtualJoinColumns = new BasicEList<XmlJoinColumn>(); + ListIterator<JavaJoinColumn> javaJoinColumns; if (this.metadataComplete) { //TODO still need a default join column in xml if (javaOneToOneMapping.getDefaultJoinColumn() == null) { javaJoinColumns = EmptyListIterator.instance(); } else { - javaJoinColumns = new SingleElementListIterator<IJavaJoinColumn>(javaOneToOneMapping.getDefaultJoinColumn()); + javaJoinColumns = new SingleElementListIterator<JavaJoinColumn>(javaOneToOneMapping.getDefaultJoinColumn()); } } else { @@ -91,12 +97,12 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne public FetchType getFetch() { if (this.metadataComplete) { - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getDefaultFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getDefaultFetch()); } - return org.eclipse.jpt.core.internal.context.base.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getFetch()); + return org.eclipse.jpt.core.context.FetchType.toOrmResourceModel(this.javaOneToOneMapping.getFetch()); } - public void setFetch(org.eclipse.jpt.core.internal.resource.orm.FetchType newFetch) { + public void setFetch(org.eclipse.jpt.core.resource.orm.FetchType newFetch) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -111,7 +117,7 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public EList<JoinColumn> getJoinColumns() { + public EList<XmlJoinColumn> getJoinColumns() { return this.virtualJoinColumns; } @@ -123,12 +129,12 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public JoinTable getJoinTable() { + public XmlJoinTable getJoinTable() { //TODO we don't yet support JoinTable in the context model for many-to-one mappings return null;//this.virtualJoinTable; } - public void setJoinTable(JoinTable value) { + public void setJoinTable(XmlJoinTable value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -154,27 +160,27 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public EList<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() { + public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() { // TODO we don't yet support primary key join columns in the context model return null; } - public void update(IJavaOneToOneMapping javaOneToOneMapping) { + public void update(JavaOneToOneMapping javaOneToOneMapping) { this.javaOneToOneMapping = javaOneToOneMapping; this.virtualCascadeType.update(javaOneToOneMapping.getCascade()); this.updateJoinColumns(javaOneToOneMapping); } - protected void updateJoinColumns(IJavaOneToOneMapping javaOneToOneMapping) { - ListIterator<IJavaJoinColumn> javaJoinColumns; - ListIterator<JoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator(); + protected void updateJoinColumns(JavaOneToOneMapping javaOneToOneMapping) { + ListIterator<JavaJoinColumn> javaJoinColumns; + ListIterator<XmlJoinColumn> virtualJoinColumns = this.virtualJoinColumns.listIterator(); if (this.metadataComplete) { //TODO still need a default join column in xml if (javaOneToOneMapping.getDefaultJoinColumn() == null) { javaJoinColumns = EmptyListIterator.instance(); } else { - javaJoinColumns = new SingleElementListIterator<IJavaJoinColumn>(javaOneToOneMapping.getDefaultJoinColumn()); + javaJoinColumns = new SingleElementListIterator<JavaJoinColumn>(javaOneToOneMapping.getDefaultJoinColumn()); } } else { @@ -182,7 +188,7 @@ public class VirtualOneToOne extends JpaEObject implements OneToOne } while (javaJoinColumns.hasNext()) { - IJavaJoinColumn javaJoinColumn = javaJoinColumns.next(); + JavaJoinColumn javaJoinColumn = javaJoinColumns.next(); if (virtualJoinColumns.hasNext()) { VirtualJoinColumn virtualJoinColumn = (VirtualJoinColumn) virtualJoinColumns.next(); virtualJoinColumn.update(javaJoinColumn); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualSequenceGenerator.java index dd970700fc..8f2b45460d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualSequenceGenerator.java @@ -7,19 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaSequenceGenerator; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator; -public class VirtualSequenceGenerator extends JpaEObject implements SequenceGenerator +public class VirtualSequenceGenerator extends AbstractJpaEObject implements XmlSequenceGenerator { - IJavaSequenceGenerator javaSequenceGenerator; + JavaSequenceGenerator javaSequenceGenerator; protected boolean metadataComplete; - public VirtualSequenceGenerator(IJavaSequenceGenerator javaSequenceGenerator, boolean metadataComplete) { + public VirtualSequenceGenerator(JavaSequenceGenerator javaSequenceGenerator, boolean metadataComplete) { super(); this.javaSequenceGenerator = javaSequenceGenerator; this.metadataComplete = metadataComplete; @@ -69,7 +70,7 @@ public class VirtualSequenceGenerator extends JpaEObject implements SequenceGene throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaSequenceGenerator javaSequenceGenerator) { + public void update(JavaSequenceGenerator javaSequenceGenerator) { this.javaSequenceGenerator = javaSequenceGenerator; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualTableGenerator.java index 73c3fd120f..de33bfa29a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualTableGenerator.java @@ -7,20 +7,22 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.context.java.IJavaTableGenerator; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlTableGenerator; +import org.eclipse.jpt.core.resource.orm.UniqueConstraint; -public class VirtualTableGenerator extends JpaEObject implements TableGenerator +public class VirtualTableGenerator extends AbstractJpaEObject implements XmlTableGenerator { - IJavaTableGenerator javaTableGenerator; + JavaTableGenerator javaTableGenerator; protected boolean metadataComplete; - public VirtualTableGenerator(IJavaTableGenerator javaTableGenerator, boolean metadataComplete) { + public VirtualTableGenerator(JavaTableGenerator javaTableGenerator, boolean metadataComplete) { super(); this.javaTableGenerator = javaTableGenerator; this.metadataComplete = metadataComplete; @@ -132,7 +134,7 @@ public class VirtualTableGenerator extends JpaEObject implements TableGenerator return null; } - public void update(IJavaTableGenerator javaTableGenerator) { + public void update(JavaTableGenerator javaTableGenerator) { this.javaTableGenerator = javaTableGenerator; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualTransient.java index 146612e015..4cff9abb0c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualTransient.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualTransient.java @@ -7,22 +7,23 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaTransientMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.context.java.JavaTransientMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlTransient; /** * VirtualTransient is an implementation of Transient used when there is * no tag in the orm.xml and an underlying javaTransientMapping exists. */ -public class VirtualTransient extends JpaEObject implements Transient +public class VirtualTransient extends AbstractJpaEObject implements XmlTransient { - IJavaTransientMapping javaTransientMapping; + JavaTransientMapping javaTransientMapping; protected boolean metadataComplete; - public VirtualTransient(IJavaTransientMapping javaTransientMapping, boolean metadataComplete) { + public VirtualTransient(JavaTransientMapping javaTransientMapping, boolean metadataComplete) { super(); this.javaTransientMapping = javaTransientMapping; this.metadataComplete = metadataComplete; @@ -36,7 +37,7 @@ public class VirtualTransient extends JpaEObject implements Transient throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaTransientMapping javaTransientMapping) { + public void update(JavaTransientMapping javaTransientMapping) { this.javaTransientMapping = javaTransientMapping; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualVersion.java index 69080ce4ae..3eb88d1a2a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VirtualVersion.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualVersion.java @@ -7,25 +7,27 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.internal.context.orm; -import org.eclipse.jpt.core.internal.context.java.IJavaVersionMapping; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; -import org.eclipse.jpt.core.internal.resource.orm.TemporalType; +import org.eclipse.jpt.core.context.java.JavaVersionMapping; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; +import org.eclipse.jpt.core.resource.orm.XmlColumn; +import org.eclipse.jpt.core.resource.orm.TemporalType; +import org.eclipse.jpt.core.resource.orm.XmlVersion; /** * VirtualVersion is an implementation of Version used when there is * no tag in the orm.xml and an underlying javaVersionMapping exists. */ -public class VirtualVersion extends JpaEObject implements Version +public class VirtualVersion extends AbstractJpaEObject implements XmlVersion { - IJavaVersionMapping javaVersionMapping; + JavaVersionMapping javaVersionMapping; protected final VirtualColumn column; protected boolean metadataComplete; - public VirtualVersion(IJavaVersionMapping javaVersionMapping, boolean metadataComplete) { + public VirtualVersion(JavaVersionMapping javaVersionMapping, boolean metadataComplete) { super(); this.javaVersionMapping = javaVersionMapping; this.metadataComplete = metadataComplete; @@ -40,11 +42,11 @@ public class VirtualVersion extends JpaEObject implements Version throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public Column getColumn() { + public XmlColumn getColumn() { return this.column; } - public void setColumn(Column value) { + public void setColumn(XmlColumn value) { throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } @@ -52,14 +54,14 @@ public class VirtualVersion extends JpaEObject implements Version if (this.metadataComplete) { return null; } - return org.eclipse.jpt.core.internal.context.base.TemporalType.toOrmResourceModel(this.javaVersionMapping.getTemporal()); + return org.eclipse.jpt.core.context.TemporalType.toOrmResourceModel(this.javaVersionMapping.getTemporal()); } public void setTemporal(TemporalType newTemporal){ throw new UnsupportedOperationException("cannot set values on a virtual mapping"); } - public void update(IJavaVersionMapping javaVersionMapping) { + public void update(JavaVersionMapping javaVersionMapping) { this.javaVersionMapping = javaVersionMapping; this.column.update(javaVersionMapping.getColumn()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddableProvider.java deleted file mode 100644 index d378559380..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEmbeddableProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.orm; - -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; - - -public class XmlEmbeddableProvider implements IXmlTypeMappingProvider -{ - - public XmlTypeMapping<Embeddable> buildTypeMapping(IJpaBaseContextFactory factory, XmlPersistentType parent) { - return factory.createXmlEmbeddable(parent); - } - - public String key() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEntityProvider.java deleted file mode 100644 index b870fbc5e9..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlEntityProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.orm; - -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.orm.Entity; - - -public class XmlEntityProvider implements IXmlTypeMappingProvider -{ - public XmlTypeMapping<Entity> buildTypeMapping(IJpaBaseContextFactory factory, XmlPersistentType parent) { - return factory.createXmlEntity(parent); - } - - public String key() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMappedSuperclassProvider.java deleted file mode 100644 index 0a61f2568a..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlMappedSuperclassProvider.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.orm; - -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; - - -public class XmlMappedSuperclassProvider implements IXmlTypeMappingProvider -{ - public XmlTypeMapping<MappedSuperclass> buildTypeMapping(IJpaBaseContextFactory factory, XmlPersistentType parent) { - return factory.createXmlMappedSuperclass(parent); - } - - public String key() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentAttribute.java deleted file mode 100644 index 91b1d03cd6..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentAttribute.java +++ /dev/null @@ -1,341 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.context.orm; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Basic; -import org.eclipse.jpt.core.internal.resource.orm.Embedded; -import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.Id; -import org.eclipse.jpt.core.internal.resource.orm.ManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.ManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.OneToMany; -import org.eclipse.jpt.core.internal.resource.orm.OneToOne; -import org.eclipse.jpt.core.internal.resource.orm.Transient; -import org.eclipse.jpt.core.internal.resource.orm.Version; - - -public class XmlPersistentAttribute extends JpaContextNode - implements IPersistentAttribute -{ - - protected List<IXmlAttributeMappingProvider> attributeMappingProviders; - - protected XmlAttributeMapping<? extends AttributeMapping> attributeMapping; - - public XmlPersistentAttribute(XmlPersistentType parent, String mappingKey) { - super(parent); - this.attributeMappingProviders = buildAttributeMappingProviders(); - this.attributeMapping = buildAttributeMapping(mappingKey); - } - - protected List<IXmlAttributeMappingProvider> buildAttributeMappingProviders() { - List<IXmlAttributeMappingProvider> list = new ArrayList<IXmlAttributeMappingProvider>(); - list.add(XmlEmbeddedMappingProvider.instance()); //bug 190344 need to test default embedded before basic - list.add(XmlBasicMappingProvider.instance()); - list.add(XmlTransientMappingProvider.instance()); - list.add(XmlIdMappingProvider.instance()); - list.add(XmlManyToManyMappingProvider.instance()); - list.add(XmlOneToManyMappingProvider.instance()); - list.add(XmlManyToOneMappingProvider.instance()); - list.add(XmlOneToOneMappingProvider.instance()); - list.add(XmlVersionMappingProvider.instance()); - list.add(XmlEmbeddedIdMappingProvider.instance()); - return list; - } - - protected IXmlAttributeMappingProvider attributeMappingProvider(String key) { - for (IXmlAttributeMappingProvider provider : this.attributeMappingProviders) { - if (provider.key().equals(key)) { - return provider; - } - } - return XmlNullAttributeMappingProvider.instance(); - } - - protected XmlAttributeMapping<? extends AttributeMapping> buildAttributeMapping(String key) { - return this.attributeMappingProvider(key).buildAttributeMapping(jpaFactory(), this); - } - - public String getId() { - return IOrmStructureNodes.PERSISTENT_ATTRIBUTE_ID; - } - - public String getName() { - return getMapping().getName(); - } - - protected void nameChanged(String oldName, String newName) { - firePropertyChanged(NAME_PROPERTY, oldName, newName); - } - - public IAttributeMapping getSpecifiedMapping() { - return this.attributeMapping; - } - - public XmlAttributeMapping<? extends AttributeMapping> getMapping() { - return this.attributeMapping; - } - - public String mappingKey() { - return this.getMapping().getKey(); - } - - public String defaultMappingKey() { - return null; - } - - public void setSpecifiedMappingKey(String newMappingKey) { - if (this.mappingKey() == newMappingKey) { - return; - } - XmlAttributeMapping<? extends AttributeMapping> oldMapping = getMapping(); - this.attributeMapping = buildAttributeMapping(newMappingKey); - persistentType().changeMapping(this, oldMapping, this.attributeMapping); - firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping); - } - - protected void setSpecifiedMappingKey_(String newMappingKey) { - if (this.mappingKey() == newMappingKey) { - return; - } - XmlAttributeMapping<? extends AttributeMapping> oldMapping = getMapping(); - this.attributeMapping = buildAttributeMapping(newMappingKey); - firePropertyChanged(SPECIFIED_MAPPING_PROPERTY, oldMapping, this.attributeMapping); - } - - public Collection<IXmlAttributeMappingProvider> attributeMappingProviders() { - return this.attributeMappingProviders; - } - - public XmlPersistentType persistentType() { - return (XmlPersistentType) parent(); - } - - public XmlTypeMapping<?> typeMapping() { - return persistentType().getMapping(); - } - - public boolean isVirtual() { - return persistentType().containsVirtualPersistentAttribute(this); - } - - public void setVirtual(boolean virtual) { - xmlPersistentType().setPersistentAttributeVirtual(this, virtual); - } - - public String primaryKeyColumnName() { - return getMapping().primaryKeyColumnName(); - } - -// @Override -// public ITextRange fullTextRange() { -// return (this.isVirtual()) ? null : super.fullTextRange(); -// } -// -// @Override -// public ITextRange validationTextRange() { -// return (this.isVirtual()) ? this.persistentType().attributesTextRange() : this.getMapping().validationTextRange(); -// } -// -// @Override -// public ITextRange selectionTextRange() { -// return (isVirtual()) ? null : this.getMapping().selectionTextRange(); -// } -// -// public ITextRange nameTextRange() { -// return getMapping().nameTextRange(); -// } - - public boolean isOverridableAttribute() { - return this.getMapping().isOverridableAttributeMapping(); - } - - public boolean isOverridableAssociation() { - return this.getMapping().isOverridableAssociationMapping(); - } - - public boolean isIdAttribute() { - return this.getMapping().isIdMapping(); - } - - //TODO is there a way to avoid a method for every mapping type? - //I am trying to take adavantage of generics here, but it sure is - //leading to a lot of duplicated code. - KFM - public void initialize(Basic basic) { - ((XmlBasicMapping) getMapping()).initialize(basic); - } - - public void initialize(Embedded embedded) { - ((XmlEmbeddedMapping) getMapping()).initialize(embedded); - } - - public void initialize(Version version) { - ((XmlVersionMapping) getMapping()).initialize(version); - } - - public void initialize(ManyToOne manyToOne) { - ((XmlManyToOneMapping) getMapping()).initialize(manyToOne); - } - - public void initialize(OneToMany oneToMany) { - ((XmlOneToManyMapping) getMapping()).initialize(oneToMany); - } - - public void initialize(OneToOne oneToOne) { - ((XmlOneToOneMapping) getMapping()).initialize(oneToOne); - } - - public void initialize(ManyToMany manyToMany) { - ((XmlManyToManyMapping) getMapping()).initialize(manyToMany); - } - - public void initialize(Id id) { - ((XmlIdMapping) getMapping()).initialize(id); - } - - public void initialize(EmbeddedId embeddedId) { - ((XmlEmbeddedIdMapping) getMapping()).initialize(embeddedId); - } - - public void initialize(Transient transientResource) { - ((XmlTransientMapping) getMapping()).initialize(transientResource); - } - - public void update(Id id) { - if (mappingKey() == IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { - ((XmlIdMapping) getMapping()).update(id); - } - else { - setSpecifiedMappingKey_(IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - ((XmlIdMapping) getMapping()).initialize(id); - } - } - - public void update(EmbeddedId embeddedId) { - if (mappingKey() == IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { - ((XmlEmbeddedIdMapping) getMapping()).update(embeddedId); - } - else { - setSpecifiedMappingKey_(IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - ((XmlEmbeddedIdMapping) getMapping()).initialize(embeddedId); - } - } - - public void update(Basic basic) { - if (mappingKey() == IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { - ((XmlBasicMapping) getMapping()).update(basic); - } - else { - setSpecifiedMappingKey_(IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - ((XmlBasicMapping) getMapping()).initialize(basic); - } - } - - public void update(Version version) { - if (mappingKey() == IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { - ((XmlVersionMapping) getMapping()).update(version); - } - else { - setSpecifiedMappingKey_(IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - ((XmlVersionMapping) getMapping()).initialize(version); - } - } - public void update(ManyToOne manyToOne) { - if (mappingKey() == IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - ((XmlManyToOneMapping) getMapping()).update(manyToOne); - } - else { - setSpecifiedMappingKey_(IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - ((XmlManyToOneMapping) getMapping()).initialize(manyToOne); - } - } - public void update(OneToMany oneToMany) { - if (mappingKey() == IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - ((XmlOneToManyMapping) getMapping()).update(oneToMany); - } - else { - setSpecifiedMappingKey_(IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - ((XmlOneToManyMapping) getMapping()).initialize(oneToMany); - } - } - public void update(OneToOne oneToOne) { - if (mappingKey() == IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - ((XmlOneToOneMapping) getMapping()).update(oneToOne); - } - else { - setSpecifiedMappingKey_(IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - ((XmlOneToOneMapping) getMapping()).initialize(oneToOne); - } - } - public void update(ManyToMany manyToMany) { - if (mappingKey() == IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - ((XmlManyToManyMapping) getMapping()).update(manyToMany); - } - else { - setSpecifiedMappingKey_(IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - ((XmlManyToManyMapping) getMapping()).initialize(manyToMany); - } - } - - public void update(Embedded embedded) { - if (mappingKey() == IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { - ((XmlEmbeddedMapping) getMapping()).update(embedded); - } - else { - setSpecifiedMappingKey_(IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - ((XmlEmbeddedMapping) getMapping()).initialize(embedded); - } - } - - public void update(Transient transientResource) { - if (mappingKey() == IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { - ((XmlTransientMapping) getMapping()).update(transientResource); - } - else { - setSpecifiedMappingKey_(IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - ((XmlTransientMapping) getMapping()).initialize(transientResource); - } - } - - public IJpaStructureNode structureNode(int offset) { - return this; - } - - public boolean containsOffset(int textOffset) { - if (isVirtual()) { - return false; - } - return attributeMapping.containsOffset(textOffset); - } - - public ITextRange selectionTextRange() { - if (isVirtual()) { - return persistentType().selectionTextRange(); - } - return attributeMapping.selectionTextRange(); - } - - - @Override - public void toString(StringBuilder sb) { - super.toString(sb); - sb.append(getName()); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentType.java deleted file mode 100644 index 08dfa986eb..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/XmlPersistentType.java +++ /dev/null @@ -1,828 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 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.core.internal.context.orm; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaBasicMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaTransientMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaVersionMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Attributes; -import org.eclipse.jpt.core.internal.resource.orm.Basic; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; -import org.eclipse.jpt.core.internal.resource.orm.Embedded; -import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.Id; -import org.eclipse.jpt.core.internal.resource.orm.ManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.ManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; -import org.eclipse.jpt.core.internal.resource.orm.OneToMany; -import org.eclipse.jpt.core.internal.resource.orm.OneToOne; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; -import org.eclipse.jpt.core.internal.resource.orm.Transient; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.Version; -import org.eclipse.jpt.core.internal.resource.orm.VirtualBasic; -import org.eclipse.jpt.core.internal.resource.orm.VirtualEmbedded; -import org.eclipse.jpt.core.internal.resource.orm.VirtualEmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.VirtualId; -import org.eclipse.jpt.core.internal.resource.orm.VirtualManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.VirtualManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.VirtualOneToMany; -import org.eclipse.jpt.core.internal.resource.orm.VirtualOneToOne; -import org.eclipse.jpt.core.internal.resource.orm.VirtualTransient; -import org.eclipse.jpt.core.internal.resource.orm.VirtualVersion; -import org.eclipse.jpt.utility.internal.CollectionTools; -import org.eclipse.jpt.utility.internal.iterators.ChainIterator; -import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; -import org.eclipse.jpt.utility.internal.iterators.CompositeListIterator; -import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; - - -public class XmlPersistentType extends JpaContextNode implements IPersistentType -{ - protected final List<XmlPersistentAttribute> specifiedPersistentAttributes; - - protected final List<XmlPersistentAttribute> virtualPersistentAttributes; - public static final String VIRTUAL_ATTRIBUTES_LIST = "virtualAttributesList"; - - protected final Collection<IXmlTypeMappingProvider> typeMappingProviders; - - protected XmlTypeMapping<? extends TypeMapping> xmlTypeMapping; - - protected IPersistentType parentPersistentType; - - public XmlPersistentType(EntityMappings parent, String mappingKey) { - super(parent); - this.typeMappingProviders = buildTypeMappingProviders(); - this.xmlTypeMapping = buildXmlTypeMapping(mappingKey); - this.specifiedPersistentAttributes = new ArrayList<XmlPersistentAttribute>(); - this.virtualPersistentAttributes = new ArrayList<XmlPersistentAttribute>(); - } - - public String getId() { - return IOrmStructureNodes.PERSISTENT_TYPE_ID; - } - - public boolean isFor(String fullyQualifiedTypeName) { - String className = getMapping().getClass_(); - if (className == null) { - return false; - } - if (className.equals(fullyQualifiedTypeName)) { - return true; - } - if ((entityMappings().getPackage() + className).equals(fullyQualifiedTypeName)) { - return true; - } - return false; - } - - protected XmlTypeMapping<? extends TypeMapping> buildXmlTypeMapping(String key) { - return typeMappingProvider(key).buildTypeMapping(jpaFactory(), this); - } - - protected Collection<IXmlTypeMappingProvider> buildTypeMappingProviders() { - Collection<IXmlTypeMappingProvider> collection = new ArrayList<IXmlTypeMappingProvider>(); - collection.add(new XmlEntityProvider()); - collection.add(new XmlMappedSuperclassProvider()); - collection.add(new XmlEmbeddableProvider()); - return collection; - } - - protected IXmlTypeMappingProvider typeMappingProvider(String key) { - for (IXmlTypeMappingProvider provider : this.typeMappingProviders) { - if (provider.key().equals(key)) { - return provider; - } - } - throw new IllegalArgumentException(); - } - - public XmlTypeMapping<? extends TypeMapping> getMapping() { - return this.xmlTypeMapping; - } - - public void setMappingKey(String newMappingKey) { - if (this.mappingKey() == newMappingKey) { - return; - } - XmlTypeMapping<? extends TypeMapping> oldMapping = getMapping(); - this.xmlTypeMapping = buildXmlTypeMapping(newMappingKey); - entityMappings().changeMapping(this, oldMapping, this.xmlTypeMapping); - firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.xmlTypeMapping); - } - - protected void setMappingKey_(String newMappingKey) { - if (this.mappingKey() == newMappingKey) { - return; - } - XmlTypeMapping<? extends TypeMapping> oldMapping = getMapping(); - this.xmlTypeMapping = buildXmlTypeMapping(newMappingKey); - firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.xmlTypeMapping); - } - - public Iterator<IPersistentType> inheritanceHierarchy() { - // using a chain iterator to traverse up the inheritance tree - return new ChainIterator<IPersistentType>(this) { - @Override - protected IPersistentType nextLink(IPersistentType pt) { - return pt.parentPersistentType(); - } - }; - } - - public IPersistentType parentPersistentType() { - return this.parentPersistentType; - } - - public AccessType access() { - return getMapping().getAccess(); - } - public void changeMapping(XmlPersistentAttribute xmlPersistentAttribute, XmlAttributeMapping<? extends AttributeMapping> oldMapping, XmlAttributeMapping<? extends AttributeMapping> newMapping) { - int sourceIndex = this.specifiedPersistentAttributes.indexOf(xmlPersistentAttribute); - this.specifiedPersistentAttributes.remove(sourceIndex); - oldMapping.removeFromResourceModel(getMapping().typeMappingResource()); - if (getMapping().typeMappingResource().getAttributes() == null) { - getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); - } - int targetIndex = insertionIndex(xmlPersistentAttribute); - this.specifiedPersistentAttributes.add(targetIndex, xmlPersistentAttribute); - newMapping.addToResourceModel(getMapping().typeMappingResource()); - oldMapping.initializeOn(newMapping); - //TODO are the source and target correct in this case, or is target off by one??? - fireItemMoved(SPECIFIED_ATTRIBUTES_LIST, targetIndex, sourceIndex); - } - -// protected void changeMapping(XmlAttributeMapping oldMapping, String newMappingKey) { -// boolean virtual = oldMapping.isVirtual(); -// XmlAttributeMapping newAttributeMapping = buildAttributeMapping(oldMapping.getPersistentAttribute().attributeMappingProviders(), newMappingKey); -// // we can't set the attribute to null, but we can set it to a dummy placeholder one -// // we do this to get the translators to *wake up* and remove adapters from the attribute -// XmlPersistentAttribute nullAttribute = OrmFactory.eINSTANCE.createXmlPersistentAttribute(); -// XmlPersistentAttribute attribute = oldMapping.getPersistentAttribute(); -// oldMapping.setPersistentAttribute(nullAttribute); -// if (virtual) { -// getVirtualPersistentAttributes().remove(attribute); -// getVirtualAttributeMappings().remove(oldMapping); -// } -// else { -// getSpecifiedPersistentAttributes().remove(attribute); -// getSpecifiedAttributeMappings().remove(oldMapping); -// } -// newAttributeMapping.setPersistentAttribute(attribute); -// oldMapping.initializeOn(newAttributeMapping); -// if (virtual) { -// insertAttributeMapping(newAttributeMapping, getVirtualAttributeMappings()); -// } -// else { -// insertAttributeMapping(newAttributeMapping, getSpecifiedAttributeMappings()); -// } -// } - - protected void setPersistentAttributeVirtual(XmlPersistentAttribute xmlPersistentAttribute, boolean virtual) { - boolean oldVirtual = xmlPersistentAttribute.isVirtual(); - if (oldVirtual == virtual) { - return; - } - if (virtual) { - XmlPersistentAttribute virtualPersistentAttribute = createVirtualPersistentAttribute(xmlPersistentAttribute.getMapping().javaPersistentAttribute()); - this.virtualPersistentAttributes.add(virtualPersistentAttribute); - this.removeSpecifiedXmlPersistentAttribute(xmlPersistentAttribute); - fireItemAdded(VIRTUAL_ATTRIBUTES_LIST, virtualAttributesSize(), virtualPersistentAttribute); - } - else { - int index = this.virtualPersistentAttributes.indexOf(xmlPersistentAttribute); - this.virtualPersistentAttributes.remove(xmlPersistentAttribute); - addSpecifiedPersistentAttribute(xmlPersistentAttribute.mappingKey(), xmlPersistentAttribute.getName()); - fireItemRemoved(VIRTUAL_ATTRIBUTES_LIST, index, xmlPersistentAttribute); - } - } - - - - public Iterator<String> allAttributeNames() { - return this.attributeNames(this.allAttributes()); - } - - public Iterator<IPersistentAttribute> allAttributes() { - return new CompositeIterator<IPersistentAttribute>(new TransformationIterator<IPersistentType, Iterator<IPersistentAttribute>>(this.inheritanceHierarchy()) { - @Override - protected Iterator<IPersistentAttribute> transform(IPersistentType pt) { - return pt.attributes(); - } - }); - } - - protected Iterator<XmlPersistentAttribute> attributesNamed(final String attributeName) { - return new FilteringIterator<XmlPersistentAttribute, XmlPersistentAttribute>(attributes()) { - @Override - protected boolean accept(XmlPersistentAttribute o) { - return attributeName.equals(o.getName()); - } - }; - } - - public XmlPersistentAttribute attributeNamed(String attributeName) { - Iterator<XmlPersistentAttribute> stream = attributesNamed(attributeName); - return (stream.hasNext()) ? stream.next() : null; - } - - public Iterator<String> attributeNames() { - return this.attributeNames(this.attributes()); - } - - protected Iterator<String> attributeNames(Iterator<? extends IPersistentAttribute> attrs) { - return new TransformationIterator<IPersistentAttribute, String>(attrs) { - @Override - protected String transform(IPersistentAttribute attribute) { - return attribute.getName(); - } - }; - } - - protected XmlPersistentAttribute specifiedAttributeNamed(String attributeName) { - Iterator<XmlPersistentAttribute> stream = specifiedAttributesNamed(attributeName); - return (stream.hasNext()) ? stream.next() : null; - - } - - protected Iterator<XmlPersistentAttribute> specifiedAttributesNamed(final String attributeName) { - return new FilteringIterator<XmlPersistentAttribute, XmlPersistentAttribute>(specifiedAttributes()) { - @Override - protected boolean accept(XmlPersistentAttribute xmlPersistentAttribute) { - return attributeName.equals(xmlPersistentAttribute.getName()); - } - }; - } - - @SuppressWarnings("unchecked") - public ListIterator<XmlPersistentAttribute> attributes() { - return new CompositeListIterator<XmlPersistentAttribute>(specifiedAttributes(), virtualAttributes()); - } - - public int attributesSize() { - return specifiedAttributesSize() + virtualAttributesSize(); - } - - public ListIterator<XmlPersistentAttribute> specifiedAttributes() { - return new CloneListIterator<XmlPersistentAttribute>(this.specifiedPersistentAttributes); - } - - public int specifiedAttributesSize() { - return this.specifiedPersistentAttributes.size(); - } - - public ListIterator<XmlPersistentAttribute> virtualAttributes() { - return new CloneListIterator<XmlPersistentAttribute>(this.virtualPersistentAttributes); - } - - public int virtualAttributesSize() { - return this.virtualPersistentAttributes.size(); - } - - protected void addVirtualPersistentAttribute(XmlPersistentAttribute xmlPersistentAttribute) { - addItemToList(xmlPersistentAttribute, this.virtualPersistentAttributes, XmlPersistentType.VIRTUAL_ATTRIBUTES_LIST); - } - - protected void removeVirtualPersistentAttribute(XmlPersistentAttribute xmlPersistentAttribute) { - removeItemFromList(xmlPersistentAttribute, this.virtualPersistentAttributes, XmlPersistentType.VIRTUAL_ATTRIBUTES_LIST); - } - - protected boolean containsVirtualPersistentAttribute(XmlPersistentAttribute xmlPersistentAttribute) { - return this.virtualPersistentAttributes.contains(xmlPersistentAttribute); - } - - public XmlPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName) { - XmlPersistentAttribute persistentAttribute = jpaFactory().createXmlPersistentAttribute(this, mappingKey); - int index = insertionIndex(persistentAttribute); - if (getMapping().typeMappingResource().getAttributes() == null) { - getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); - } - this.specifiedPersistentAttributes.add(index, persistentAttribute); - AttributeMapping attributeMapping = persistentAttribute.getMapping().addToResourceModel(getMapping().typeMappingResource()); - - attributeMapping.setName(attributeName); - fireItemAdded(IPersistentType.SPECIFIED_ATTRIBUTES_LIST, index, persistentAttribute); - return persistentAttribute; - } - - protected int insertionIndex(XmlPersistentAttribute persistentAttribute) { - return CollectionTools.insertionIndexOf(this.specifiedPersistentAttributes, persistentAttribute, buildMappingComparator()); - } - - protected Comparator<XmlPersistentAttribute> buildMappingComparator() { - return new Comparator<XmlPersistentAttribute>() { - public int compare(XmlPersistentAttribute o1, XmlPersistentAttribute o2) { - int o1Sequence = o1.getMapping().xmlSequence(); - int o2Sequence = o2.getMapping().xmlSequence(); - if (o1Sequence < o2Sequence) { - return -1; - } - if (o1Sequence == o2Sequence) { - return 0; - } - return 1; - } - }; - } - - - protected void addSpecifiedPersistentAttribute_(XmlPersistentAttribute xmlPersistentAttribute) { - addItemToList(xmlPersistentAttribute, this.specifiedPersistentAttributes, IPersistentType.SPECIFIED_ATTRIBUTES_LIST); - } - - protected void removeSpecifiedPersistentAttribute_(XmlPersistentAttribute xmlPersistentAttribute) { - removeItemFromList(xmlPersistentAttribute, this.specifiedPersistentAttributes, IPersistentType.SPECIFIED_ATTRIBUTES_LIST); - } - - public void removeSpecifiedXmlPersistentAttribute(XmlPersistentAttribute xmlPersistentAttribute) { - int index = this.specifiedPersistentAttributes.indexOf(xmlPersistentAttribute); - this.specifiedPersistentAttributes.remove(xmlPersistentAttribute); - xmlPersistentAttribute.getMapping().removeFromResourceModel(this.xmlTypeMapping.typeMappingResource()); - fireItemRemoved(IPersistentType.SPECIFIED_ATTRIBUTES_LIST, index, xmlPersistentAttribute); - } - - public String getName() { - return getMapping().getClass_(); - } - - protected void classChanged(String oldClass, String newClass) { - firePropertyChanged(NAME_PROPERTY, oldClass, newClass); - } - - public boolean isMapped() { - return true; - } - - public String mappingKey() { - return getMapping().getKey(); - } - - public IJavaPersistentType javaPersistentType() { - return getMapping().getJavaPersistentType(); - } - - - //TODO is there a way to avoid a method for every mapping type? - //I am trying to take adavantage of generics here, but it sure is - //leading to a lot of duplicated code. - KFM - public void initialize(Entity entity) { - ((XmlEntity) getMapping()).initialize(entity); - this.initializeParentPersistentType(); - this.initializePersistentAttributes(entity); - } - - public void initialize(MappedSuperclass mappedSuperclass) { - ((XmlMappedSuperclass) getMapping()).initialize(mappedSuperclass); - this.initializeParentPersistentType(); - this.initializePersistentAttributes(mappedSuperclass); - } - - public void initialize(Embeddable embeddable) { - ((XmlEmbeddable) getMapping()).initialize(embeddable); - this.initializeParentPersistentType(); - this.initializePersistentAttributes(embeddable); - } - - protected void initializePersistentAttributes(TypeMapping typeMapping) { - Attributes attributes = typeMapping.getAttributes(); - if (attributes != null) { - this.initializeSpecifiedPersistentAttributes(attributes); - } - this.initializeVirtualPersistentAttributes(); - } - - protected void initializeSpecifiedPersistentAttributes(Attributes attributes) { - for (Id id : attributes.getIds()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(id); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (EmbeddedId embeddedId : attributes.getEmbeddedIds()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(embeddedId); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (Basic basic : attributes.getBasics()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(basic); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (Version version : attributes.getVersions()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(version); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (ManyToOne manyToOne : attributes.getManyToOnes()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(manyToOne); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (OneToMany oneToMany : attributes.getOneToManys()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(oneToMany); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (OneToOne oneToOne : attributes.getOneToOnes()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(oneToOne); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (ManyToMany manyToMany : attributes.getManyToManys()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(manyToMany); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (Embedded embedded : attributes.getEmbeddeds()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(embedded); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - for (Transient transientResource : attributes.getTransients()) { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(transientResource); - this.specifiedPersistentAttributes.add(xmlPersistentAttribute); - } - } - - protected void initializeVirtualPersistentAttributes() { - ListIterator<IJavaPersistentAttribute> javaAttributes = javaPersistentAttributes(); - - while (javaAttributes.hasNext()) { - IJavaPersistentAttribute javaPersistentAttribute = javaAttributes.next(); - if (specifiedAttributeNamed(javaPersistentAttribute.getName()) == null) { - XmlPersistentAttribute xmlPersistentAttribute = createVirtualPersistentAttribute(javaPersistentAttribute); - this.virtualPersistentAttributes.add(xmlPersistentAttribute); - } - } - } - - protected ListIterator<IJavaPersistentAttribute> javaPersistentAttributes() { - IJavaPersistentType javaPersistentType = javaPersistentType(); - if (javaPersistentType != null) { - return javaPersistentType.attributes(); - } - return EmptyListIterator.instance(); - } - - protected void initializeParentPersistentType() { - IJavaPersistentType javaPersistentType = javaPersistentType(); - if (javaPersistentType != null) { - this.parentPersistentType = javaPersistentType.parentPersistentType(); - } - } - - public void update(Entity entity) { - if (mappingKey() == IMappingKeys.ENTITY_TYPE_MAPPING_KEY) { - ((XmlEntity) getMapping()).update(entity); - } - else { - setMappingKey_(IMappingKeys.ENTITY_TYPE_MAPPING_KEY); - ((XmlEntity) getMapping()).initialize(entity); - } - this.updateParentPersistentType(); - this.updatePersistentAttributes(entity); - } - - public void update(MappedSuperclass mappedSuperclass) { - if (mappingKey() == IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY) { - ((XmlMappedSuperclass) getMapping()).update(mappedSuperclass); - } - else { - setMappingKey_(IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); - ((XmlMappedSuperclass) getMapping()).initialize(mappedSuperclass); - } - this.updateParentPersistentType(); - this.updatePersistentAttributes(mappedSuperclass); - } - - public void update(Embeddable embeddable) { - if (mappingKey() == IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) { - ((XmlEmbeddable) getMapping()).update(embeddable); - } - else { - setMappingKey_(IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); - ((XmlEmbeddable) getMapping()).initialize(embeddable); - } - this.updateParentPersistentType(); - this.updatePersistentAttributes(embeddable); - } - - protected void updateParentPersistentType() { - IJavaPersistentType javaPersistentType = javaPersistentType(); - if (javaPersistentType == null) { - //TODO change notification for this? - this.parentPersistentType = null; - return; - } - this.parentPersistentType = javaPersistentType.parentPersistentType(); - } - - protected void updatePersistentAttributes(org.eclipse.jpt.core.internal.resource.orm.TypeMapping typeMapping) { - ListIterator<XmlPersistentAttribute> xmlPersistentAttributes = this.specifiedAttributes(); - if (typeMapping.getAttributes() != null) { - this.updateIds(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateEmbeddedIds(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateBasics(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateVersions(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateManyToOnes(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateOneToManys(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateOneToOnes(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateManyToManys(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateEmbeddeds(typeMapping.getAttributes(), xmlPersistentAttributes); - this.updateTransients(typeMapping.getAttributes(), xmlPersistentAttributes); - } - while (xmlPersistentAttributes.hasNext()) { - this.removeSpecifiedPersistentAttribute_(xmlPersistentAttributes.next()); - } - this.updateVirtualPersistentAttributes(); - } - - protected void updateVirtualAttribute(XmlPersistentAttribute xmlAttribute, IJavaPersistentAttribute javaAttribute) { - if (javaAttribute.mappingKey() == IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualBasic((IJavaBasicMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualEmbedded((IJavaEmbeddedMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualEmbeddedId((IJavaEmbeddedIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualId((IJavaIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualManyToMany((IJavaManyToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualManyToOne((IJavaManyToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualOneToMany((IJavaOneToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualOneToOne((IJavaOneToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualTransient((IJavaTransientMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { - xmlAttribute.update(new VirtualVersion((IJavaVersionMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - } - - protected void updateVirtualPersistentAttributes() { - ListIterator<IJavaPersistentAttribute> javaAttributes = this.javaPersistentAttributes(); - ListIterator<XmlPersistentAttribute> xmlVirtualAttributes = this.virtualAttributes(); - for (IJavaPersistentAttribute javaAttribute : CollectionTools.iterable(javaAttributes)) { - if (specifiedAttributeNamed(javaAttribute.getName()) == null) { - if (xmlVirtualAttributes.hasNext()) { - updateVirtualAttribute(xmlVirtualAttributes.next(), javaAttribute); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = createVirtualPersistentAttribute(javaAttribute); - addVirtualPersistentAttribute(xmlPersistentAttribute); - } - } - } - - while (xmlVirtualAttributes.hasNext()) { - this.removeVirtualPersistentAttribute(xmlVirtualAttributes.next()); - } - - } - - protected void addVirtualPersistentAttribute(IJavaPersistentAttribute javaAttribute) { - addVirtualPersistentAttribute(createVirtualPersistentAttribute(javaAttribute)); - } - - protected XmlPersistentAttribute createVirtualPersistentAttribute(IJavaPersistentAttribute javaAttribute) { - XmlPersistentAttribute xmlPersistentAttribute = new XmlPersistentAttribute(this, javaAttribute.mappingKey()); - if (javaAttribute.mappingKey() == IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualBasic((IJavaBasicMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualEmbeddedId((IJavaEmbeddedIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualEmbedded((IJavaEmbeddedMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualId((IJavaIdMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualManyToMany((IJavaManyToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualManyToOne((IJavaManyToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualOneToMany((IJavaOneToManyMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualOneToOne((IJavaOneToOneMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualTransient((IJavaTransientMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - else if (javaAttribute.mappingKey() == IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY) { - xmlPersistentAttribute.initialize(new VirtualVersion((IJavaVersionMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); - } - return xmlPersistentAttribute; - } - - protected void updateIds(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (Id id : attributes.getIds()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(id); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(id); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - protected void updateEmbeddedIds(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (EmbeddedId embeddedId : attributes.getEmbeddedIds()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(embeddedId); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(embeddedId); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - protected void updateBasics(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (Basic basic : attributes.getBasics()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(basic); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(basic); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - protected void updateVersions(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (Version version : attributes.getVersions()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(version); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(version); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - protected void updateManyToOnes(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (ManyToOne manyToOne : attributes.getManyToOnes()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(manyToOne); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(manyToOne); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - protected void updateOneToManys(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (OneToMany oneToMany : attributes.getOneToManys()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(oneToMany); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(oneToMany); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - protected void updateOneToOnes(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (OneToOne oneToOne : attributes.getOneToOnes()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(oneToOne); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(oneToOne); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - protected void updateManyToManys(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (ManyToMany manyToMany : attributes.getManyToManys()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(manyToMany); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(manyToMany); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - protected void updateEmbeddeds(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (Embedded embedded : attributes.getEmbeddeds()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(embedded); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(embedded); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - protected void updateTransients(org.eclipse.jpt.core.internal.resource.orm.Attributes attributes, ListIterator<XmlPersistentAttribute> xmlPersistentAttributes) { - for (Transient transientResource : attributes.getTransients()) { - if (xmlPersistentAttributes.hasNext()) { - xmlPersistentAttributes.next().update(transientResource); - } - else { - XmlPersistentAttribute xmlPersistentAttribute = jpaFactory().createXmlPersistentAttribute(this, IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); - xmlPersistentAttribute.initialize(transientResource); - addSpecifiedPersistentAttribute_(xmlPersistentAttribute); - } - } - } - - public IPersistentAttribute resolveAttribute(String attributeName) { - Iterator<XmlPersistentAttribute> attributes = attributesNamed(attributeName); - if (attributes.hasNext()) { - XmlPersistentAttribute attribute = attributes.next(); - return attributes.hasNext() ? null /* more than one */: attribute; - } - else if (parentPersistentType() != null) { - return parentPersistentType().resolveAttribute(attributeName); - } - else { - return null; - } - } - - @Override - public XmlPersistentType xmlPersistentType() { - return this; - } - - public IJpaStructureNode structureNode(int textOffset) { - for (XmlPersistentAttribute attribute : CollectionTools.iterable(specifiedAttributes())) { - if (attribute.containsOffset(textOffset)) { - return attribute; - } - } - return this; - } - - public boolean containsOffset(int textOffset) { - return this.xmlTypeMapping.containsOffset(textOffset); - } - - public ITextRange selectionTextRange() { - return this.xmlTypeMapping.selectionTextRange(); - } -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GeenericPersistenceXml.java index 44f4db5a26..51ab1533c5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceXml.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GeenericPersistenceXml.java @@ -13,26 +13,29 @@ package org.eclipse.jpt.core.internal.context.persistence; import java.util.List; import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResource; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; +import org.eclipse.jpt.core.resource.persistence.PersistenceResource; +import org.eclipse.jpt.core.resource.persistence.XmlPersistence; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class PersistenceXml extends JpaContextNode - implements IPersistenceXml +public class GeenericPersistenceXml extends AbstractJpaContextNode + implements PersistenceXml { protected PersistenceResource persistenceResource; - protected IPersistence persistence; + protected Persistence persistence; - public PersistenceXml(IBaseJpaContent baseJpaContent) { + public GeenericPersistenceXml(IBaseJpaContent baseJpaContent) { super(baseJpaContent); } @@ -48,11 +51,11 @@ public class PersistenceXml extends JpaContextNode // **************** persistence ******************************************** - public IPersistence getPersistence() { + public Persistence getPersistence() { return persistence; } - public IPersistence addPersistence() { + public Persistence addPersistence() { if (persistence != null) { throw new IllegalStateException(); } @@ -69,15 +72,15 @@ public class PersistenceXml extends JpaContextNode throw new IllegalStateException(); } - IPersistence oldPersistence = persistence; + Persistence oldPersistence = persistence; persistence = null; XmlPersistence xmlPersistence = persistenceResource.getPersistence(); persistenceResource.getContents().remove(xmlPersistence); firePropertyChanged(PERSISTENCE_PROPERTY, oldPersistence, null); } - protected void setPersistence_(IPersistence newPersistence) { - IPersistence oldPersistence = persistence; + protected void setPersistence_(Persistence newPersistence) { + Persistence oldPersistence = persistence; persistence = newPersistence; firePropertyChanged(PERSISTENCE_PROPERTY, oldPersistence, newPersistence); } @@ -111,8 +114,8 @@ public class PersistenceXml extends JpaContextNode } } - protected IPersistence createPersistence(XmlPersistence xmlPersistence) { - IPersistence persistence = jpaFactory().createPersistence(this); + protected Persistence createPersistence(XmlPersistence xmlPersistence) { + Persistence persistence = jpaFactory().buildPersistence(this); persistence.initialize(xmlPersistence); return persistence; } @@ -121,12 +124,12 @@ public class PersistenceXml extends JpaContextNode // ************************************************************************* @Override - public IPersistenceUnit persistenceUnit() { + public PersistenceUnit persistenceUnit() { throw new UnsupportedOperationException("No PersistenceUnit in this context"); } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { if (persistence.containsOffset(textOffset)) { return persistence.structureNode(textOffset); } @@ -134,12 +137,12 @@ public class PersistenceXml extends JpaContextNode } // never actually selected - public ITextRange selectionTextRange() { - return ITextRange.Empty.instance(); + public TextRange selectionTextRange() { + return TextRange.Empty.instance(); } - public ITextRange validationTextRange() { - return ITextRange.Empty.instance(); + public TextRange validationTextRange() { + return TextRange.Empty.instance(); } @@ -162,9 +165,9 @@ public class PersistenceXml extends JpaContextNode if (this.persistence == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_XML_INVALID_CONTENT, + JpaValidationMessages.PERSISTENCE_XML_INVALID_CONTENT, this) ); okToContinueValidation = false; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/ClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java index c2cace6202..adf9ebaf32 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/ClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java @@ -12,12 +12,15 @@ package org.eclipse.jpt.core.internal.context.persistence; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef; import org.eclipse.wst.validation.internal.provisional.core.IMessage; /** @@ -25,22 +28,22 @@ import org.eclipse.wst.validation.internal.provisional.core.IMessage; * persistence resource model object XmlJavaClassRef. * XmlJavaClassRef corresponds to the class tag in the persistence.xml */ -public class ClassRef extends JpaContextNode - implements IClassRef +public class GenericClassRef extends AbstractJpaContextNode + implements ClassRef { protected XmlJavaClassRef xmlJavaClassRef; protected String className; - protected IJavaPersistentType javaPersistentType; + protected JavaPersistentType javaPersistentType; - public ClassRef(IPersistenceUnit parent) { + public GenericClassRef(PersistenceUnit parent) { super(parent); } public String getId() { - return IPersistenceStructureNodes.CLASS_REF_ID; + return PersistenceStructureNodes.CLASS_REF_ID; } public boolean isFor(String fullyQualifiedTypeName) { @@ -75,14 +78,14 @@ public class ClassRef extends JpaContextNode // **************** java persistent type *********************************** - public IJavaPersistentType getJavaPersistentType() { + public JavaPersistentType getJavaPersistentType() { return this.javaPersistentType; } - protected void setJavaPersistentType(IJavaPersistentType newJavaPersistentType) { - IJavaPersistentType oldJavaPersistentType = this.javaPersistentType; + protected void setJavaPersistentType(JavaPersistentType newJavaPersistentType) { + JavaPersistentType oldJavaPersistentType = this.javaPersistentType; this.javaPersistentType = newJavaPersistentType; - firePropertyChanged(IClassRef.JAVA_PERSISTENT_TYPE_PROPERTY, oldJavaPersistentType, newJavaPersistentType); + firePropertyChanged(ClassRef.JAVA_PERSISTENT_TYPE_PROPERTY, oldJavaPersistentType, newJavaPersistentType); } @@ -100,7 +103,7 @@ public class ClassRef extends JpaContextNode } protected void initializeJavaPersistentType() { - JavaPersistentTypeResource persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); + JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); if (persistentTypeResource != null) { this.javaPersistentType = createJavaPersistentType(persistentTypeResource); } @@ -119,7 +122,7 @@ public class ClassRef extends JpaContextNode } protected void updateJavaPersistentType() { - JavaPersistentTypeResource persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); + JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); if (persistentTypeResource == null) { setJavaPersistentType(null); } @@ -133,8 +136,8 @@ public class ClassRef extends JpaContextNode } } - protected IJavaPersistentType createJavaPersistentType(JavaPersistentTypeResource persistentTypeResource) { - IJavaPersistentType javaPersistentType = jpaFactory().createJavaPersistentType(this); + protected JavaPersistentType createJavaPersistentType(JavaResourcePersistentType persistentTypeResource) { + JavaPersistentType javaPersistentType = jpaFactory().buildJavaPersistentType(this); javaPersistentType.initializeFromResource(persistentTypeResource); return javaPersistentType; } @@ -152,7 +155,7 @@ public class ClassRef extends JpaContextNode } } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { return this; } @@ -163,14 +166,14 @@ public class ClassRef extends JpaContextNode return xmlJavaClassRef.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { if (isVirtual()) { return null; } return xmlJavaClassRef.selectionTextRange(); } - public ITextRange validationTextRange() { + public TextRange validationTextRange() { return xmlJavaClassRef.validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java index 551a8ae0f0..9bcef6ad0f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/MappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java @@ -10,19 +10,22 @@ *******************************************************************************/ package org.eclipse.jpt.core.internal.context.persistence; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.orm.OrmXml; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.resource.orm.OrmArtifactEdit; -import org.eclipse.jpt.core.internal.resource.orm.OrmResource; -import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit; +import org.eclipse.jpt.core.resource.orm.OrmResource; +import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef; -public class MappingFileRef extends JpaContextNode - implements IMappingFileRef +public class GenericMappingFileRef extends AbstractJpaContextNode + implements MappingFileRef { protected XmlMappingFileRef xmlMappingFileRef; @@ -30,12 +33,12 @@ public class MappingFileRef extends JpaContextNode protected OrmXml ormXml; - public MappingFileRef(IPersistenceUnit parent) { + public GenericMappingFileRef(PersistenceUnit parent) { super(parent); } public String getId() { - return IPersistenceStructureNodes.MAPPING_FILE_REF_ID; + return PersistenceStructureNodes.MAPPING_FILE_REF_ID; } @@ -141,7 +144,7 @@ public class MappingFileRef extends JpaContextNode } protected OrmXml createOrmXml(OrmResource ormResource) { - OrmXml ormXml = jpaFactory().createOrmXml(this); + OrmXml ormXml = jpaFactory().buildOrmXml(this); ormXml.initialize(ormResource); return ormXml; } @@ -156,14 +159,14 @@ public class MappingFileRef extends JpaContextNode return null; } - public XmlPersistentType persistentTypeFor(String fullyQualifiedTypeName) { + public OrmPersistentType persistentTypeFor(String fullyQualifiedTypeName) { if (getOrmXml() != null) { return getOrmXml().persistentTypeFor(fullyQualifiedTypeName); } return null; } - public IJpaStructureNode structureNode(int textOffset) { + public JpaStructureNode structureNode(int textOffset) { return this; } @@ -174,14 +177,14 @@ public class MappingFileRef extends JpaContextNode return xmlMappingFileRef.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { if (isVirtual()) { return null; } return xmlMappingFileRef.selectionTextRange(); } - public ITextRange validationTextRange() { + public TextRange validationTextRange() { if (isVirtual()) { return persistenceUnit().validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java index bfe1793a7d..2a58a1d11c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/Persistence.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java @@ -15,78 +15,82 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; +import org.eclipse.jpt.core.resource.persistence.XmlPersistence; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class Persistence extends JpaContextNode - implements IPersistence +public class GenericPersistence extends AbstractJpaContextNode + implements Persistence { protected XmlPersistence xmlPersistence; - protected final List<IPersistenceUnit> persistenceUnits; + protected final List<PersistenceUnit> persistenceUnits; - public Persistence(IPersistenceXml parent) { + public GenericPersistence(PersistenceXml parent) { super(parent); - this.persistenceUnits = new ArrayList<IPersistenceUnit>(); + this.persistenceUnits = new ArrayList<PersistenceUnit>(); } public String getId() { - return IPersistenceStructureNodes.PERSISTENCE_ID; + return PersistenceStructureNodes.PERSISTENCE_ID; } // **************** persistence units ************************************** - public ListIterator<IPersistenceUnit> persistenceUnits() { - return new CloneListIterator<IPersistenceUnit>(persistenceUnits); + public ListIterator<PersistenceUnit> persistenceUnits() { + return new CloneListIterator<PersistenceUnit>(persistenceUnits); } public int persistenceUnitsSize() { return persistenceUnits.size(); } - public IPersistenceUnit addPersistenceUnit() { + public PersistenceUnit addPersistenceUnit() { return addPersistenceUnit(persistenceUnits.size()); } - public IPersistenceUnit addPersistenceUnit(int index) { + public PersistenceUnit addPersistenceUnit(int index) { XmlPersistenceUnit xmlPersistenceUnit = PersistenceFactory.eINSTANCE.createXmlPersistenceUnit(); - IPersistenceUnit persistenceUnit = createPersistenceUnit(xmlPersistenceUnit); + PersistenceUnit persistenceUnit = createPersistenceUnit(xmlPersistenceUnit); persistenceUnits.add(index, persistenceUnit); xmlPersistence.getPersistenceUnits().add(xmlPersistenceUnit); fireItemAdded(PERSISTENCE_UNITS_LIST, index, persistenceUnit); return persistenceUnit; } - public void removePersistenceUnit(IPersistenceUnit persistenceUnit) { + public void removePersistenceUnit(PersistenceUnit persistenceUnit) { removePersistenceUnit(persistenceUnits.indexOf(persistenceUnit)); } public void removePersistenceUnit(int index) { - IPersistenceUnit persistenceUnit = persistenceUnits.remove(index); + PersistenceUnit persistenceUnit = persistenceUnits.remove(index); xmlPersistence.getPersistenceUnits().remove(index); fireItemRemoved(PERSISTENCE_UNITS_LIST, index, persistenceUnit); } - protected void addPersistenceUnit_(IPersistenceUnit persistenceUnit) { + protected void addPersistenceUnit_(PersistenceUnit persistenceUnit) { addPersistenceUnit_(persistenceUnits.size(), persistenceUnit); } - protected void addPersistenceUnit_(int index, IPersistenceUnit persistenceUnit) { + protected void addPersistenceUnit_(int index, PersistenceUnit persistenceUnit) { addItemToList(index, persistenceUnit, persistenceUnits, PERSISTENCE_UNITS_LIST); } - protected void removePersistenceUnit_(IPersistenceUnit persistenceUnit) { + protected void removePersistenceUnit_(PersistenceUnit persistenceUnit) { removePersistenceUnit_(persistenceUnits.indexOf(persistenceUnit)); } @@ -110,11 +114,11 @@ public class Persistence extends JpaContextNode public void update(XmlPersistence persistence) { this.xmlPersistence = persistence; - Iterator<IPersistenceUnit> stream = persistenceUnits(); + Iterator<PersistenceUnit> stream = persistenceUnits(); Iterator<XmlPersistenceUnit> stream2 = persistence.getPersistenceUnits().iterator(); while (stream.hasNext()) { - IPersistenceUnit persistenceUnit = stream.next(); + PersistenceUnit persistenceUnit = stream.next(); if (stream2.hasNext()) { persistenceUnit.update(stream2.next()); } @@ -128,8 +132,8 @@ public class Persistence extends JpaContextNode } } - protected IPersistenceUnit createPersistenceUnit(XmlPersistenceUnit xmlPersistenceUnit) { - IPersistenceUnit persistenceUnit = jpaFactory().createPersistenceUnit(this); + protected PersistenceUnit createPersistenceUnit(XmlPersistenceUnit xmlPersistenceUnit) { + PersistenceUnit persistenceUnit = jpaFactory().buildPersistenceUnit(this); persistenceUnit.initialize(xmlPersistenceUnit); return persistenceUnit; } @@ -138,12 +142,12 @@ public class Persistence extends JpaContextNode // ************************************************************************* @Override - public IPersistenceUnit persistenceUnit() { + public PersistenceUnit persistenceUnit() { throw new UnsupportedOperationException("No PersistenceUnit in this context"); } - public IJpaStructureNode structureNode(int textOffset) { - for (IPersistenceUnit persistenceUnit : CollectionTools.iterable(persistenceUnits())) { + public JpaStructureNode structureNode(int textOffset) { + for (PersistenceUnit persistenceUnit : CollectionTools.iterable(persistenceUnits())) { if (persistenceUnit.containsOffset(textOffset)) { return persistenceUnit.structureNode(textOffset); } @@ -158,11 +162,11 @@ public class Persistence extends JpaContextNode return xmlPersistence.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return xmlPersistence.selectionTextRange(); } - public ITextRange validationTextRange() { + public TextRange validationTextRange() { return xmlPersistence.validationTextRange(); } @@ -177,7 +181,7 @@ public class Persistence extends JpaContextNode //persistence unit validation - for (IPersistenceUnit pu : persistenceUnits){ + for (PersistenceUnit pu : persistenceUnits){ pu.addToMessages(messages, astRoot); } } @@ -185,9 +189,9 @@ public class Persistence extends JpaContextNode protected void addNoPersistenceUnitMessage(List<IMessage> messages) { if (persistenceUnits.size() == 0) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_NO_PERSISTENCE_UNIT, + JpaValidationMessages.PERSISTENCE_NO_PERSISTENCE_UNIT, this, this.validationTextRange()) ); } @@ -196,9 +200,9 @@ public class Persistence extends JpaContextNode protected void addMultiplePersistenceUnitMessage(List<IMessage> messages) { if (persistenceUnits.size() > 1) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS, + JpaValidationMessages.PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS, this, this.validationTextRange()) ); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java index 7c81fc4b6c..6ac05f49ad 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/PersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java @@ -9,7 +9,9 @@ *******************************************************************************/ package org.eclipse.jpt.core.internal.context.persistence; -import static org.eclipse.jpt.core.internal.context.persistence.PersistenceUnitTransactionType.*; +import static org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType.DEFAULT; +import static org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType.JTA; +import static org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType.RESOURCE_LOCAL; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -19,25 +21,32 @@ import java.util.NoSuchElementException; import org.eclipse.emf.common.util.EList; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.resource.orm.OrmArtifactEdit; -import org.eclipse.jpt.core.internal.resource.orm.OrmResource; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperties; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperty; -import org.eclipse.jpt.core.internal.validation.IJpaValidationMessages; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceStructureNodes; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; +import org.eclipse.jpt.core.resource.orm.OrmArtifactEdit; +import org.eclipse.jpt.core.resource.orm.OrmResource; +import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; +import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef; +import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType; +import org.eclipse.jpt.core.resource.persistence.XmlProperties; +import org.eclipse.jpt.core.resource.persistence.XmlProperty; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.HashBag; @@ -49,8 +58,8 @@ import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public class PersistenceUnit extends JpaContextNode - implements IPersistenceUnit +public class GenericPersistenceUnit extends AbstractJpaContextNode + implements PersistenceUnit { protected XmlPersistenceUnit xmlPersistenceUnit; @@ -68,48 +77,48 @@ public class PersistenceUnit extends JpaContextNode protected String nonJtaDataSource; - protected final List<IMappingFileRef> specifiedMappingFileRefs; + protected final List<MappingFileRef> specifiedMappingFileRefs; - protected IMappingFileRef impliedMappingFileRef; + protected MappingFileRef impliedMappingFileRef; - protected final List<IClassRef> specifiedClassRefs; + protected final List<ClassRef> specifiedClassRefs; - protected final List<IClassRef> impliedClassRefs; + protected final List<ClassRef> impliedClassRefs; protected Boolean excludeUnlistedClasses; protected boolean defaultExcludeUnlistedClasses = false; - protected final List<IProperty> properties; + protected final List<Property> properties; protected String defaultSchema; protected String defaultCatalog; protected AccessType defaultAccess; protected boolean defaultCascadePersist; - public PersistenceUnit(IPersistence parent) { + public GenericPersistenceUnit(Persistence parent) { super(parent); this.transactionType = PersistenceUnitTransactionType.DEFAULT; - this.specifiedMappingFileRefs = new ArrayList<IMappingFileRef>(); - this.specifiedClassRefs = new ArrayList<IClassRef>(); - this.impliedClassRefs = new ArrayList<IClassRef>(); - this.properties = new ArrayList<IProperty>(); + this.specifiedMappingFileRefs = new ArrayList<MappingFileRef>(); + this.specifiedClassRefs = new ArrayList<ClassRef>(); + this.impliedClassRefs = new ArrayList<ClassRef>(); + this.properties = new ArrayList<Property>(); } - public String getId() { - return IPersistenceStructureNodes.PERSISTENCE_UNIT_ID; + return PersistenceStructureNodes.PERSISTENCE_UNIT_ID; } @Override - public IPersistenceUnit persistenceUnit() { + public PersistenceUnit persistenceUnit() { return this; } // **************** parent ************************************************* - public IPersistence persistence() { - return (IPersistence) parent(); + @Override + public Persistence parent() { + return (Persistence) super.parent(); } // **************** name *************************************************** @@ -231,12 +240,12 @@ public class PersistenceUnit extends JpaContextNode // **************** mapping file refs ************************************** - public ListIterator<IMappingFileRef> mappingFileRefs() { + public ListIterator<MappingFileRef> mappingFileRefs() { if (impliedMappingFileRef == null) { return specifiedMappingFileRefs(); } else { - return new ReadOnlyCompositeListIterator<IMappingFileRef>( + return new ReadOnlyCompositeListIterator<MappingFileRef>( specifiedMappingFileRefs(), impliedMappingFileRef); } } @@ -250,46 +259,46 @@ public class PersistenceUnit extends JpaContextNode // **************** specified mapping file refs **************************** - public ListIterator<IMappingFileRef> specifiedMappingFileRefs() { - return new CloneListIterator<IMappingFileRef>(specifiedMappingFileRefs); + public ListIterator<MappingFileRef> specifiedMappingFileRefs() { + return new CloneListIterator<MappingFileRef>(specifiedMappingFileRefs); } public int specifiedMappingFileRefsSize() { return specifiedMappingFileRefs.size(); } - public IMappingFileRef addSpecifiedMappingFileRef() { + public MappingFileRef addSpecifiedMappingFileRef() { return addSpecifiedMappingFileRef(specifiedMappingFileRefs.size()); } - public IMappingFileRef addSpecifiedMappingFileRef(int index) { + public MappingFileRef addSpecifiedMappingFileRef(int index) { XmlMappingFileRef xmlMappingFileRef = PersistenceFactory.eINSTANCE.createXmlMappingFileRef(); - IMappingFileRef mappingFileRef = createMappingFileRef(xmlMappingFileRef); + MappingFileRef mappingFileRef = createMappingFileRef(xmlMappingFileRef); specifiedMappingFileRefs.add(index, mappingFileRef); this.xmlPersistenceUnit.getMappingFiles().add(xmlMappingFileRef); fireItemAdded(SPECIFIED_MAPPING_FILE_REF_LIST, index, mappingFileRef); return mappingFileRef; } - public void removeSpecifiedMappingFileRef(IMappingFileRef mappingFileRef) { + public void removeSpecifiedMappingFileRef(MappingFileRef mappingFileRef) { removeSpecifiedMappingFileRef(specifiedMappingFileRefs.indexOf(mappingFileRef)); } public void removeSpecifiedMappingFileRef(int index) { - IMappingFileRef mappingFileRefRemoved = specifiedMappingFileRefs.remove(index); + MappingFileRef mappingFileRefRemoved = specifiedMappingFileRefs.remove(index); this.xmlPersistenceUnit.getMappingFiles().remove(index); fireItemRemoved(SPECIFIED_MAPPING_FILE_REF_LIST, index, mappingFileRefRemoved); } - protected void addSpecifiedMappingFileRef_(IMappingFileRef mappingFileRef) { + protected void addSpecifiedMappingFileRef_(MappingFileRef mappingFileRef) { addSpecifiedMappingFileRef_(specifiedMappingFileRefs.size(), mappingFileRef); } - protected void addSpecifiedMappingFileRef_(int index, IMappingFileRef mappingFileRef) { + protected void addSpecifiedMappingFileRef_(int index, MappingFileRef mappingFileRef) { addItemToList(index, mappingFileRef, specifiedMappingFileRefs, SPECIFIED_MAPPING_FILE_REF_LIST); } - protected void removeSpecifiedMappingFileRef_(IMappingFileRef mappingFileRef) { + protected void removeSpecifiedMappingFileRef_(MappingFileRef mappingFileRef) { removeSpecifiedMappingFileRef_(specifiedMappingFileRefs.indexOf(mappingFileRef)); } @@ -300,15 +309,15 @@ public class PersistenceUnit extends JpaContextNode // **************** implied mapping file ref ******************************* - public IMappingFileRef getImpliedMappingFileRef() { + public MappingFileRef getImpliedMappingFileRef() { return impliedMappingFileRef; } - public IMappingFileRef setImpliedMappingFileRef() { + public MappingFileRef setImpliedMappingFileRef() { if (impliedMappingFileRef != null) { throw new IllegalStateException("The implied mapping file ref is already set."); } - IMappingFileRef mappingFileRef = createMappingFileRef(null); + MappingFileRef mappingFileRef = createMappingFileRef(null); impliedMappingFileRef = mappingFileRef; firePropertyChanged(IMPLIED_MAPPING_FILE_REF_PROPERTY, null, mappingFileRef); return mappingFileRef; @@ -318,7 +327,7 @@ public class PersistenceUnit extends JpaContextNode if (impliedMappingFileRef == null) { throw new IllegalStateException("The implie mapping file ref is already unset."); } - IMappingFileRef mappingFileRef = impliedMappingFileRef; + MappingFileRef mappingFileRef = impliedMappingFileRef; impliedMappingFileRef = null; firePropertyChanged(IMPLIED_MAPPING_FILE_REF_PROPERTY, mappingFileRef, null); } @@ -326,8 +335,8 @@ public class PersistenceUnit extends JpaContextNode // **************** class refs ********************************************* - public ListIterator<IClassRef> classRefs() { - return new ReadOnlyCompositeListIterator<IClassRef>( + public ListIterator<ClassRef> classRefs() { + return new ReadOnlyCompositeListIterator<ClassRef>( specifiedClassRefs(), impliedClassRefs()); } @@ -337,46 +346,46 @@ public class PersistenceUnit extends JpaContextNode // **************** specified class refs *********************************** - public ListIterator<IClassRef> specifiedClassRefs() { - return new CloneListIterator<IClassRef>(this.specifiedClassRefs); + public ListIterator<ClassRef> specifiedClassRefs() { + return new CloneListIterator<ClassRef>(this.specifiedClassRefs); } public int specifiedClassRefsSize() { return specifiedClassRefs.size(); } - public IClassRef addSpecifiedClassRef() { + public ClassRef addSpecifiedClassRef() { return addSpecifiedClassRef(this.specifiedClassRefs.size()); } - public IClassRef addSpecifiedClassRef(int index) { + public ClassRef addSpecifiedClassRef(int index) { XmlJavaClassRef xmlClassRef = PersistenceFactory.eINSTANCE.createXmlJavaClassRef(); - IClassRef classRef = createClassRef(xmlClassRef); + ClassRef classRef = createClassRef(xmlClassRef); this.specifiedClassRefs.add(index, classRef); this.xmlPersistenceUnit.getClasses().add(xmlClassRef); fireItemAdded(SPECIFIED_CLASS_REF_LIST, index, classRef); return classRef; } - public void removeSpecifiedClassRef(IClassRef classRef) { + public void removeSpecifiedClassRef(ClassRef classRef) { removeSpecifiedClassRef(this.specifiedClassRefs.indexOf(classRef)); } public void removeSpecifiedClassRef(int index) { - IClassRef classRefRemoved = this.specifiedClassRefs.remove(index); + ClassRef classRefRemoved = this.specifiedClassRefs.remove(index); this.xmlPersistenceUnit.getClasses().remove(index); fireItemRemoved(SPECIFIED_CLASS_REF_LIST, index, classRefRemoved); } - protected void addSpecifiedClassRef_(IClassRef classRef) { + protected void addSpecifiedClassRef_(ClassRef classRef) { addSpecifiedClassRef_(this.specifiedClassRefs.size(), classRef); } - protected void addSpecifiedClassRef_(int index, IClassRef classRef) { + protected void addSpecifiedClassRef_(int index, ClassRef classRef) { addItemToList(index, classRef, this.specifiedClassRefs, SPECIFIED_CLASS_REF_LIST); } - protected void removeSpecifiedClassRef_(IClassRef classRef) { + protected void removeSpecifiedClassRef_(ClassRef classRef) { removeSpecifiedClassRef_(this.specifiedClassRefs.indexOf(classRef)); } @@ -387,25 +396,25 @@ public class PersistenceUnit extends JpaContextNode // **************** implied class refs ************************************* - public ListIterator<IClassRef> impliedClassRefs() { - return new CloneListIterator<IClassRef>(impliedClassRefs); + public ListIterator<ClassRef> impliedClassRefs() { + return new CloneListIterator<ClassRef>(impliedClassRefs); } public int impliedClassRefsSize() { return impliedClassRefs.size(); } - public IClassRef addImpliedClassRef(String className) { + public ClassRef addImpliedClassRef(String className) { return addImpliedClassRef(impliedClassRefs.size(), className); } - public IClassRef addImpliedClassRef(int index, String className) { - IClassRef classRef = createClassRef(className); + public ClassRef addImpliedClassRef(int index, String className) { + ClassRef classRef = createClassRef(className); addItemToList(classRef, impliedClassRefs, IMPLIED_CLASS_REF_LIST); return classRef; } - public void removeImpliedClassRef(IClassRef classRef) { + public void removeImpliedClassRef(ClassRef classRef) { removeImpliedClassRef(impliedClassRefs.indexOf(classRef)); } @@ -413,11 +422,11 @@ public class PersistenceUnit extends JpaContextNode removeItemFromList(index, impliedClassRefs, IMPLIED_CLASS_REF_LIST); } - protected void addImpliedClassRef_(IClassRef classRef) { + protected void addImpliedClassRef_(ClassRef classRef) { addImpliedClassRef_(impliedClassRefs.size(), classRef); } - protected void addImpliedClassRef_(int index, IClassRef classRef) { + protected void addImpliedClassRef_(int index, ClassRef classRef) { addItemToList(index, classRef, impliedClassRefs, IMPLIED_CLASS_REF_LIST); } @@ -464,16 +473,16 @@ public class PersistenceUnit extends JpaContextNode // **************** properties ********************************************* - public ListIterator<IProperty> properties() { - return new CloneListIterator<IProperty>(this.properties); + public ListIterator<Property> properties() { + return new CloneListIterator<Property>(this.properties); } public int propertiesSize() { return this.properties.size(); } - public IProperty getProperty(String key) { - for(IProperty property : this.properties) { + public Property getProperty(String key) { + for(Property property : this.properties) { if(property.getName().equals(key)) { return property; } @@ -481,8 +490,8 @@ public class PersistenceUnit extends JpaContextNode return null; } - public IProperty getProperty(String key, String value) { - for(IProperty property : this.properties) { + public Property getProperty(String key, String value) { + for(Property property : this.properties) { if(property.getName().equals(key) && property.getValue().equals(value)) { return property; } @@ -490,7 +499,7 @@ public class PersistenceUnit extends JpaContextNode return null; } - protected IProperty getProperty(int index) { + protected Property getProperty(int index) { return this.properties.get(index); } @@ -548,15 +557,15 @@ public class PersistenceUnit extends JpaContextNode return (this.getProperty(key) != null); } - public IProperty addProperty() { + public Property addProperty() { XmlProperty xmlProperty = PersistenceFactory.eINSTANCE.createXmlProperty(); return this.addXmlProperty(xmlProperty); } - protected IProperty addXmlProperty(XmlProperty xmlProperty) { + protected Property addXmlProperty(XmlProperty xmlProperty) { - IProperty property = createProperty(xmlProperty); + Property property = createProperty(xmlProperty); int index = this.properties.size(); this.properties.add(index, property); @@ -578,14 +587,14 @@ public class PersistenceUnit extends JpaContextNode this.removeProperty(this.getProperty(key, value)); } - public void removeProperty(IProperty property) { + public void removeProperty(Property property) { if (property != null) { this.removeProperty(this.properties.indexOf(property)); } } protected void removeProperty(int index) { - IProperty propertyRemoved = this.properties.remove(index); + Property propertyRemoved = this.properties.remove(index); this.xmlPersistenceUnit.getProperties().getProperties().remove(index); if (this.xmlPersistenceUnit.getProperties().getProperties().isEmpty()) { @@ -595,15 +604,15 @@ public class PersistenceUnit extends JpaContextNode fireItemRemoved(PROPERTIES_LIST, index, propertyRemoved); } - protected void addProperty_(IProperty property) { + protected void addProperty_(Property property) { addProperty_(this.properties.size(), property); } - protected void addProperty_(int index, IProperty property) { + protected void addProperty_(int index, Property property) { addItemToList(index, property, this.properties, PROPERTIES_LIST); } - protected void removeProperty_(IProperty property) { + protected void removeProperty_(Property property) { removeProperty_(this.properties.indexOf(property)); } @@ -619,7 +628,7 @@ public class PersistenceUnit extends JpaContextNode //Take the first PersistenceUnitDefaults found in an orm.xml file and use //this for the defaults of the PersistenceUnit. protected PersistenceUnitDefaults persistenceUnitDefaults() { - for (IMappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { + for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.persistenceUnitDefaults(); if (persistenceUnitDefaults != null) { return persistenceUnitDefaults; @@ -779,11 +788,11 @@ public class PersistenceUnit extends JpaContextNode } protected void updateMappingFileRefs(XmlPersistenceUnit persistenceUnit) { - Iterator<IMappingFileRef> stream = specifiedMappingFileRefs(); + Iterator<MappingFileRef> stream = specifiedMappingFileRefs(); Iterator<XmlMappingFileRef> stream2 = persistenceUnit.getMappingFiles().iterator(); while (stream.hasNext()) { - IMappingFileRef mappingFileRef = stream.next(); + MappingFileRef mappingFileRef = stream.next(); if (stream2.hasNext()) { mappingFileRef.update(stream2.next()); } @@ -818,7 +827,7 @@ public class PersistenceUnit extends JpaContextNode protected boolean impliedMappingFileIsSpecified() { String impliedMappingFile = JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH; - for (IMappingFileRef each : specifiedMappingFileRefs) { + for (MappingFileRef each : specifiedMappingFileRefs) { if (impliedMappingFile.equals(each.getFileName())) { return true; } @@ -834,18 +843,18 @@ public class PersistenceUnit extends JpaContextNode return exists; } - protected IMappingFileRef createMappingFileRef(XmlMappingFileRef xmlMappingFileRef) { - IMappingFileRef mappingFileRef = jpaFactory().createMappingFileRef(this); + protected MappingFileRef createMappingFileRef(XmlMappingFileRef xmlMappingFileRef) { + MappingFileRef mappingFileRef = jpaFactory().buildMappingFileRef(this); mappingFileRef.initialize(xmlMappingFileRef); return mappingFileRef; } protected void updateClassRefs(XmlPersistenceUnit persistenceUnit) { - Iterator<IClassRef> stream = specifiedClassRefs(); + Iterator<ClassRef> stream = specifiedClassRefs(); Iterator<XmlJavaClassRef> stream2 = new CloneIterator<XmlJavaClassRef>(persistenceUnit.getClasses()); while (stream.hasNext()) { - IClassRef classRef = stream.next(); + ClassRef classRef = stream.next(); if (stream2.hasNext()) { classRef.update(stream2.next()); } @@ -858,13 +867,13 @@ public class PersistenceUnit extends JpaContextNode addSpecifiedClassRef_(createClassRef(stream2.next())); } - Iterator<IClassRef> impliedRefs = impliedClassRefs(); + Iterator<ClassRef> impliedRefs = impliedClassRefs(); Iterator<IType> annotatedClasses = jpaProject().annotatedClasses(); if (jpaProject().discoversAnnotatedClasses() && ! getExcludeUnlistedClasses()) { while (impliedRefs.hasNext()) { - IClassRef classRef = impliedRefs.next(); + ClassRef classRef = impliedRefs.next(); boolean updated = false; while (! updated && annotatedClasses.hasNext()) { IType annotatedClass = annotatedClasses.next(); @@ -886,26 +895,26 @@ public class PersistenceUnit extends JpaContextNode } } else { - for (IClassRef classRef : CollectionTools.iterable(impliedClassRefs())) { + for (ClassRef classRef : CollectionTools.iterable(impliedClassRefs())) { removeImpliedClassRef(classRef); } } } - protected IClassRef createClassRef(XmlJavaClassRef xmlClassRef) { - IClassRef classRef = jpaFactory().createClassRef(this); + protected ClassRef createClassRef(XmlJavaClassRef xmlClassRef) { + ClassRef classRef = jpaFactory().buildClassRef(this); classRef.initialize(xmlClassRef); return classRef; } - protected IClassRef createClassRef(String className) { - IClassRef classRef = jpaFactory().createClassRef(this); + protected ClassRef createClassRef(String className) { + ClassRef classRef = jpaFactory().buildClassRef(this); classRef.initialize(className); return classRef; } protected boolean classIsSpecified(String className) { - for (IClassRef specifiedClassRef : CollectionTools.iterable(specifiedClassRefs())) { + for (ClassRef specifiedClassRef : CollectionTools.iterable(specifiedClassRefs())) { if (className.equals(specifiedClassRef.getClassName())) { return true; } @@ -925,7 +934,7 @@ public class PersistenceUnit extends JpaContextNode protected void updateProperties(XmlPersistenceUnit persistenceUnit) { XmlProperties xmlProperties = persistenceUnit.getProperties(); - Iterator<IProperty> stream = properties(); + Iterator<Property> stream = properties(); Iterator<XmlProperty> stream2; if (xmlProperties == null) { @@ -936,7 +945,7 @@ public class PersistenceUnit extends JpaContextNode } while (stream.hasNext()) { - IProperty property = stream.next(); + Property property = stream.next(); if (stream2.hasNext()) { property.update(stream2.next()); } @@ -950,8 +959,8 @@ public class PersistenceUnit extends JpaContextNode } } - protected IProperty createProperty(XmlProperty xmlProperty) { - IProperty property = jpaFactory().createProperty(this); + protected Property createProperty(XmlProperty xmlProperty) { + Property property = jpaFactory().buildProperty(this); property.initialize(xmlProperty); return property; } @@ -1023,7 +1032,7 @@ public class PersistenceUnit extends JpaContextNode addInvalidMappingFileContentMessage(messages); addDuplicateMappingFileMessages(messages); - for (Iterator<IMappingFileRef> stream = mappingFileRefs(); stream.hasNext();) { + for (Iterator<MappingFileRef> stream = mappingFileRefs(); stream.hasNext();) { stream.next().addToMessages(messages, astRoot); } } @@ -1033,9 +1042,9 @@ public class PersistenceUnit extends JpaContextNode if (puDefaultsCollection.size() > 1) { for (PersistenceUnitDefaults puDefaults : puDefaultsCollection) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.ENTITY_MAPPINGS_MULTIPLE_METADATA, + JpaValidationMessages.ENTITY_MAPPINGS_MULTIPLE_METADATA, new String[] {this.getName()}, puDefaults) ); @@ -1049,17 +1058,17 @@ public class PersistenceUnit extends JpaContextNode new TransformationIterator(this.mappingFileRefs()) { @Override protected Object transform(Object next) { - return ((IMappingFileRef) next).getFileName(); + return ((MappingFileRef) next).getFileName(); } } ) ); - for (IMappingFileRef mappingFileRef : CollectionTools.collection(this.mappingFileRefs())) { + for (MappingFileRef mappingFileRef : CollectionTools.collection(this.mappingFileRefs())) { if (fileBag.count(mappingFileRef.getFileName()) > 1) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE, + JpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE, new String[] {mappingFileRef.getFileName()}, mappingFileRef) //, mappingFileRef.validationTextRange()) ); @@ -1068,12 +1077,12 @@ public class PersistenceUnit extends JpaContextNode } protected void addUnspecifiedMappingFileMessages(List<IMessage> messages) { - for (IMappingFileRef mappingFileRef : CollectionTools.collection(this.mappingFileRefs())) { + for (MappingFileRef mappingFileRef : CollectionTools.collection(this.mappingFileRefs())) { if (mappingFileRef.getFileName() == null || mappingFileRef.getFileName().equals("")) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE, + JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE, mappingFileRef) //, mappingFileRef.validationTextRange()) ); } @@ -1081,14 +1090,14 @@ public class PersistenceUnit extends JpaContextNode } protected void addUnresolvedMappingFileMessages(List<IMessage> messages) { - for (Iterator<IMappingFileRef> stream = this.mappingFileRefs(); stream.hasNext(); ) { - IMappingFileRef mappingFileRef = stream.next(); + for (Iterator<MappingFileRef> stream = this.mappingFileRefs(); stream.hasNext(); ) { + MappingFileRef mappingFileRef = stream.next(); if (! (mappingFileRef.getFileName() == null || mappingFileRef.getFileName().equals("")) && mappingFileRef.getOrmXml() == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE, + JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE, new String[] {mappingFileRef.getFileName()}, mappingFileRef) //, mappingFileRef.validationTextRange()) ); @@ -1097,14 +1106,14 @@ public class PersistenceUnit extends JpaContextNode } protected void addInvalidMappingFileContentMessage(List<IMessage> messages) { - for (Iterator<IMappingFileRef> stream = this.mappingFileRefs(); stream.hasNext(); ) { - IMappingFileRef mappingFileRef = (IMappingFileRef) stream.next(); + for (Iterator<MappingFileRef> stream = this.mappingFileRefs(); stream.hasNext(); ) { + MappingFileRef mappingFileRef = (MappingFileRef) stream.next(); if (mappingFileRef.getOrmXml() != null && mappingFileRef.getOrmXml().getEntityMappings() == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE, + JpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE, new String[] {mappingFileRef.getFileName()}, mappingFileRef) //, mappingFileRef.validationTextRange()) ); @@ -1119,18 +1128,18 @@ public class PersistenceUnit extends JpaContextNode // addInvalidOrRedundantClassMessages(messages); addDuplicateClassMessages(messages); - for (IClassRef classRef : CollectionTools.collection(classRefs())) { + for (ClassRef classRef : CollectionTools.collection(classRefs())) { classRef.addToMessages(messages, astRoot); } } protected void addUnspecifiedClassMessages(List<IMessage> messages) { - for (IClassRef javaClassRef : CollectionTools.collection(this.classRefs())) { + for (ClassRef javaClassRef : CollectionTools.collection(this.classRefs())) { if (javaClassRef.getJavaPersistentType() == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_CLASS, + JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_CLASS, javaClassRef, javaClassRef.validationTextRange()) ); } @@ -1165,13 +1174,13 @@ public class PersistenceUnit extends JpaContextNode // } protected void addUnresolvedClassMessages(List<IMessage> messages) { - for (IClassRef javaClassRef : specifiedClassRefs) { + for (ClassRef javaClassRef : specifiedClassRefs) { String javaClass = javaClassRef.getClassName(); if (! StringTools.stringIsEmpty(javaClass) && javaClassRef.getJavaPersistentType() == null) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_CLASS, + JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_CLASS, new String[] {javaClass}, javaClassRef, javaClassRef.validationTextRange()) ); @@ -1185,18 +1194,18 @@ public class PersistenceUnit extends JpaContextNode new TransformationIterator(this.classRefs()) { @Override protected Object transform(Object next) { - return ((IClassRef) next).getClassName(); + return ((ClassRef) next).getClassName(); } } ) ); - for (IClassRef javaClassRef : CollectionTools.collection(this.classRefs())) { + for (ClassRef javaClassRef : CollectionTools.collection(this.classRefs())) { if (javaClassRef.getClassName() != null && classNameBag.count(javaClassRef.getClassName()) > 1) { messages.add( - JpaValidationMessages.buildMessage( + DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - IJpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_CLASS, + JpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_CLASS, new String[] {javaClassRef.getClassName()}, javaClassRef, javaClassRef.validationTextRange()) ); @@ -1207,7 +1216,7 @@ public class PersistenceUnit extends JpaContextNode private Collection<PersistenceUnitDefaults> persistenceUnitDefaultsForValidation() { ArrayList<PersistenceUnitDefaults> puDefaults = new ArrayList<PersistenceUnitDefaults>(); - for (IMappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { + for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.persistenceUnitDefaults(); if (persistenceUnitDefaults != null) { puDefaults.add(persistenceUnitDefaults); @@ -1218,14 +1227,14 @@ public class PersistenceUnit extends JpaContextNode //************************************* - public IPersistentType persistentType(String fullyQualifiedTypeName) { - for (IMappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { - XmlPersistentType xmlPersistentType = mappingFileRef.persistentTypeFor(fullyQualifiedTypeName); + public PersistentType persistentType(String fullyQualifiedTypeName) { + for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { + OrmPersistentType xmlPersistentType = mappingFileRef.persistentTypeFor(fullyQualifiedTypeName); if (xmlPersistentType != null) { return xmlPersistentType; } } - for (IClassRef classRef : CollectionTools.iterable(classRefs())) { + for (ClassRef classRef : CollectionTools.iterable(classRefs())) { if (classRef.isFor(fullyQualifiedTypeName)) { return classRef.getJavaPersistentType(); } @@ -1233,13 +1242,13 @@ public class PersistenceUnit extends JpaContextNode return null; } - public IJpaStructureNode structureNode(int textOffset) { - for (IMappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { + public JpaStructureNode structureNode(int textOffset) { + for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { if (mappingFileRef.containsOffset(textOffset)) { return mappingFileRef; } } - for (IClassRef classRef : CollectionTools.iterable(classRefs())) { + for (ClassRef classRef : CollectionTools.iterable(classRefs())) { if (classRef.containsOffset(textOffset)) { return classRef; } @@ -1254,11 +1263,11 @@ public class PersistenceUnit extends JpaContextNode return xmlPersistenceUnit.containsOffset(textOffset); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return xmlPersistenceUnit.selectionTextRange(); } - public ITextRange validationTextRange() { + public TextRange validationTextRange() { return xmlPersistenceUnit.validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/Property.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java index dd3207d0bc..88c3585f62 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/Property.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java @@ -9,19 +9,21 @@ *******************************************************************************/ package org.eclipse.jpt.core.internal.context.persistence; -import org.eclipse.jpt.core.internal.context.base.JpaContextNode; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperty; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.internal.context.AbstractJpaContextNode; +import org.eclipse.jpt.core.resource.persistence.XmlProperty; -public class Property extends JpaContextNode - implements IProperty +public class GenericProperty extends AbstractJpaContextNode + implements Property { protected String name; protected String value; - public Property(IPersistenceUnit parent) { + public GenericProperty(PersistenceUnit parent) { super(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/IJpaFacetDataModelProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProperties.java index 64f3fb8255..ba468d5b45 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/IJpaFacetDataModelProperties.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProperties.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.facet; import org.eclipse.wst.common.frameworks.datamodel.IDataModelProperties; -public interface IJpaFacetDataModelProperties extends IDataModelProperties +public interface JpaFacetDataModelProperties extends IDataModelProperties { /** * Required, type String, identifies Jpa Platform diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java index 6fc080aa0c..da421b50ed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetDataModelProvider.java @@ -14,8 +14,8 @@ import java.util.Set; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.JptCoreMessages; -import org.eclipse.jpt.core.internal.JptCorePlugin; import org.eclipse.jpt.core.internal.platform.generic.GenericJpaPlatform; import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; @@ -32,7 +32,7 @@ import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; public class JpaFacetDataModelProvider extends FacetInstallDataModelProvider - implements IJpaFacetDataModelProperties + implements JpaFacetDataModelProperties { private static final String EJB_FACET_ID = IModuleConstants.JST_EJB_MODULE; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java index 7ac739e66b..15705541c6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/facet/JpaFacetInstallDelegate.java @@ -18,7 +18,7 @@ import org.eclipse.jdt.core.IClasspathAttribute; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; @@ -34,7 +34,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; * used in the POST_INSTALL event listener to build the JPA project. */ public class JpaFacetInstallDelegate - implements IDelegate, IJpaFacetDataModelProperties + implements IDelegate, JpaFacetDataModelProperties { public void execute(IProject project, IProjectFacetVersion fv, diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/ASTNodeTextRange.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/ASTNodeTextRange.java index 41ca85b17c..fda6200078 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/ASTNodeTextRange.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/ASTNodeTextRange.java @@ -11,13 +11,13 @@ package org.eclipse.jpt.core.internal.jdtutility; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.utility.internal.StringTools; /** * Straightforward implementation of ITextRange that adapts an ASTNode. */ -public class ASTNodeTextRange implements ITextRange { +public class ASTNodeTextRange implements TextRange { private final ASTNode astNode; public ASTNodeTextRange(ASTNode astNode) { @@ -58,10 +58,10 @@ public class ASTNodeTextRange implements ITextRange { if (o == this) { return true; } - if ( ! (o instanceof ITextRange)) { + if ( ! (o instanceof TextRange)) { return false; } - ITextRange r = (ITextRange) o; + TextRange r = (TextRange) o; return (r.getOffset() == this.getOffset()) && (r.getLength() == this.getLength()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/Member.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/Member.java index 1621907dd2..030b60107f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/Member.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jdtutility/Member.java @@ -26,7 +26,7 @@ import org.eclipse.jdt.core.dom.IBinding; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.SimpleTextRange; import org.eclipse.jpt.utility.internal.Command; import org.eclipse.jpt.utility.internal.CommandExecutor; @@ -121,23 +121,23 @@ public abstract class Member { return new ModifiedDeclaration(this.bodyDeclaration(astRoot)); } - public ITextRange textRange() { + public TextRange textRange() { return this.textRange(this.lightweightASTRoot()); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return this.textRange(this.bodyDeclaration(astRoot)); } - ITextRange textRange(ASTNode astNode) { + TextRange textRange(ASTNode astNode) { return (astNode == null) ? null : new ASTNodeTextRange(astNode); } - public ITextRange nameTextRange() { + public TextRange nameTextRange() { return this.nameTextRange(this.lightweightASTRoot()); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { ISourceRange sourceRange = this.nameSourceRange(); return new SimpleTextRange( @@ -210,7 +210,7 @@ public abstract class Member { * Return the text range corresponding to the specified annotation. * If the annotation is missing, return null. */ - public ITextRange annotationTextRange(DeclarationAnnotationAdapter adapter, CompilationUnit astRoot) { + public TextRange annotationTextRange(DeclarationAnnotationAdapter adapter, CompilationUnit astRoot) { return this.textRange(this.annotation(adapter, astRoot)); } @@ -218,7 +218,7 @@ public abstract class Member { * Return the text range corresponding to the specified annotation. * If the annotation is missing, return null. */ - public ITextRange annotationTextRange(DeclarationAnnotationAdapter adapter) { + public TextRange annotationTextRange(DeclarationAnnotationAdapter adapter) { return this.annotationTextRange(adapter, this.astRoot()); } @@ -313,7 +313,7 @@ public abstract class Member { * Return the text range corresponding to the specified element. * If the element is missing, return null. */ - public ITextRange annotationElementTextRange(DeclarationAnnotationElementAdapter<?> adapter, CompilationUnit astRoot) { + public TextRange annotationElementTextRange(DeclarationAnnotationElementAdapter<?> adapter, CompilationUnit astRoot) { return this.textRange(this.annotationElementExpression(adapter, astRoot)); } @@ -321,7 +321,7 @@ public abstract class Member { * Return the text range corresponding to the specified element. * If the element is missing, return null. */ - public ITextRange annotationElementTextRange(DeclarationAnnotationElementAdapter<?> adapter) { + public TextRange annotationElementTextRange(DeclarationAnnotationElementAdapter<?> adapter) { return this.annotationElementTextRange(adapter, this.astRoot()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java index e5a0f56438..e626742d9d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/JpaPlatformRegistry.java @@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.Platform; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.jpt.utility.internal.iterators.ReadOnlyIterator; @@ -154,14 +154,14 @@ public class JpaPlatformRegistry { * Unlike other registry methods, invoking this method may activate * the plug-in. */ - public IJpaPlatform jpaPlatform(String id) { + public JpaPlatform jpaPlatform(String id) { IConfigurationElement configElement = this.jpaPlatformConfigurationElements.get(id); if (configElement == null) { throw new IllegalArgumentException(id); } - IJpaPlatform platform; + JpaPlatform platform; try { - platform = (IJpaPlatform) configElement.createExecutableExtension(AT_CLASS); + platform = (JpaPlatform) configElement.createExecutableExtension(AT_CLASS); } catch (CoreException ex) { this.logFailedInstantiation(configElement, ex); throw new IllegalArgumentException(id); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaAnnotationProvider.java index 5950f21c60..d8400f9818 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaAnnotationProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaAnnotationProvider.java @@ -15,13 +15,9 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; +import org.eclipse.jpt.core.JpaAnnotationProvider; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.Type; -import org.eclipse.jpt.core.internal.resource.java.Annotation; -import org.eclipse.jpt.core.internal.resource.java.AnnotationDefinition; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentAttributeResource; -import org.eclipse.jpt.core.internal.resource.java.JavaPersistentTypeResource; import org.eclipse.jpt.core.internal.resource.java.AssociationOverrideImpl.AssociationOverrideAnnotationDefinition; import org.eclipse.jpt.core.internal.resource.java.AssociationOverridesImpl.AssociationOverridesAnnotationDefinition; import org.eclipse.jpt.core.internal.resource.java.AttributeOverrideImpl.AttributeOverrideAnnotationDefinition; @@ -64,12 +60,16 @@ import org.eclipse.jpt.core.internal.resource.java.TableImpl.TableAnnotationDefi import org.eclipse.jpt.core.internal.resource.java.TemporalImpl.TemporalAnnotationDefinition; import org.eclipse.jpt.core.internal.resource.java.TransientImpl.TransientAnnotationDefinition; import org.eclipse.jpt.core.internal.resource.java.VersionImpl.VersionAnnotationDefinition; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationListIterator; -public abstract class BaseJpaAnnotationProvider implements IJpaAnnotationProvider +public abstract class BaseJpaAnnotationProvider implements JpaAnnotationProvider { /** * Ordered list of possible type mapping annotations. Ordered because this @@ -208,22 +208,22 @@ public abstract class BaseJpaAnnotationProvider implements IJpaAnnotationProvide //********************* IJpaPlatform implementation ************************* - public Annotation buildTypeMappingAnnotation(JavaPersistentTypeResource parent, Type type, String mappingAnnotationName) { + public Annotation buildTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName) { AnnotationDefinition annotationDefinition = typeMappingAnnotationDefinition(mappingAnnotationName); return annotationDefinition.buildAnnotation(parent, type); } - public Annotation buildNullTypeMappingAnnotation(JavaPersistentTypeResource parent, Type type, String mappingAnnotationName) { + public Annotation buildNullTypeMappingAnnotation(JavaResourcePersistentType parent, Type type, String mappingAnnotationName) { AnnotationDefinition annotationDefinition = typeMappingAnnotationDefinition(mappingAnnotationName); return annotationDefinition.buildNullAnnotation(parent, type); } - public Annotation buildTypeAnnotation(JavaPersistentTypeResource parent, Type type, String annotationName) { + public Annotation buildTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName) { AnnotationDefinition annotationDefinition = typeAnnotationDefinition(annotationName); return annotationDefinition.buildAnnotation(parent, type); } - public Annotation buildNullTypeAnnotation(JavaPersistentTypeResource parent, Type type, String annotationName) { + public Annotation buildNullTypeAnnotation(JavaResourcePersistentType parent, Type type, String annotationName) { AnnotationDefinition annotationDefinition = typeAnnotationDefinition(annotationName); return annotationDefinition.buildNullAnnotation(parent, type); } @@ -246,22 +246,22 @@ public abstract class BaseJpaAnnotationProvider implements IJpaAnnotationProvide }; } - public Annotation buildAttributeMappingAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String mappingAnnotationName) { + public Annotation buildAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String mappingAnnotationName) { AnnotationDefinition annotationDefinition = attributeMappingAnnotationDefinition(mappingAnnotationName); return annotationDefinition.buildAnnotation(parent, attribute); } - public Annotation buildNullAttributeMappingAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String annotationName) { + public Annotation buildNullAttributeMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) { AnnotationDefinition annotationDefinition = attributeMappingAnnotationDefinition(annotationName); return annotationDefinition.buildNullAnnotation(parent, attribute); } - public Annotation buildAttributeAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String annotationName) { + public Annotation buildAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) { AnnotationDefinition annotationDefinition = attributeAnnotationDefinition(annotationName); return annotationDefinition.buildAnnotation(parent, attribute); } - public Annotation buildNullAttributeAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, String annotationName) { + public Annotation buildNullAttributeAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, String annotationName) { AnnotationDefinition annotationDefinition = attributeAnnotationDefinition(annotationName); return annotationDefinition.buildNullAnnotation(parent, attribute); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaFactory.java index c6d140cc99..542f129873 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaFactory.java @@ -15,121 +15,122 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jpt.core.internal.IContextModel; -import org.eclipse.jpt.core.internal.IJpaDataSource; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.JpaDataSource; -import org.eclipse.jpt.core.internal.JpaFile; -import org.eclipse.jpt.core.internal.JpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.base.BaseJpaContent; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaAssociationOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaBasicMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddable; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEntity; -import org.eclipse.jpt.core.internal.context.java.IJavaGeneratedValue; -import org.eclipse.jpt.core.internal.context.java.IJavaIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinTable; -import org.eclipse.jpt.core.internal.context.java.IJavaJpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaMappedSuperclass; -import org.eclipse.jpt.core.internal.context.java.IJavaNamedNativeQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaNamedQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaQueryHint; -import org.eclipse.jpt.core.internal.context.java.IJavaRelationshipMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaSecondaryTable; -import org.eclipse.jpt.core.internal.context.java.IJavaSequenceGenerator; -import org.eclipse.jpt.core.internal.context.java.IJavaTable; -import org.eclipse.jpt.core.internal.context.java.IJavaTableGenerator; -import org.eclipse.jpt.core.internal.context.java.IJavaTransientMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaTypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaVersionMapping; -import org.eclipse.jpt.core.internal.context.java.JavaAssociationOverride; -import org.eclipse.jpt.core.internal.context.java.JavaAttributeOverride; -import org.eclipse.jpt.core.internal.context.java.JavaBasicMapping; -import org.eclipse.jpt.core.internal.context.java.JavaColumn; -import org.eclipse.jpt.core.internal.context.java.JavaDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddable; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.java.JavaEntity; -import org.eclipse.jpt.core.internal.context.java.JavaGeneratedValue; -import org.eclipse.jpt.core.internal.context.java.JavaIdMapping; -import org.eclipse.jpt.core.internal.context.java.JavaJoinColumn; -import org.eclipse.jpt.core.internal.context.java.JavaJoinTable; -import org.eclipse.jpt.core.internal.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.core.internal.context.java.JavaManyToOneMapping; -import org.eclipse.jpt.core.internal.context.java.JavaMappedSuperclass; -import org.eclipse.jpt.core.internal.context.java.JavaNamedNativeQuery; -import org.eclipse.jpt.core.internal.context.java.JavaNamedQuery; -import org.eclipse.jpt.core.internal.context.java.JavaNullAttributeMapping; +import org.eclipse.jpt.core.ContextModel; +import org.eclipse.jpt.core.JpaDataSource; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.java.JavaAssociationOverride; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; +import org.eclipse.jpt.core.context.java.JavaEmbeddable; +import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping; +import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaGeneratedValue; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; +import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; +import org.eclipse.jpt.core.context.java.JavaNamedQuery; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.java.JavaQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.context.java.JavaRelationshipMapping; +import org.eclipse.jpt.core.context.java.JavaSecondaryTable; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.context.java.JavaTable; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; +import org.eclipse.jpt.core.context.java.JavaTransientMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaVersionMapping; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.internal.GenericJpaDataSource; +import org.eclipse.jpt.core.internal.GenericJpaFile; +import org.eclipse.jpt.core.internal.GenericJpaProject; +import org.eclipse.jpt.core.internal.context.BaseJpaContent; +import org.eclipse.jpt.core.internal.context.java.GenericJavaAssociationOverride; +import org.eclipse.jpt.core.internal.context.java.GenericJavaAttributeOverride; +import org.eclipse.jpt.core.internal.context.java.GenericJavaBasicMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaDiscriminatorColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedIdMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEmbeddedMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaEntity; +import org.eclipse.jpt.core.internal.context.java.GenericJavaGeneratedValue; +import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinTable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToManyMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToOneMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaMappedSuperclass; +import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedNativeQuery; +import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedQuery; +import org.eclipse.jpt.core.internal.context.java.GenericJavaNullAttributeMapping; import org.eclipse.jpt.core.internal.context.java.JavaNullTypeMapping; -import org.eclipse.jpt.core.internal.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.core.internal.context.java.JavaOneToOneMapping; -import org.eclipse.jpt.core.internal.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.JavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.JavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.java.JavaQueryHint; -import org.eclipse.jpt.core.internal.context.java.JavaSecondaryTable; -import org.eclipse.jpt.core.internal.context.java.JavaSequenceGenerator; -import org.eclipse.jpt.core.internal.context.java.JavaTable; -import org.eclipse.jpt.core.internal.context.java.JavaTableGenerator; -import org.eclipse.jpt.core.internal.context.java.JavaTransientMapping; -import org.eclipse.jpt.core.internal.context.java.JavaVersionMapping; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.EntityMappingsImpl; -import org.eclipse.jpt.core.internal.context.orm.OrmXml; +import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToManyMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToOneMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaPersistentAttribute; +import org.eclipse.jpt.core.internal.context.java.GenericJavaPersistentType; +import org.eclipse.jpt.core.internal.context.java.GenericJavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaQueryHint; +import org.eclipse.jpt.core.internal.context.java.GenericJavaSecondaryTable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaSequenceGenerator; +import org.eclipse.jpt.core.internal.context.java.GenericJavaTable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaTableGenerator; +import org.eclipse.jpt.core.internal.context.java.GenericJavaTransientMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaVersionMapping; +import org.eclipse.jpt.core.internal.context.orm.GenericEntityMappings; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmPersistentType; +import org.eclipse.jpt.core.internal.context.orm.GenericPersistenceUnitDefaults; +import org.eclipse.jpt.core.internal.context.orm.GenericPersistenceUnitMetadata; import org.eclipse.jpt.core.internal.context.orm.OrmXmlImpl; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaultsImpl; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadataImpl; -import org.eclipse.jpt.core.internal.context.orm.XmlEmbeddable; -import org.eclipse.jpt.core.internal.context.orm.XmlEntity; -import org.eclipse.jpt.core.internal.context.orm.XmlMappedSuperclass; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.persistence.ClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; -import org.eclipse.jpt.core.internal.context.persistence.IProperty; -import org.eclipse.jpt.core.internal.context.persistence.MappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.Persistence; -import org.eclipse.jpt.core.internal.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.internal.context.persistence.PersistenceXml; -import org.eclipse.jpt.core.internal.context.persistence.Property; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmEmbeddable; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmEntity; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmMappedSuperclass; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.internal.context.persistence.GenericClassRef; +import org.eclipse.jpt.core.internal.context.persistence.GenericMappingFileRef; +import org.eclipse.jpt.core.internal.context.persistence.GenericPersistence; +import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenceUnit; +import org.eclipse.jpt.core.internal.context.persistence.GeenericPersistenceXml; +import org.eclipse.jpt.core.internal.context.persistence.GenericProperty; import org.eclipse.jpt.core.internal.jdtutility.DefaultAnnotationEditFormatter; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; -public abstract class BaseJpaFactory implements IJpaBaseContextFactory +public abstract class BaseJpaFactory implements JpaBaseContextFactory { protected BaseJpaFactory() { super(); @@ -138,16 +139,16 @@ public abstract class BaseJpaFactory implements IJpaBaseContextFactory // **************** Core objects ****************************************** - public IJpaProject createJpaProject(IJpaProject.Config config) throws CoreException { - return new JpaProject(config); + public JpaProject buildJpaProject(JpaProject.Config config) throws CoreException { + return new GenericJpaProject(config); } - public IJpaDataSource createJpaDataSource(IJpaProject jpaProject, String connectionProfileName) { - return new JpaDataSource(jpaProject, connectionProfileName); + public JpaDataSource buildJpaDataSource(JpaProject jpaProject, String connectionProfileName) { + return new GenericJpaDataSource(jpaProject, connectionProfileName); } - public IJpaFile createJpaFile(IJpaProject jpaProject, IFile file, IResourceModel resourceModel) { - return new JpaFile(jpaProject, file, resourceModel); + public JpaFile buildJpaFile(JpaProject jpaProject, IFile file, ResourceModel resourceModel) { + return new GenericJpaFile(jpaProject, file, resourceModel); } @@ -171,7 +172,7 @@ public abstract class BaseJpaFactory implements IJpaBaseContextFactory || contentTypeId.equals(JptCorePlugin.ORM_XML_CONTENT_TYPE); } - public IResourceModel buildResourceModel(IJpaProject jpaProject, IFile file) { + public ResourceModel buildResourceModel(JpaProject jpaProject, IFile file) { if (! JavaCore.create(jpaProject.project()).isOnClasspath(file)) { throw new IllegalArgumentException("The file" + file + " is not on the project classpath"); } @@ -183,7 +184,7 @@ public abstract class BaseJpaFactory implements IJpaBaseContextFactory return buildResourceModel(jpaProject, file, contentTypeId); } - protected IResourceModel buildResourceModel(IJpaProject jpaProject, IFile file, String contentTypeId) { + protected ResourceModel buildResourceModel(JpaProject jpaProject, IFile file, String contentTypeId) { if (JavaCore.JAVA_SOURCE_CONTENT_TYPE.equals(contentTypeId)) { return buildJavaResourceModel(jpaProject, file); } @@ -197,18 +198,18 @@ public abstract class BaseJpaFactory implements IJpaBaseContextFactory return null; } - protected IResourceModel buildJavaResourceModel(IJpaProject jpaProject, IFile file) { + protected ResourceModel buildJavaResourceModel(JpaProject jpaProject, IFile file) { return new JavaResourceModel( file, jpaProject.jpaPlatform().annotationProvider(), jpaProject.modifySharedDocumentCommandExecutorProvider(), DefaultAnnotationEditFormatter.instance()); } - protected IResourceModel buildPersistenceResourceModel(IFile file) { + protected ResourceModel buildPersistenceResourceModel(IFile file) { return new PersistenceResourceModel(file); } - protected IResourceModel buildOrmResourceModel(IFile file) { + protected ResourceModel buildOrmResourceModel(IFile file) { return new OrmResourceModel(file); } @@ -231,195 +232,195 @@ public abstract class BaseJpaFactory implements IJpaBaseContextFactory // **************** Context objects *************************************** - public IContextModel buildContextModel(IJpaProject parent) { + public ContextModel buildContextModel(JpaProject parent) { return new BaseJpaContent(parent); } - public IPersistenceXml createPersistenceXml(IBaseJpaContent parent) { - return new PersistenceXml(parent); + public PersistenceXml buildPersistenceXml(IBaseJpaContent parent) { + return new GeenericPersistenceXml(parent); } - public OrmXml createOrmXml(IMappingFileRef parent) { + public OrmXml buildOrmXml(MappingFileRef parent) { return new OrmXmlImpl(parent); } - public EntityMappings createEntityMappings(OrmXml parent) { - return new EntityMappingsImpl(parent); + public EntityMappings buildEntityMappings(OrmXml parent) { + return new GenericEntityMappings(parent); } - public PersistenceUnitMetadata createPersistenceUnitMetadata(EntityMappings parent) { - return new PersistenceUnitMetadataImpl(parent); + public PersistenceUnitMetadata buildPersistenceUnitMetadata(EntityMappings parent) { + return new GenericPersistenceUnitMetadata(parent); } - public PersistenceUnitDefaults createPersistenceUnitDefaults(PersistenceUnitMetadata parent) { - return new PersistenceUnitDefaultsImpl(parent); + public PersistenceUnitDefaults buildPersistenceUnitDefaults(PersistenceUnitMetadata parent) { + return new GenericPersistenceUnitDefaults(parent); } - public IPersistence createPersistence(IPersistenceXml parent) { - return new Persistence(parent); + public Persistence buildPersistence(PersistenceXml parent) { + return new GenericPersistence(parent); } - public IPersistenceUnit createPersistenceUnit(IPersistence parent) { - return new PersistenceUnit(parent); + public PersistenceUnit buildPersistenceUnit(Persistence parent) { + return new GenericPersistenceUnit(parent); } - public IMappingFileRef createMappingFileRef(IPersistenceUnit parent) { - return new MappingFileRef(parent); + public MappingFileRef buildMappingFileRef(PersistenceUnit parent) { + return new GenericMappingFileRef(parent); } - public IClassRef createClassRef(IPersistenceUnit parent) { - return new ClassRef(parent); + public ClassRef buildClassRef(PersistenceUnit parent) { + return new GenericClassRef(parent); } - public IProperty createProperty(IPersistenceUnit parent) { - return new Property(parent); + public Property buildProperty(PersistenceUnit parent) { + return new GenericProperty(parent); } - public IJavaPersistentType createJavaPersistentType(IJpaContextNode parent) { - return new JavaPersistentType(parent); + public JavaPersistentType buildJavaPersistentType(JpaContextNode parent) { + return new GenericJavaPersistentType(parent); } - public IJavaPersistentAttribute createJavaPersistentAttribute(IJavaPersistentType parent) { - return new JavaPersistentAttribute(parent); + public JavaPersistentAttribute buildJavaPersistentAttribute(JavaPersistentType parent) { + return new GenericJavaPersistentAttribute(parent); } - public IJavaTypeMapping createJavaNullTypeMapping(IJavaPersistentType parent) { + public JavaTypeMapping buildJavaNullTypeMapping(JavaPersistentType parent) { return new JavaNullTypeMapping(parent); } - public IJavaEntity createJavaEntity(IJavaPersistentType parent) { - return new JavaEntity(parent); + public JavaEntity buildJavaEntity(JavaPersistentType parent) { + return new GenericJavaEntity(parent); } - public IJavaMappedSuperclass createJavaMappedSuperclass(IJavaPersistentType parent) { - return new JavaMappedSuperclass(parent); + public JavaMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent) { + return new GenericJavaMappedSuperclass(parent); } - public IJavaEmbeddable createJavaEmbeddable(IJavaPersistentType parent) { - return new JavaEmbeddable(parent); + public JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent) { + return new GenericJavaEmbeddable(parent); } - public IJavaTable createJavaTable(IJavaEntity parent) { - return new JavaTable(parent); + public JavaTable buildJavaTable(JavaEntity parent) { + return new GenericJavaTable(parent); } - public IJavaColumn createJavaColumn(IJavaJpaContextNode parent, IJavaColumn.Owner owner) { - return new JavaColumn(parent, owner); + public JavaColumn buildJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner) { + return new GenericJavaColumn(parent, owner); } - public IJavaDiscriminatorColumn createJavaDiscriminatorColumn(IJavaEntity parent, INamedColumn.Owner owner) { - return new JavaDiscriminatorColumn(parent, owner); + public JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, NamedColumn.Owner owner) { + return new GenericJavaDiscriminatorColumn(parent, owner); } - public IJavaJoinColumn createJavaJoinColumn(IJavaJpaContextNode parent, IJoinColumn.Owner owner) { - return new JavaJoinColumn(parent, owner); + public JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JoinColumn.Owner owner) { + return new GenericJavaJoinColumn(parent, owner); } - public IJavaJoinTable createJavaJoinTable(IJavaRelationshipMapping parent) { - return new JavaJoinTable(parent); + public JavaJoinTable buildJavaJoinTable(JavaRelationshipMapping parent) { + return new GenericJavaJoinTable(parent); } - public IJavaSecondaryTable createJavaSecondaryTable(IJavaEntity parent) { - return new JavaSecondaryTable(parent); + public JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent) { + return new GenericJavaSecondaryTable(parent); } - public IJavaBasicMapping createJavaBasicMapping(IJavaPersistentAttribute parent) { - return new JavaBasicMapping(parent); + public JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent) { + return new GenericJavaBasicMapping(parent); } - public IJavaEmbeddedIdMapping createJavaEmbeddedIdMapping(IJavaPersistentAttribute parent) { - return new JavaEmbeddedIdMapping(parent); + public JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaPersistentAttribute parent) { + return new GenericJavaEmbeddedIdMapping(parent); } - public IJavaEmbeddedMapping createJavaEmbeddedMapping(IJavaPersistentAttribute parent) { - return new JavaEmbeddedMapping(parent); + public JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaPersistentAttribute parent) { + return new GenericJavaEmbeddedMapping(parent); } - public IJavaIdMapping createJavaIdMapping(IJavaPersistentAttribute parent) { - return new JavaIdMapping(parent); + public JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent) { + return new GenericJavaIdMapping(parent); } - public IJavaManyToManyMapping createJavaManyToManyMapping(IJavaPersistentAttribute parent) { - return new JavaManyToManyMapping(parent); + public JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent) { + return new GenericJavaManyToManyMapping(parent); } - public IJavaManyToOneMapping createJavaManyToOneMapping(IJavaPersistentAttribute parent) { - return new JavaManyToOneMapping(parent); + public JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent) { + return new GenericJavaManyToOneMapping(parent); } - public IJavaOneToManyMapping createJavaOneToManyMapping(IJavaPersistentAttribute parent) { - return new JavaOneToManyMapping(parent); + public JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent) { + return new GenericJavaOneToManyMapping(parent); } - public IJavaOneToOneMapping createJavaOneToOneMapping(IJavaPersistentAttribute parent) { - return new JavaOneToOneMapping(parent); + public JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent) { + return new GenericJavaOneToOneMapping(parent); } - public IJavaTransientMapping createJavaTransientMapping(IJavaPersistentAttribute parent) { - return new JavaTransientMapping(parent); + public JavaTransientMapping buildJavaTransientMapping(JavaPersistentAttribute parent) { + return new GenericJavaTransientMapping(parent); } - public IJavaVersionMapping createJavaVersionMapping(IJavaPersistentAttribute parent) { - return new JavaVersionMapping(parent); + public JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent) { + return new GenericJavaVersionMapping(parent); } - public IJavaAttributeMapping createJavaNullAttributeMapping(IJavaPersistentAttribute parent) { - return new JavaNullAttributeMapping(parent); + public JavaAttributeMapping buildJavaNullAttributeMapping(JavaPersistentAttribute parent) { + return new GenericJavaNullAttributeMapping(parent); } - public IJavaSequenceGenerator createJavaSequenceGenerator(IJavaJpaContextNode parent) { - return new JavaSequenceGenerator(parent); + public JavaSequenceGenerator buildJavaSequenceGenerator(JavaJpaContextNode parent) { + return new GenericJavaSequenceGenerator(parent); } - public IJavaTableGenerator createJavaTableGenerator(IJavaJpaContextNode parent) { - return new JavaTableGenerator(parent); + public JavaTableGenerator buildJavaTableGenerator(JavaJpaContextNode parent) { + return new GenericJavaTableGenerator(parent); } - public IJavaGeneratedValue createJavaGeneratedValue(IJavaAttributeMapping parent) { - return new JavaGeneratedValue(parent); + public JavaGeneratedValue buildJavaGeneratedValue(JavaAttributeMapping parent) { + return new GenericJavaGeneratedValue(parent); } - public IJavaPrimaryKeyJoinColumn createJavaPrimaryKeyJoinColumn(IJavaJpaContextNode parent, IAbstractJoinColumn.Owner owner) { - return new JavaPrimaryKeyJoinColumn(parent, owner); + public JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, AbstractJoinColumn.Owner owner) { + return new GenericJavaPrimaryKeyJoinColumn(parent, owner); } - public IJavaAttributeOverride createJavaAttributeOverride(IJavaJpaContextNode parent, IAttributeOverride.Owner owner) { - return new JavaAttributeOverride(parent, owner); + public JavaAttributeOverride buildJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner) { + return new GenericJavaAttributeOverride(parent, owner); } - public IJavaAssociationOverride createJavaAssociationOverride(IJavaJpaContextNode parent, IAssociationOverride.Owner owner) { - return new JavaAssociationOverride(parent, owner); + public JavaAssociationOverride buildJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner) { + return new GenericJavaAssociationOverride(parent, owner); } - public IJavaNamedQuery createJavaNamedQuery(IJavaJpaContextNode parent) { - return new JavaNamedQuery(parent); + public JavaNamedQuery buildJavaNamedQuery(JavaJpaContextNode parent) { + return new GenericJavaNamedQuery(parent); } - public IJavaNamedNativeQuery createJavaNamedNativeQuery(IJavaJpaContextNode parent) { - return new JavaNamedNativeQuery(parent); + public JavaNamedNativeQuery buildJavaNamedNativeQuery(JavaJpaContextNode parent) { + return new GenericJavaNamedNativeQuery(parent); } - public IJavaQueryHint createJavaQueryHint(IJavaQuery<?> parent) { - return new JavaQueryHint(parent); + public JavaQueryHint buildJavaQueryHint(JavaQuery<?> parent) { + return new GenericJavaQueryHint(parent); } - public XmlPersistentType createXmlPersistentType(EntityMappings parent, String mappingKey) { - return new XmlPersistentType(parent, mappingKey); + public OrmPersistentType buildOrmPersistentType(EntityMappings parent, String mappingKey) { + return new GenericOrmPersistentType(parent, mappingKey); } - public XmlEntity createXmlEntity(XmlPersistentType parent) { - return new XmlEntity(parent); + public GenericOrmEntity buildXmlEntity(OrmPersistentType parent) { + return new GenericOrmEntity(parent); } - public XmlMappedSuperclass createXmlMappedSuperclass(XmlPersistentType parent) { - return new XmlMappedSuperclass(parent); + public GenericOrmMappedSuperclass buildXmlMappedSuperclass(OrmPersistentType parent) { + return new GenericOrmMappedSuperclass(parent); } - public XmlEmbeddable createXmlEmbeddable(XmlPersistentType parent) { - return new XmlEmbeddable(parent); + public GenericOrmEmbeddable buildXmlEmbeddable(OrmPersistentType parent) { + return new GenericOrmEmbeddable(parent); } - public XmlPersistentAttribute createXmlPersistentAttribute(XmlPersistentType parent, String mappingKey) { - return new XmlPersistentAttribute(parent, mappingKey); + public OrmPersistentAttribute buildXmlPersistentAttribute(OrmPersistentType parent, String mappingKey) { + return new OrmPersistentAttribute(parent, mappingKey); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaPlatform.java index 1bd84b7a66..fe17b2a2d8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/BaseJpaPlatform.java @@ -15,18 +15,18 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.core.resources.IFile; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.java.IDefaultJavaAttributeMappingProvider; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeMappingProvider; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaTypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaTypeMappingProvider; +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.java.DefaultJavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeMappingProvider; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMappingProvider; import org.eclipse.jpt.core.internal.context.java.JavaBasicMappingProvider; import org.eclipse.jpt.core.internal.context.java.JavaEmbeddableProvider; import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedIdMappingProvider; @@ -46,19 +46,19 @@ import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; -public abstract class BaseJpaPlatform implements IJpaPlatform +public abstract class BaseJpaPlatform implements JpaPlatform { private String id; - protected IJpaBaseContextFactory jpaFactory; + protected JpaBaseContextFactory jpaFactory; - protected IJpaAnnotationProvider annotationProvider; + protected JpaAnnotationProvider annotationProvider; - protected Collection<IJavaTypeMappingProvider> javaTypeMappingProviders; + protected Collection<JavaTypeMappingProvider> javaTypeMappingProviders; - protected Collection<IJavaAttributeMappingProvider> javaAttributeMappingProviders; + protected Collection<JavaAttributeMappingProvider> javaAttributeMappingProviders; - protected List<IDefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders; + protected List<DefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders; protected BaseJpaPlatform() { super(); @@ -74,7 +74,7 @@ public abstract class BaseJpaPlatform implements IJpaPlatform * * IMPORTANT * For INTERNAL use only !! * ************* * - * @see IJpaPlatform#setId(String) + * @see JpaPlatform#setId(String) */ public void setId(String theId) { this.id = theId; @@ -83,19 +83,19 @@ public abstract class BaseJpaPlatform implements IJpaPlatform // **************** Model construction / updating ************************** - public IJpaBaseContextFactory jpaFactory() { + public JpaBaseContextFactory jpaFactory() { if (this.jpaFactory == null) { this.jpaFactory = buildJpaFactory(); } return this.jpaFactory; } - protected abstract IJpaBaseContextFactory buildJpaFactory(); + protected abstract JpaBaseContextFactory buildJpaFactory(); - public IJpaFile buildJpaFile(IJpaProject jpaProject, IFile file) { + public JpaFile buildJpaFile(JpaProject jpaProject, IFile file) { if (jpaFactory().hasRelevantContent(file)) { - IResourceModel resourceModel = jpaFactory().buildResourceModel(jpaProject, file); - return jpaFactory().createJpaFile(jpaProject, file, resourceModel); + ResourceModel resourceModel = jpaFactory().buildResourceModel(jpaProject, file); + return jpaFactory().buildJpaFile(jpaProject, file, resourceModel); } return null; @@ -104,44 +104,44 @@ public abstract class BaseJpaPlatform implements IJpaPlatform // **************** java annotation support ******************************** - public IJpaAnnotationProvider annotationProvider() { + public JpaAnnotationProvider annotationProvider() { if (this.annotationProvider == null) { this.annotationProvider = buildAnnotationProvider(); } return this.annotationProvider; } - protected abstract IJpaAnnotationProvider buildAnnotationProvider(); + protected abstract JpaAnnotationProvider buildAnnotationProvider(); // **************** type mapping support ******************************** - public IJavaTypeMapping createJavaTypeMappingFromMappingKey(String typeMappingKey, IJavaPersistentType parent) { + public JavaTypeMapping buildJavaTypeMappingFromMappingKey(String typeMappingKey, JavaPersistentType parent) { return javaTypeMappingProviderFromMappingKey(typeMappingKey).buildMapping(parent, jpaFactory()); } - public IJavaTypeMapping createJavaTypeMappingFromAnnotation(String mappingAnnotationName, IJavaPersistentType parent) { + public JavaTypeMapping buildJavaTypeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentType parent) { return javaTypeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, jpaFactory()); } - public IJavaAttributeMapping createJavaAttributeMappingFromMappingKey(String attributeMappingKey, IJavaPersistentAttribute parent) { + public JavaAttributeMapping buildJavaAttributeMappingFromMappingKey(String attributeMappingKey, JavaPersistentAttribute parent) { return javaAttributeMappingProviderFromMappingKey(attributeMappingKey).buildMapping(parent, jpaFactory()); } - public IJavaAttributeMapping createJavaAttributeMappingFromAnnotation(String mappingAnnotationName, IJavaPersistentAttribute parent) { + public JavaAttributeMapping buildJavaAttributeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentAttribute parent) { return javaAttributeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, jpaFactory()); } - public IJavaAttributeMapping createDefaultJavaAttributeMapping(IJavaPersistentAttribute parent) { + public JavaAttributeMapping buildDefaultJavaAttributeMapping(JavaPersistentAttribute parent) { return defaultJavaAttributeMappingProvider(parent).buildMapping(parent, jpaFactory()); } - protected Iterator<IJavaTypeMappingProvider> javaTypeMappingProviders() { + protected Iterator<JavaTypeMappingProvider> javaTypeMappingProviders() { if (this.javaTypeMappingProviders == null) { - this.javaTypeMappingProviders = new ArrayList<IJavaTypeMappingProvider>(); + this.javaTypeMappingProviders = new ArrayList<JavaTypeMappingProvider>(); this.addJavaTypeMappingProvidersTo(this.javaTypeMappingProviders); } - return new CloneIterator<IJavaTypeMappingProvider>(this.javaTypeMappingProviders); + return new CloneIterator<JavaTypeMappingProvider>(this.javaTypeMappingProviders); } /** @@ -149,16 +149,16 @@ public abstract class BaseJpaPlatform implements IJpaPlatform * The default includes the JPA spec-defined type mappings of * Entity, MappedSuperclass, and Embeddable */ - protected void addJavaTypeMappingProvidersTo(Collection<IJavaTypeMappingProvider> providers) { + protected void addJavaTypeMappingProvidersTo(Collection<JavaTypeMappingProvider> providers) { providers.add(JavaEntityProvider.instance()); providers.add(JavaMappedSuperclassProvider.instance()); providers.add(JavaEmbeddableProvider.instance()); providers.add(JavaNullTypeMappingProvider.instance()); } - protected IJavaTypeMappingProvider javaTypeMappingProviderFromMappingKey(String typeMappingKey) { - for (Iterator<IJavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { - IJavaTypeMappingProvider provider = i.next(); + protected JavaTypeMappingProvider javaTypeMappingProviderFromMappingKey(String typeMappingKey) { + for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { + JavaTypeMappingProvider provider = i.next(); if (provider.key() == typeMappingKey) { return provider; } @@ -166,9 +166,9 @@ public abstract class BaseJpaPlatform implements IJpaPlatform throw new IllegalArgumentException("Illegal type mapping key: " + typeMappingKey); } - protected IJavaTypeMappingProvider javaTypeMappingProviderFromAnnotation(String annotationName) { - for (Iterator<IJavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { - IJavaTypeMappingProvider provider = i.next(); + protected JavaTypeMappingProvider javaTypeMappingProviderFromAnnotation(String annotationName) { + for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { + JavaTypeMappingProvider provider = i.next(); if (provider.annotationName() == annotationName) { return provider; } @@ -176,12 +176,12 @@ public abstract class BaseJpaPlatform implements IJpaPlatform throw new IllegalArgumentException("Illegal annotation name: " + annotationName); } - protected Iterator<IJavaAttributeMappingProvider> javaAttributeMappingProviders() { + protected Iterator<JavaAttributeMappingProvider> javaAttributeMappingProviders() { if (this.javaAttributeMappingProviders == null) { - this.javaAttributeMappingProviders = new ArrayList<IJavaAttributeMappingProvider>(); + this.javaAttributeMappingProviders = new ArrayList<JavaAttributeMappingProvider>(); this.addJavaAttributeMappingProvidersTo(this.javaAttributeMappingProviders); } - return new CloneIterator<IJavaAttributeMappingProvider>(this.javaAttributeMappingProviders); + return new CloneIterator<JavaAttributeMappingProvider>(this.javaAttributeMappingProviders); } /** @@ -189,7 +189,7 @@ public abstract class BaseJpaPlatform implements IJpaPlatform * The default includes the JPA spec-defined attribute mappings of * Basic, Id, Transient OneToOne, OneToMany, ManyToOne, ManyToMany, Embeddable, EmbeddedId, Version. */ - protected void addJavaAttributeMappingProvidersTo(Collection<IJavaAttributeMappingProvider> providers) { + protected void addJavaAttributeMappingProvidersTo(Collection<JavaAttributeMappingProvider> providers) { providers.add(JavaBasicMappingProvider.instance()); providers.add(JavaEmbeddedMappingProvider.instance()); providers.add(JavaEmbeddedIdMappingProvider.instance()); @@ -202,9 +202,9 @@ public abstract class BaseJpaPlatform implements IJpaPlatform providers.add(JavaVersionMappingProvider.instance()); } - protected IJavaAttributeMappingProvider javaAttributeMappingProviderFromMappingKey(String attributeMappingKey) { - for (Iterator<IJavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { - IJavaAttributeMappingProvider provider = i.next(); + protected JavaAttributeMappingProvider javaAttributeMappingProviderFromMappingKey(String attributeMappingKey) { + for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { + JavaAttributeMappingProvider provider = i.next(); if (provider.key() == attributeMappingKey) { return provider; } @@ -212,9 +212,9 @@ public abstract class BaseJpaPlatform implements IJpaPlatform throw new IllegalArgumentException("Illegal attribute mapping key: " + attributeMappingKey); } - protected IJavaAttributeMappingProvider javaAttributeMappingProviderFromAnnotation(String annotationName) { - for (Iterator<IJavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { - IJavaAttributeMappingProvider provider = i.next(); + protected JavaAttributeMappingProvider javaAttributeMappingProviderFromAnnotation(String annotationName) { + for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { + JavaAttributeMappingProvider provider = i.next(); if (provider.annotationName() == annotationName) { return provider; } @@ -222,12 +222,12 @@ public abstract class BaseJpaPlatform implements IJpaPlatform throw new IllegalArgumentException("Illegal annotation name: " + annotationName); } - protected ListIterator<IDefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders() { + protected ListIterator<DefaultJavaAttributeMappingProvider> defaultJavaAttributeMappingProviders() { if (this.defaultJavaAttributeMappingProviders == null) { - this.defaultJavaAttributeMappingProviders = new ArrayList<IDefaultJavaAttributeMappingProvider>(); + this.defaultJavaAttributeMappingProviders = new ArrayList<DefaultJavaAttributeMappingProvider>(); this.addDefaultJavaAttributeMappingProvidersTo(this.defaultJavaAttributeMappingProviders); } - return new CloneListIterator<IDefaultJavaAttributeMappingProvider>(this.defaultJavaAttributeMappingProviders); + return new CloneListIterator<DefaultJavaAttributeMappingProvider>(this.defaultJavaAttributeMappingProviders); } /** @@ -235,14 +235,14 @@ public abstract class BaseJpaPlatform implements IJpaPlatform * The default includes the JPA spec-defined attribute mappings of * Embedded and Basic. */ - protected void addDefaultJavaAttributeMappingProvidersTo(List<IDefaultJavaAttributeMappingProvider> providers) { + protected void addDefaultJavaAttributeMappingProvidersTo(List<DefaultJavaAttributeMappingProvider> providers) { providers.add(JavaEmbeddedMappingProvider.instance()); //bug 190344 need to test default embedded before basic providers.add(JavaBasicMappingProvider.instance()); } - protected IJavaAttributeMappingProvider defaultJavaAttributeMappingProvider(IJavaPersistentAttribute persistentAttribute) { - for (Iterator<IDefaultJavaAttributeMappingProvider> i = this.defaultJavaAttributeMappingProviders(); i.hasNext(); ) { - IDefaultJavaAttributeMappingProvider provider = i.next(); + protected JavaAttributeMappingProvider defaultJavaAttributeMappingProvider(JavaPersistentAttribute persistentAttribute) { + for (Iterator<DefaultJavaAttributeMappingProvider> i = this.defaultJavaAttributeMappingProviders(); i.hasNext(); ) { + DefaultJavaAttributeMappingProvider provider = i.next(); if (provider.defaultApplies(persistentAttribute)) { return provider; } @@ -251,7 +251,7 @@ public abstract class BaseJpaPlatform implements IJpaPlatform return nullAttributeMappingProvider(); } - public String defaultJavaAttributeMappingKey(IJavaPersistentAttribute persistentAttribute) { + public String defaultJavaAttributeMappingKey(JavaPersistentAttribute persistentAttribute) { return defaultJavaAttributeMappingProvider(persistentAttribute).key(); } @@ -259,13 +259,13 @@ public abstract class BaseJpaPlatform implements IJpaPlatform * the "null" attribute mapping is used when the attribute is neither * modified with a mapping annotation nor mapped by a "default" mapping */ - protected IJavaAttributeMappingProvider nullAttributeMappingProvider() { + protected JavaAttributeMappingProvider nullAttributeMappingProvider() { return JavaNullAttributeMappingProvider.instance(); } // **************** Validation ********************************************* - public void addToMessages(IJpaProject project, List<IMessage> messages) { + public void addToMessages(JpaProject project, List<IMessage> messages) { project.addToMessages(messages, null); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/IJpaBaseContextFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/IJpaBaseContextFactory.java deleted file mode 100644 index 1c615c466d..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/IJpaBaseContextFactory.java +++ /dev/null @@ -1,183 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.core.internal.platform.base; - -import org.eclipse.jpt.core.internal.IJpaFactory; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaAssociationOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaAttributeOverride; -import org.eclipse.jpt.core.internal.context.java.IJavaBasicMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddable; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaEntity; -import org.eclipse.jpt.core.internal.context.java.IJavaGeneratedValue; -import org.eclipse.jpt.core.internal.context.java.IJavaIdMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaJoinTable; -import org.eclipse.jpt.core.internal.context.java.IJavaJpaContextNode; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaManyToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaMappedSuperclass; -import org.eclipse.jpt.core.internal.context.java.IJavaNamedNativeQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaNamedQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToManyMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaOneToOneMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.core.internal.context.java.IJavaPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.java.IJavaQuery; -import org.eclipse.jpt.core.internal.context.java.IJavaQueryHint; -import org.eclipse.jpt.core.internal.context.java.IJavaRelationshipMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaSecondaryTable; -import org.eclipse.jpt.core.internal.context.java.IJavaSequenceGenerator; -import org.eclipse.jpt.core.internal.context.java.IJavaTable; -import org.eclipse.jpt.core.internal.context.java.IJavaTableGenerator; -import org.eclipse.jpt.core.internal.context.java.IJavaTransientMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaTypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaVersionMapping; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.OrmXml; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.core.internal.context.orm.XmlEmbeddable; -import org.eclipse.jpt.core.internal.context.orm.XmlEntity; -import org.eclipse.jpt.core.internal.context.orm.XmlMappedSuperclass; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; -import org.eclipse.jpt.core.internal.context.persistence.IProperty; - -/** - * An IJpaFactory that also assumes a base JPA project context structure - * corresponding to the JPA spec: - * - * RootContent - * |- persistence.xml - * |- persistence unit(s) - * |- mapping file(s) (e.g. orm.xml) - * | |- persistent type mapping(s) (e.g. Entity) - * | |- persistent attribute mapping(s) (e.g. Basic) - * |- persistent type mapping(s) - * - * ... and associated objects. - */ -public interface IJpaBaseContextFactory extends IJpaFactory -{ - IPersistenceXml createPersistenceXml(IBaseJpaContent parent); - - IPersistence createPersistence(IPersistenceXml parent); - - OrmXml createOrmXml(IMappingFileRef parent); - - EntityMappings createEntityMappings(OrmXml parent); - - PersistenceUnitMetadata createPersistenceUnitMetadata(EntityMappings parent); - - PersistenceUnitDefaults createPersistenceUnitDefaults(PersistenceUnitMetadata parent); - - IPersistenceUnit createPersistenceUnit(IPersistence parent); - - IMappingFileRef createMappingFileRef(IPersistenceUnit parent); - - IClassRef createClassRef(IPersistenceUnit parent); - - IProperty createProperty(IPersistenceUnit parent); - - IJavaPersistentType createJavaPersistentType(IJpaContextNode parent); - - IJavaPersistentAttribute createJavaPersistentAttribute(IJavaPersistentType parent); - - IJavaTypeMapping createJavaNullTypeMapping(IJavaPersistentType parent); - - IJavaEntity createJavaEntity(IJavaPersistentType parent); - - IJavaMappedSuperclass createJavaMappedSuperclass(IJavaPersistentType parent); - - IJavaEmbeddable createJavaEmbeddable(IJavaPersistentType parent); - - IJavaTable createJavaTable(IJavaEntity parent); - - IJavaJoinTable createJavaJoinTable(IJavaRelationshipMapping parent); - - IJavaColumn createJavaColumn(IJavaJpaContextNode parent, IJavaColumn.Owner owner); - - IJavaDiscriminatorColumn createJavaDiscriminatorColumn(IJavaEntity parent, INamedColumn.Owner owner); - - IJavaJoinColumn createJavaJoinColumn(IJavaJpaContextNode parent, IJoinColumn.Owner owner); - - IJavaSecondaryTable createJavaSecondaryTable(IJavaEntity parent); - - IJavaBasicMapping createJavaBasicMapping(IJavaPersistentAttribute parent); - - IJavaEmbeddedIdMapping createJavaEmbeddedIdMapping(IJavaPersistentAttribute parent); - - IJavaEmbeddedMapping createJavaEmbeddedMapping(IJavaPersistentAttribute parent); - - IJavaIdMapping createJavaIdMapping(IJavaPersistentAttribute parent); - - IJavaManyToManyMapping createJavaManyToManyMapping(IJavaPersistentAttribute parent); - - IJavaManyToOneMapping createJavaManyToOneMapping(IJavaPersistentAttribute parent); - - IJavaOneToManyMapping createJavaOneToManyMapping(IJavaPersistentAttribute parent); - - IJavaOneToOneMapping createJavaOneToOneMapping(IJavaPersistentAttribute parent); - - IJavaTransientMapping createJavaTransientMapping(IJavaPersistentAttribute parent); - - IJavaVersionMapping createJavaVersionMapping(IJavaPersistentAttribute parent); - - IJavaAttributeMapping createJavaNullAttributeMapping(IJavaPersistentAttribute parent); - - IJavaSequenceGenerator createJavaSequenceGenerator(IJavaJpaContextNode parent); - - IJavaTableGenerator createJavaTableGenerator(IJavaJpaContextNode parent); - - IJavaGeneratedValue createJavaGeneratedValue(IJavaAttributeMapping parent); - - IJavaPrimaryKeyJoinColumn createJavaPrimaryKeyJoinColumn(IJavaJpaContextNode parent, IAbstractJoinColumn.Owner owner); - - IJavaAttributeOverride createJavaAttributeOverride(IJavaJpaContextNode parent, IAttributeOverride.Owner owner); - - IJavaAssociationOverride createJavaAssociationOverride(IJavaJpaContextNode parent, IAssociationOverride.Owner owner); - - IJavaNamedQuery createJavaNamedQuery(IJavaJpaContextNode parent); - - IJavaNamedNativeQuery createJavaNamedNativeQuery(IJavaJpaContextNode parent); - - IJavaQueryHint createJavaQueryHint(IJavaQuery<?> parent); - - //TODO need an interface?? - XmlPersistentType createXmlPersistentType(EntityMappings parent, String mappingKey); - - XmlEntity createXmlEntity(XmlPersistentType parent); - - XmlMappedSuperclass createXmlMappedSuperclass(XmlPersistentType parent); - - XmlEmbeddable createXmlEmbeddable(XmlPersistentType parent); - - XmlPersistentAttribute createXmlPersistentAttribute(XmlPersistentType parent, String mappingKey); - -} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/JpaBaseContextFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/JpaBaseContextFactory.java new file mode 100644 index 0000000000..10d5b8186e --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/base/JpaBaseContextFactory.java @@ -0,0 +1,182 @@ +/******************************************************************************* + * Copyright (c) 2007 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.core.internal.platform.base; + +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.java.JavaAssociationOverride; +import org.eclipse.jpt.core.context.java.JavaAttributeMapping; +import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.context.java.JavaColumn; +import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; +import org.eclipse.jpt.core.context.java.JavaEmbeddable; +import org.eclipse.jpt.core.context.java.JavaEmbeddedIdMapping; +import org.eclipse.jpt.core.context.java.JavaEmbeddedMapping; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaGeneratedValue; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.java.JavaJoinColumn; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; +import org.eclipse.jpt.core.context.java.JavaManyToOneMapping; +import org.eclipse.jpt.core.context.java.JavaMappedSuperclass; +import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; +import org.eclipse.jpt.core.context.java.JavaNamedQuery; +import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; +import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.java.JavaQuery; +import org.eclipse.jpt.core.context.java.JavaQueryHint; +import org.eclipse.jpt.core.context.java.JavaRelationshipMapping; +import org.eclipse.jpt.core.context.java.JavaSecondaryTable; +import org.eclipse.jpt.core.context.java.JavaSequenceGenerator; +import org.eclipse.jpt.core.context.java.JavaTable; +import org.eclipse.jpt.core.context.java.JavaTableGenerator; +import org.eclipse.jpt.core.context.java.JavaTransientMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.java.JavaVersionMapping; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmXml; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.context.persistence.Property; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmEmbeddable; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmEntity; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmMappedSuperclass; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; + +/** + * An IJpaFactory that also assumes a base JPA project context structure + * corresponding to the JPA spec: + * + * RootContent + * |- persistence.xml + * |- persistence unit(s) + * |- mapping file(s) (e.g. orm.xml) + * | |- persistent type mapping(s) (e.g. Entity) + * | |- persistent attribute mapping(s) (e.g. Basic) + * |- persistent type mapping(s) + * + * ... and associated objects. + */ +public interface JpaBaseContextFactory extends JpaFactory +{ + PersistenceXml buildPersistenceXml(IBaseJpaContent parent); + + Persistence buildPersistence(PersistenceXml parent); + + OrmXml buildOrmXml(MappingFileRef parent); + + EntityMappings buildEntityMappings(OrmXml parent); + + PersistenceUnitMetadata buildPersistenceUnitMetadata(EntityMappings parent); + + PersistenceUnitDefaults buildPersistenceUnitDefaults(PersistenceUnitMetadata parent); + + PersistenceUnit buildPersistenceUnit(Persistence parent); + + MappingFileRef buildMappingFileRef(PersistenceUnit parent); + + ClassRef buildClassRef(PersistenceUnit parent); + + Property buildProperty(PersistenceUnit parent); + + JavaPersistentType buildJavaPersistentType(JpaContextNode parent); + + JavaPersistentAttribute buildJavaPersistentAttribute(JavaPersistentType parent); + + JavaTypeMapping buildJavaNullTypeMapping(JavaPersistentType parent); + + JavaEntity buildJavaEntity(JavaPersistentType parent); + + JavaMappedSuperclass buildJavaMappedSuperclass(JavaPersistentType parent); + + JavaEmbeddable buildJavaEmbeddable(JavaPersistentType parent); + + JavaTable buildJavaTable(JavaEntity parent); + + JavaJoinTable buildJavaJoinTable(JavaRelationshipMapping parent); + + JavaColumn buildJavaColumn(JavaJpaContextNode parent, JavaColumn.Owner owner); + + JavaDiscriminatorColumn buildJavaDiscriminatorColumn(JavaEntity parent, NamedColumn.Owner owner); + + JavaJoinColumn buildJavaJoinColumn(JavaJpaContextNode parent, JoinColumn.Owner owner); + + JavaSecondaryTable buildJavaSecondaryTable(JavaEntity parent); + + JavaBasicMapping buildJavaBasicMapping(JavaPersistentAttribute parent); + + JavaEmbeddedIdMapping buildJavaEmbeddedIdMapping(JavaPersistentAttribute parent); + + JavaEmbeddedMapping buildJavaEmbeddedMapping(JavaPersistentAttribute parent); + + JavaIdMapping buildJavaIdMapping(JavaPersistentAttribute parent); + + JavaManyToManyMapping buildJavaManyToManyMapping(JavaPersistentAttribute parent); + + JavaManyToOneMapping buildJavaManyToOneMapping(JavaPersistentAttribute parent); + + JavaOneToManyMapping buildJavaOneToManyMapping(JavaPersistentAttribute parent); + + JavaOneToOneMapping buildJavaOneToOneMapping(JavaPersistentAttribute parent); + + JavaTransientMapping buildJavaTransientMapping(JavaPersistentAttribute parent); + + JavaVersionMapping buildJavaVersionMapping(JavaPersistentAttribute parent); + + JavaAttributeMapping buildJavaNullAttributeMapping(JavaPersistentAttribute parent); + + JavaSequenceGenerator buildJavaSequenceGenerator(JavaJpaContextNode parent); + + JavaTableGenerator buildJavaTableGenerator(JavaJpaContextNode parent); + + JavaGeneratedValue buildJavaGeneratedValue(JavaAttributeMapping parent); + + JavaPrimaryKeyJoinColumn buildJavaPrimaryKeyJoinColumn(JavaJpaContextNode parent, AbstractJoinColumn.Owner owner); + + JavaAttributeOverride buildJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner); + + JavaAssociationOverride buildJavaAssociationOverride(JavaJpaContextNode parent, AssociationOverride.Owner owner); + + JavaNamedQuery buildJavaNamedQuery(JavaJpaContextNode parent); + + JavaNamedNativeQuery buildJavaNamedNativeQuery(JavaJpaContextNode parent); + + JavaQueryHint buildJavaQueryHint(JavaQuery<?> parent); + + OrmPersistentType buildOrmPersistentType(EntityMappings parent, String mappingKey); + + GenericOrmEntity buildXmlEntity(OrmPersistentType parent); + + GenericOrmMappedSuperclass buildXmlMappedSuperclass(OrmPersistentType parent); + + GenericOrmEmbeddable buildXmlEmbeddable(OrmPersistentType parent); + + OrmPersistentAttribute buildXmlPersistentAttribute(OrmPersistentType parent, String mappingKey); + +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/generic/GenericJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/generic/GenericJpaPlatform.java index ee0faa2aae..414897f243 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/generic/GenericJpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/generic/GenericJpaPlatform.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.platform.generic; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; +import org.eclipse.jpt.core.JpaAnnotationProvider; import org.eclipse.jpt.core.internal.platform.base.BaseJpaPlatform; -import org.eclipse.jpt.core.internal.platform.base.IJpaBaseContextFactory; +import org.eclipse.jpt.core.internal.platform.base.JpaBaseContextFactory; public class GenericJpaPlatform extends BaseJpaPlatform @@ -27,7 +27,7 @@ public class GenericJpaPlatform extends BaseJpaPlatform // **************** Model construction / updating ************************** @Override - protected IJpaBaseContextFactory buildJpaFactory() { + protected JpaBaseContextFactory buildJpaFactory() { return new GenericJpaFactory(); } @@ -35,7 +35,7 @@ public class GenericJpaPlatform extends BaseJpaPlatform // **************** java annotation support ******************************** @Override - protected IJpaAnnotationProvider buildAnnotationProvider() { + protected JpaAnnotationProvider buildAnnotationProvider() { return new GenericJpaAnnotationProvider(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java index 3b1b87321f..792fdf0f9d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/prefs/JpaPreferenceInitializer.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.prefs; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; /** * Class used to initialize default preference values. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractAnnotationResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractAnnotationResource.java index 34ee901217..d4b6c1fdc9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractAnnotationResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractAnnotationResource.java @@ -10,11 +10,13 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public abstract class AbstractAnnotationResource<E extends Member> extends AbstractMemberResource<E> implements Annotation @@ -23,13 +25,13 @@ public abstract class AbstractAnnotationResource<E extends Member> extends Abstr private final AnnotationAdapter annotationAdapter; - protected AbstractAnnotationResource(JavaResource parent, E member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected AbstractAnnotationResource(JavaResourceNode parent, E member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member); this.daa = daa; this.annotationAdapter = annotationAdapter; } - protected AbstractAnnotationResource(JavaResource parent, E member, DeclarationAnnotationAdapter daa) { + protected AbstractAnnotationResource(JavaResourceNode parent, E member, DeclarationAnnotationAdapter daa) { this(parent, member, daa, new MemberAnnotationAdapter(member, daa)); } @@ -54,7 +56,7 @@ public abstract class AbstractAnnotationResource<E extends Member> extends Abstr getAnnotationAdapter().newMarkerAnnotation(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return getMember().annotationTextRange(this.daa, astRoot); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java index ffbf8f9373..95dd653eab 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumnImpl.java @@ -10,15 +10,18 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; -public abstract class AbstractColumnImpl extends AbstractNamedColumn implements AbstractColumn +public abstract class AbstractColumnImpl extends AbstractNamedColumn implements AbstractColumnAnnotation { // hold this so we can get the 'table' text range private final DeclarationAnnotationElementAdapter<String> tableDeclarationAdapter; @@ -52,11 +55,11 @@ public abstract class AbstractColumnImpl extends AbstractNamedColumn implements private Boolean updatable; - public AbstractColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + public AbstractColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { this(parent, member, daa, new MemberAnnotationAdapter(member, daa)); } - public AbstractColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + public AbstractColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.tableDeclarationAdapter = this.buildStringElementAdapter(this.tableElementName()); this.tableAdapter = this.buildShortCircuitElementAdapter(this.tableDeclarationAdapter); @@ -93,7 +96,7 @@ public abstract class AbstractColumnImpl extends AbstractNamedColumn implements @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - AbstractColumn oldColumn = (AbstractColumn) oldAnnotation; + AbstractColumnAnnotation oldColumn = (AbstractColumnAnnotation) oldAnnotation; setTable(oldColumn.getTable()); setUnique(oldColumn.getUnique()); setNullable(oldColumn.getNullable()); @@ -157,23 +160,23 @@ public abstract class AbstractColumnImpl extends AbstractNamedColumn implements firePropertyChanged(UPDATABLE_PROPERTY, oldUpdatable, newUpdatable); } - public ITextRange nullableTextRange(CompilationUnit astRoot) { + public TextRange nullableTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nullableDeclarationAdapter, astRoot); } - public ITextRange insertableTextRange(CompilationUnit astRoot) { + public TextRange insertableTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.insertableDeclarationAdapter, astRoot); } - public ITextRange uniqueTextRange(CompilationUnit astRoot) { + public TextRange uniqueTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.uniqueDeclarationAdapter, astRoot); } - public ITextRange updatableTextRange(CompilationUnit astRoot) { + public TextRange updatableTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.updatableDeclarationAdapter, astRoot); } - public ITextRange tableTextRange(CompilationUnit astRoot) { + public TextRange tableTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.tableDeclarationAdapter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaPersistentResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaPersistentResource.java index b038145114..1bb8b7e4da 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaPersistentResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaPersistentResource.java @@ -19,16 +19,21 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jdt.core.dom.MarkerAnnotation; import org.eclipse.jdt.core.dom.NormalAnnotation; import org.eclipse.jdt.core.dom.SingleMemberAnnotation; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; import org.eclipse.jpt.core.internal.jdtutility.Member; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterator; public abstract class AbstractJavaPersistentResource<E extends Member> extends AbstractMemberResource<E> - implements JavaPersistentResource + implements JavaResourcePersistentMember { /** * stores all annotations(non-mapping) except duplicates, java compiler has an error for duplicates @@ -42,7 +47,7 @@ public abstract class AbstractJavaPersistentResource<E extends Member> extends A private boolean persistable; - public AbstractJavaPersistentResource(JavaResource parent, E member){ + public AbstractJavaPersistentResource(JavaResourceNode parent, E member){ super(parent, member); this.annotations = new ArrayList<Annotation>(); this.mappingAnnotations = new ArrayList<Annotation>(); @@ -128,7 +133,7 @@ public abstract class AbstractJavaPersistentResource<E extends Member> extends A return null; } - public JavaResource nonNullAnnotation(String annotationName) { + public JavaResourceNode nonNullAnnotation(String annotationName) { Annotation annotation = annotation(annotationName); if (annotation == null) { return buildNullAnnotation(annotationName); @@ -146,7 +151,7 @@ public abstract class AbstractJavaPersistentResource<E extends Member> extends A return null; } - public JavaResource nonNullMappingAnnotation(String annotationName) { + public JavaResourceNode nonNullMappingAnnotation(String annotationName) { Annotation annotation = mappingAnnotation(annotationName); if (annotation == null) { return buildNullMappingAnnotation(annotationName); @@ -498,15 +503,15 @@ public abstract class AbstractJavaPersistentResource<E extends Member> extends A } - public ITextRange fullTextRange(CompilationUnit astRoot) { + public TextRange fullTextRange(CompilationUnit astRoot) { return this.getMember().textRange(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return this.fullTextRange(astRoot); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.getMember().nameTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractMemberResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractMemberResource.java index 7eebdbae71..dedc0e8430 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractMemberResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractMemberResource.java @@ -11,16 +11,17 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public abstract class AbstractMemberResource<E extends Member> extends AbstractResource { private final E member; - protected AbstractMemberResource(JavaResource parent, E member) { + protected AbstractMemberResource(JavaResourceNode parent, E member) { super(parent); this.member = member; } @@ -30,7 +31,7 @@ public abstract class AbstractMemberResource<E extends Member> extends AbstractR return this.member; } - protected ITextRange elementTextRange(DeclarationAnnotationElementAdapter<?> elementAdapter, CompilationUnit astRoot) { + protected TextRange elementTextRange(DeclarationAnnotationElementAdapter<?> elementAdapter, CompilationUnit astRoot) { return this.elementTextRange(this.member.annotationElementTextRange(elementAdapter, astRoot), astRoot); } @@ -39,7 +40,7 @@ public abstract class AbstractMemberResource<E extends Member> extends AbstractR * return the Java object's text range instead (which is usually the * annotation's text range). */ - protected ITextRange elementTextRange(ITextRange elementTextRange, CompilationUnit astRoot) { + protected TextRange elementTextRange(TextRange elementTextRange, CompilationUnit astRoot) { return (elementTextRange != null) ? elementTextRange : this.textRange(astRoot); } @@ -55,7 +56,7 @@ public abstract class AbstractMemberResource<E extends Member> extends AbstractR * Convenience method. Return whether element's text range is not * null (meaning the element exists) and the specified position touches it. */ - protected boolean elementTouches(ITextRange elementTextRange, int pos) { + protected boolean elementTouches(TextRange elementTextRange, int pos) { return (elementTextRange != null) && elementTextRange.touches(pos); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java index c51023c023..aea450deb1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedColumn.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.BooleanExpressionConverter; @@ -20,8 +20,11 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.NumberIntegerExpressionConverter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; -public abstract class AbstractNamedColumn extends AbstractAnnotationResource<Member> implements NamedColumn +public abstract class AbstractNamedColumn extends AbstractAnnotationResource<Member> implements NamedColumnAnnotation { // hold this so we can get the 'name' text range private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; @@ -36,7 +39,7 @@ public abstract class AbstractNamedColumn extends AbstractAnnotationResource<Mem private String name; private String columnDefinition; - public AbstractNamedColumn(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + public AbstractNamedColumn(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.nameDeclarationAdapter = this.buildStringElementAdapter(this.nameElementName()); this.nameAdapter = this.buildShortCircuitElementAdapter(this.nameDeclarationAdapter); @@ -81,7 +84,7 @@ public abstract class AbstractNamedColumn extends AbstractAnnotationResource<Mem } public void initializeFrom(NestableAnnotation oldAnnotation) { - NamedColumn oldColumn = (NamedColumn) oldAnnotation; + NamedColumnAnnotation oldColumn = (NamedColumnAnnotation) oldAnnotation; setName(oldColumn.getName()); setColumnDefinition(oldColumn.getColumnDefinition()); } @@ -109,11 +112,11 @@ public abstract class AbstractNamedColumn extends AbstractAnnotationResource<Mem firePropertyChanged(COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nameDeclarationAdapter, astRoot); } - public ITextRange columnDefinitionTextRange(CompilationUnit astRoot) { + public TextRange columnDefinitionTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.columnDefinitionDeclarationAdapter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java index 7f38a83ed6..783e8fa66f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractNamedQuery.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -23,11 +23,18 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.IndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableQueryHint; +import org.eclipse.jpt.core.resource.java.QueryAnnotation; +import org.eclipse.jpt.core.resource.java.QueryHintAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type> - implements Query + implements QueryAnnotation { // hold this so we can get the 'name' text range private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; @@ -46,7 +53,7 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type private final List<NestableQueryHint> hints; private final HintsContainerAnnotation hintsContainerAnnotation; - protected AbstractNamedQuery(JavaResource parent, Type type,DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected AbstractNamedQuery(JavaResourceNode parent, Type type,DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, type, daa, annotationAdapter); this.nameDeclarationAdapter = nameAdapter(daa); this.queryDeclarationAdapter = queryAdapter(daa); @@ -102,8 +109,8 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type firePropertyChanged(QUERY_PROPERTY, oldQuery, newQuery); } - public ListIterator<QueryHint> hints() { - return new CloneListIterator<QueryHint>(this.hints); + public ListIterator<QueryHintAnnotation> hints() { + return new CloneListIterator<QueryHintAnnotation>(this.hints); } public int hintsSize() { @@ -114,13 +121,13 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type return this.hints.get(index); } - public int indexOfHint(QueryHint queryHint) { + public int indexOfHint(QueryHintAnnotation queryHint) { return this.hints.indexOf(queryHint); } public NestableQueryHint addHint(int index) { NestableQueryHint queryHint = (NestableQueryHint) ContainerAnnotationTools.addNestedAnnotation(index, this.hintsContainerAnnotation); - fireItemAdded(Query.HINTS_LIST, index, queryHint); + fireItemAdded(QueryAnnotation.HINTS_LIST, index, queryHint); return queryHint; } @@ -142,18 +149,18 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type public void moveHint(int targetIndex, int sourceIndex) { moveHintInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.hintsContainerAnnotation); - fireItemMoved(Query.HINTS_LIST, targetIndex, sourceIndex); + fireItemMoved(QueryAnnotation.HINTS_LIST, targetIndex, sourceIndex); } protected void moveHintInternal(int targetIndex, int sourceIndex) { CollectionTools.move(this.hints, targetIndex, sourceIndex); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nameDeclarationAdapter, astRoot); } - public ITextRange queryTextRange(CompilationUnit astRoot) { + public TextRange queryTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.queryDeclarationAdapter, astRoot); } @@ -190,7 +197,7 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type AbstractNamedQuery oldNamedQuery = (AbstractNamedQuery) oldAnnotation; setName(oldNamedQuery.getName()); setQuery(oldNamedQuery.getQuery()); - for (QueryHint queryHint : CollectionTools.iterable(oldNamedQuery.hints())) { + for (QueryHintAnnotation queryHint : CollectionTools.iterable(oldNamedQuery.hints())) { NestableQueryHint newQueryHint = addHint(oldNamedQuery.indexOfHint(queryHint)); newQueryHint.initializeFrom((NestableQueryHint) queryHint); } @@ -284,7 +291,7 @@ public abstract class AbstractNamedQuery extends AbstractAnnotationResource<Type AbstractNamedQuery.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return AbstractNamedQuery.this.textRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java index 277816a4f3..72e72099ac 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractRelationshipMappingAnnotation.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.java; import java.util.List; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -24,10 +24,14 @@ import org.eclipse.jpt.core.internal.jdtutility.JDTTools; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitArrayAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleTypeStringExpressionConverter; +import org.eclipse.jpt.core.resource.java.CascadeType; +import org.eclipse.jpt.core.resource.java.FetchType; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.RelationshipMappingAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; -public abstract class AbstractRelationshipMappingAnnotation extends AbstractAnnotationResource<Attribute> implements RelationshipMapping +public abstract class AbstractRelationshipMappingAnnotation extends AbstractAnnotationResource<Attribute> implements RelationshipMappingAnnotation { // hold this so we can get the 'targetEntity' text range private final DeclarationAnnotationElementAdapter<String> targetEntityDeclarationAdapter; @@ -52,7 +56,7 @@ public abstract class AbstractRelationshipMappingAnnotation extends AbstractAnno private CascadeType[] cascadeTypes; - public AbstractRelationshipMappingAnnotation(JavaPersistentAttributeResource parent, Attribute attribute, DeclarationAnnotationAdapter daa) { + public AbstractRelationshipMappingAnnotation(JavaResourcePersistentAttribute parent, Attribute attribute, DeclarationAnnotationAdapter daa) { super(parent, attribute, daa); this.targetEntityDeclarationAdapter = targetEntityAdapter(); this.targetEntityAdapter = buildAnnotationElementAdapter(this.targetEntityDeclarationAdapter); @@ -212,15 +216,15 @@ public abstract class AbstractRelationshipMappingAnnotation extends AbstractAnno } } - public ITextRange targetEntityTextRange(CompilationUnit astRoot) { + public TextRange targetEntityTextRange(CompilationUnit astRoot) { return elementTextRange(this.targetEntityDeclarationAdapter, astRoot); } - public ITextRange fetchTextRange(CompilationUnit astRoot) { + public TextRange fetchTextRange(CompilationUnit astRoot) { return elementTextRange(this.fetchDeclarationAdapter, astRoot); } - public ITextRange cascadeTextRange(CompilationUnit astRoot) { + public TextRange cascadeTextRange(CompilationUnit astRoot) { return elementTextRange(this.cascadeDeclarationAdapter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResource.java index bb1cfbab61..d876f0761c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractResource.java @@ -10,16 +10,17 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; +import org.eclipse.jpt.core.JpaAnnotationProvider; import org.eclipse.jpt.core.internal.jdtutility.AnnotationEditFormatter; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.utility.internal.CommandExecutorProvider; import org.eclipse.jpt.utility.internal.node.AbstractNode; import org.eclipse.jpt.utility.internal.node.Node; public abstract class AbstractResource extends AbstractNode - implements JavaResource + implements JavaResourceNode { - protected AbstractResource(JavaResource parent) { + protected AbstractResource(JavaResourceNode parent) { super(parent); } @@ -27,8 +28,8 @@ public abstract class AbstractResource extends AbstractNode // **************** overrides ********************************************** @Override - public JavaResource parent() { - return (JavaResource) super.parent(); + public JavaResourceNode parent() { + return (JavaResourceNode) super.parent(); } @Override @@ -39,7 +40,7 @@ public abstract class AbstractResource extends AbstractNode // **************** JavaResource implementation **************************** - public IJpaAnnotationProvider annotationProvider() { + public JpaAnnotationProvider annotationProvider() { return root().annotationProvider(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractTableResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractTableResource.java index f824448582..97abb42c05 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractTableResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractTableResource.java @@ -14,17 +14,23 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; +import org.eclipse.jpt.core.resource.java.TableAnnotation; +import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public abstract class AbstractTableResource extends AbstractAnnotationResource<Member> implements Table +public abstract class AbstractTableResource extends AbstractAnnotationResource<Member> implements TableAnnotation { // hold this so we can get the 'name' text range private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; @@ -51,7 +57,7 @@ public abstract class AbstractTableResource extends AbstractAnnotationResource<M private final UniqueConstraintsContainerAnnotation uniqueConstraintsContainerAnnotation; - protected AbstractTableResource(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected AbstractTableResource(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.nameDeclarationAdapter = this.nameAdapter(daa); this.schemaDeclarationAdapter = this.schemaAdapter(daa); @@ -141,7 +147,7 @@ public abstract class AbstractTableResource extends AbstractAnnotationResource<M public NestableUniqueConstraint addUniqueConstraint(int index) { NestableUniqueConstraint uniqueConstraint = (NestableUniqueConstraint) ContainerAnnotationTools.addNestedAnnotation(index, this.uniqueConstraintsContainerAnnotation); - fireItemAdded(Table.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint); + fireItemAdded(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint); return uniqueConstraint; } @@ -163,7 +169,7 @@ public abstract class AbstractTableResource extends AbstractAnnotationResource<M public void moveUniqueConstraint(int targetIndex, int sourceIndex) { moveUniqueConstraintInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.uniqueConstraintsContainerAnnotation); - fireItemMoved(Table.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex); + fireItemMoved(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex); } protected void moveUniqueConstraintInternal(int targetIndex, int sourceIndex) { @@ -172,15 +178,15 @@ public abstract class AbstractTableResource extends AbstractAnnotationResource<M protected abstract NestableUniqueConstraint createUniqueConstraint(int index); - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return elementTextRange(this.nameDeclarationAdapter, astRoot); } - public ITextRange schemaTextRange(CompilationUnit astRoot) { + public TextRange schemaTextRange(CompilationUnit astRoot) { return elementTextRange(this.schemaDeclarationAdapter, astRoot); } - public ITextRange catalogTextRange(CompilationUnit astRoot) { + public TextRange catalogTextRange(CompilationUnit astRoot) { return elementTextRange(this.catalogDeclarationAdapter, astRoot); } @@ -312,7 +318,7 @@ public abstract class AbstractTableResource extends AbstractAnnotationResource<M AbstractTableResource.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return AbstractTableResource.this.textRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java index 794eeabfbb..d28771199a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrideImpl.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.IndexedAnnotationAdapter; @@ -23,6 +23,17 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAssociationOverride; +import org.eclipse.jpt.core.resource.java.NestableJoinColumn; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -36,7 +47,7 @@ public class AssociationOverrideImpl private final JoinColumnsContainerAnnotation joinColumnsContainerAnnotation; - protected AssociationOverrideImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected AssociationOverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.joinColumns = new ArrayList<NestableJoinColumn>(); this.joinColumnsContainerAnnotation = new JoinColumnsContainerAnnotation(); @@ -49,14 +60,14 @@ public class AssociationOverrideImpl } public String getAnnotationName() { - return AssociationOverride.ANNOTATION_NAME; + return AssociationOverrideAnnotation.ANNOTATION_NAME; } @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - AssociationOverride oldAssociationOverride = (AssociationOverride) oldAnnotation; - for (JoinColumn joinColumn : CollectionTools.iterable(oldAssociationOverride.joinColumns())) { + AssociationOverrideAnnotation oldAssociationOverride = (AssociationOverrideAnnotation) oldAnnotation; + for (JoinColumnAnnotation joinColumn : CollectionTools.iterable(oldAssociationOverride.joinColumns())) { NestableJoinColumn newJoinColumn = addJoinColumn(oldAssociationOverride.indexOfJoinColumn(joinColumn)); newJoinColumn.initializeFrom((NestableAnnotation) joinColumn); } @@ -65,8 +76,8 @@ public class AssociationOverrideImpl // ************* Association implementation ******************* - public ListIterator<JoinColumn> joinColumns() { - return new CloneListIterator<JoinColumn>(this.joinColumns); + public ListIterator<JoinColumnAnnotation> joinColumns() { + return new CloneListIterator<JoinColumnAnnotation>(this.joinColumns); } public int joinColumnsSize() { @@ -77,18 +88,18 @@ public class AssociationOverrideImpl return this.joinColumns.get(index); } - public int indexOfJoinColumn(JoinColumn joinColumn) { + public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) { return this.joinColumns.indexOf(joinColumn); } public NestableJoinColumn addJoinColumn(int index) { NestableJoinColumn joinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.joinColumnsContainerAnnotation); - fireItemAdded(AssociationOverride.JOIN_COLUMNS_LIST, index, joinColumn); + fireItemAdded(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } private void addJoinColumn(int index, NestableJoinColumn joinColumn) { - addItemToList(index, joinColumn, this.joinColumns, AssociationOverride.JOIN_COLUMNS_LIST); + addItemToList(index, joinColumn, this.joinColumns, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST); } public void removeJoinColumn(int index) { @@ -99,13 +110,13 @@ public class AssociationOverrideImpl } private void removeJoinColumn(NestableJoinColumn joinColumn) { - removeItemFromList(joinColumn, this.joinColumns, AssociationOverride.JOIN_COLUMNS_LIST); + removeItemFromList(joinColumn, this.joinColumns, AssociationOverrideAnnotation.JOIN_COLUMNS_LIST); } public void moveJoinColumn(int targetIndex, int sourceIndex) { moveJoinColumnInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.joinColumnsContainerAnnotation); - fireItemMoved(AssociationOverride.JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(AssociationOverrideAnnotation.JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } protected void moveJoinColumnInternal(int targetIndex, int sourceIndex) { @@ -128,11 +139,11 @@ public class AssociationOverrideImpl // ********** static methods ********** - static AssociationOverrideImpl createAssociationOverride(JavaResource parent, Member member) { + static AssociationOverrideImpl createAssociationOverride(JavaResourceNode parent, Member member) { return new AssociationOverrideImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER)); } - static AssociationOverrideImpl createNestedAssociationOverride(JavaResource parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { + static AssociationOverrideImpl createNestedAssociationOverride(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa); return new AssociationOverrideImpl(parent, member, idaa, annotationAdapter); @@ -230,7 +241,7 @@ public class AssociationOverrideImpl AssociationOverrideImpl.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return AssociationOverrideImpl.this.textRange(astRoot); } @@ -259,16 +270,16 @@ public class AssociationOverrideImpl super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return AssociationOverrideImpl.createAssociationOverride(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } public String getAnnotationName() { - return AssociationOverride.ANNOTATION_NAME; + return AssociationOverrideAnnotation.ANNOTATION_NAME; } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java index b64986b18a..721bc69823 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverridesImpl.java @@ -17,6 +17,12 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AssociationOverrides; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAssociationOverride; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -26,7 +32,7 @@ public class AssociationOverridesImpl extends AbstractAnnotationResource<Member> protected final List<NestableAssociationOverride> associationOverrides; - protected AssociationOverridesImpl(JavaResource parent, Member member) { + protected AssociationOverridesImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.associationOverrides = new ArrayList<NestableAssociationOverride>(); } @@ -40,7 +46,7 @@ public class AssociationOverridesImpl extends AbstractAnnotationResource<Member> } public String getNestableAnnotationName() { - return AssociationOverride.ANNOTATION_NAME; + return AssociationOverrideAnnotation.ANNOTATION_NAME; } public ListIterator<NestableAssociationOverride> nestedAnnotations() { @@ -131,11 +137,11 @@ public class AssociationOverridesImpl extends AbstractAnnotationResource<Member> super(); } - public AssociationOverrides buildAnnotation(JavaPersistentResource parent, Member member) { + public AssociationOverrides buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new AssociationOverridesImpl(parent, member); } - public AssociationOverrides buildNullAnnotation(JavaPersistentResource parent, Member member) { + public AssociationOverrides buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java index 7a10ffcf88..cde699d023 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrideImpl.java @@ -19,6 +19,15 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAttributeOverride; public class AttributeOverrideImpl extends OverrideImpl @@ -31,7 +40,7 @@ public class AttributeOverrideImpl private ColumnImpl column; - protected AttributeOverrideImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected AttributeOverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.columnAdapter = new MemberAnnotationAdapter(getMember(), ColumnImpl.buildAttributeOverrideAnnotationAdapter(getDeclarationAnnotationAdapter())); } @@ -46,30 +55,30 @@ public class AttributeOverrideImpl } public String getAnnotationName() { - return AttributeOverride.ANNOTATION_NAME; + return AttributeOverrideAnnotation.ANNOTATION_NAME; } @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - AttributeOverride oldAttributeOverride = (AttributeOverride) oldAnnotation; + AttributeOverrideAnnotation oldAttributeOverride = (AttributeOverrideAnnotation) oldAnnotation; if (oldAttributeOverride.getColumn() != null) { - Column column = addColumn(); + ColumnAnnotation column = addColumn(); ((NestableAnnotation) column).initializeFrom((NestableAnnotation) oldAttributeOverride.getColumn()); } } //************ AttriubteOverride implementation **************** - public Column getNonNullColumn() { + public ColumnAnnotation getNonNullColumn() { return (getColumn() != null) ? getColumn() : new NullAttributeOverrideColumn(this); } - public Column getColumn() { + public ColumnAnnotation getColumn() { return this.column; } - public Column addColumn() { + public ColumnAnnotation addColumn() { ColumnImpl column = ColumnImpl.createAttributeOverrideColumn(this, getMember(), getDeclarationAnnotationAdapter()); column.newAnnotation(); setColumn(column); @@ -84,7 +93,7 @@ public class AttributeOverrideImpl protected void setColumn(ColumnImpl newColumn) { ColumnImpl oldColumn = this.column; this.column = newColumn; - firePropertyChanged(AttributeOverride.COLUMN_PROPERTY, oldColumn, newColumn); + firePropertyChanged(AttributeOverrideAnnotation.COLUMN_PROPERTY, oldColumn, newColumn); } @Override @@ -106,11 +115,11 @@ public class AttributeOverrideImpl } // ********** static methods ********** - static AttributeOverrideImpl createAttributeOverride(JavaResource parent, Member member) { + static AttributeOverrideImpl createAttributeOverride(JavaResourceNode parent, Member member) { return new AttributeOverrideImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER)); } - static AttributeOverrideImpl createNestedAttributeOverride(JavaResource parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { + static AttributeOverrideImpl createNestedAttributeOverride(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa); return new AttributeOverrideImpl(parent, member, idaa, annotationAdapter); @@ -139,16 +148,16 @@ public class AttributeOverrideImpl super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return AttributeOverrideImpl.createAttributeOverride(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } public String getAnnotationName() { - return AttributeOverride.ANNOTATION_NAME; + return AttributeOverrideAnnotation.ANNOTATION_NAME; } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java index edffdea856..3cd17c2b0f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverridesImpl.java @@ -17,6 +17,12 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrides; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAttributeOverride; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -26,7 +32,7 @@ public class AttributeOverridesImpl extends AbstractAnnotationResource<Member> i private final List<NestableAttributeOverride> attributesOverrides; - protected AttributeOverridesImpl(JavaResource parent, Member member) { + protected AttributeOverridesImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.attributesOverrides = new ArrayList<NestableAttributeOverride>(); } @@ -40,7 +46,7 @@ public class AttributeOverridesImpl extends AbstractAnnotationResource<Member> i } public String getNestableAnnotationName() { - return AttributeOverride.ANNOTATION_NAME; + return AttributeOverrideAnnotation.ANNOTATION_NAME; } public ListIterator<NestableAttributeOverride> nestedAnnotations() { @@ -132,11 +138,11 @@ public class AttributeOverridesImpl extends AbstractAnnotationResource<Member> i super(); } - public AttributeOverrides buildAnnotation(JavaPersistentResource parent, Member member) { + public AttributeOverrides buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new AttributeOverridesImpl(parent, member); } - public AttributeOverrides buildNullAnnotation(JavaPersistentResource parent, Member member) { + public AttributeOverrides buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java index e20e0af69a..a52582de67 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/BasicImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.BooleanExpressionConverter; @@ -21,6 +21,13 @@ import org.eclipse.jpt.core.internal.jdtutility.EnumDeclarationAnnotationElement import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.FetchType; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class BasicImpl extends AbstractAnnotationResource<Attribute> implements Basic @@ -39,7 +46,7 @@ public class BasicImpl extends AbstractAnnotationResource<Attribute> implements private FetchType fetch; - protected BasicImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected BasicImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.optionalAdapter = new ShortCircuitAnnotationElementAdapter<Boolean>(attribute, OPTIONAL_ADAPTER); this.fetchAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, FETCH_ADAPTER); @@ -77,11 +84,11 @@ public class BasicImpl extends AbstractAnnotationResource<Attribute> implements firePropertyChanged(FETCH_PROPERTY, oldFetch, newFetch); } - public ITextRange fetchTextRange(CompilationUnit astRoot) { + public TextRange fetchTextRange(CompilationUnit astRoot) { return this.elementTextRange(FETCH_ADAPTER, astRoot); } - public ITextRange optionalTextRange(CompilationUnit astRoot) { + public TextRange optionalTextRange(CompilationUnit astRoot) { return this.elementTextRange(OPTIONAL_ADAPTER, astRoot); } @@ -126,11 +133,11 @@ public class BasicImpl extends AbstractAnnotationResource<Attribute> implements super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new BasicImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new BasicImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullBasic(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java index c5f3d65a7a..dc541b4ce4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ColumnImpl.java @@ -10,15 +10,22 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.NestedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; - -public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAnnotation +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; + +public class ColumnImpl extends AbstractColumnImpl implements ColumnAnnotation, NestableAnnotation { // this adapter is only used by a Column annotation associated with a mapping annotation (e.g. Basic) public static final DeclarationAnnotationAdapter MAPPING_DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); @@ -44,7 +51,7 @@ public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAn private Integer scale; - protected ColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + protected ColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { super(parent, member, daa); this.lengthDeclarationAdapter = this.buildIntegerElementAdapter(JPA.COLUMN__LENGTH); this.lengthAdapter = this.buildShortCircuitIntegerElementAdapter(this.lengthDeclarationAdapter); @@ -109,7 +116,7 @@ public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAn @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - Column oldColumn = (Column) oldAnnotation; + ColumnAnnotation oldColumn = (ColumnAnnotation) oldAnnotation; setLength(oldColumn.getLength()); setPrecision(oldColumn.getPrecision()); setScale(oldColumn.getScale()); @@ -149,15 +156,15 @@ public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAn firePropertyChanged(SCALE_PROPERTY, oldScale, newScale); } - public ITextRange lengthTextRange(CompilationUnit astRoot) { + public TextRange lengthTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.lengthDeclarationAdapter, astRoot); } - public ITextRange precisionTextRange(CompilationUnit astRoot) { + public TextRange precisionTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.precisionDeclarationAdapter, astRoot); } - public ITextRange scaleTextRange(CompilationUnit astRoot) { + public TextRange scaleTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.scaleDeclarationAdapter, astRoot); } @@ -183,7 +190,7 @@ public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAn // ********** static methods ********** - static ColumnImpl createAttributeOverrideColumn(JavaResource parent, Member member, DeclarationAnnotationAdapter attributeOverrideAnnotationAdapter) { + static ColumnImpl createAttributeOverrideColumn(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter attributeOverrideAnnotationAdapter) { return new ColumnImpl(parent, member, buildAttributeOverrideAnnotationAdapter(attributeOverrideAnnotationAdapter)); } @@ -211,11 +218,11 @@ public class ColumnImpl extends AbstractColumnImpl implements Column, NestableAn super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new ColumnImpl(parent, member, ColumnImpl.MAPPING_DECLARATION_ANNOTATION_ADAPTER); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullColumn(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java index 3334876cc4..5085ef8dcd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotationTools.java @@ -17,6 +17,9 @@ import org.eclipse.jdt.core.dom.MemberValuePair; import org.eclipse.jdt.core.dom.NormalAnnotation; import org.eclipse.jdt.core.dom.SingleMemberAnnotation; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; public class ContainerAnnotationTools diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java index e333818c6e..b006ba2103 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumnImpl.java @@ -18,8 +18,16 @@ import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation; +import org.eclipse.jpt.core.resource.java.DiscriminatorType; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; -public class DiscriminatorColumnImpl extends AbstractNamedColumn implements DiscriminatorColumn +public class DiscriminatorColumnImpl extends AbstractNamedColumn implements DiscriminatorColumnAnnotation { public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); @@ -36,7 +44,7 @@ public class DiscriminatorColumnImpl extends AbstractNamedColumn implements Disc private Integer length; - protected DiscriminatorColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + protected DiscriminatorColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { super(parent, member, daa, new MemberAnnotationAdapter(member, daa)); this.discriminatorTypeAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, DISCRIMINATOR_TYPE_ADAPTER); this.lengthDeclarationAdapter = this.buildIntegerElementAdapter(JPA.DISCRIMINATOR_COLUMN__LENGTH); @@ -72,7 +80,7 @@ public class DiscriminatorColumnImpl extends AbstractNamedColumn implements Disc @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - DiscriminatorColumn oldColumn = (DiscriminatorColumn) oldAnnotation; + DiscriminatorColumnAnnotation oldColumn = (DiscriminatorColumnAnnotation) oldAnnotation; setLength(oldColumn.getLength()); setDiscriminatorType(oldColumn.getDiscriminatorType()); } @@ -139,11 +147,11 @@ public class DiscriminatorColumnImpl extends AbstractNamedColumn implements Disc super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new DiscriminatorColumnImpl(parent, member, DiscriminatorColumnImpl.DECLARATION_ANNOTATION_ADAPTER); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullDiscriminatorColumn(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java index f17a5c7c44..329b4948d8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValueImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -19,6 +19,12 @@ import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.DiscriminatorValue; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public class DiscriminatorValueImpl extends AbstractAnnotationResource<Type> implements DiscriminatorValue { @@ -30,7 +36,7 @@ public class DiscriminatorValueImpl extends AbstractAnnotationResource<Type> imp private String value; - protected DiscriminatorValueImpl(JavaResource parent, Type type) { + protected DiscriminatorValueImpl(JavaResourceNode parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, VALUE_ADAPTER); } @@ -54,7 +60,7 @@ public class DiscriminatorValueImpl extends AbstractAnnotationResource<Type> imp firePropertyChanged(VALUE_PROPERTY, oldValue, newValue); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_ADAPTER, astRoot); } @@ -91,11 +97,11 @@ public class DiscriminatorValueImpl extends AbstractAnnotationResource<Type> imp super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new DiscriminatorValueImpl(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullDiscriminatorValue(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java index 7cca1de655..730d9555b3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddableImpl.java @@ -14,13 +14,18 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.EmbeddableAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -public class EmbeddableImpl extends AbstractAnnotationResource<Type> implements Embeddable +public class EmbeddableImpl extends AbstractAnnotationResource<Type> implements EmbeddableAnnotation { public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected EmbeddableImpl(JavaPersistentTypeResource parent, Type type) { + protected EmbeddableImpl(JavaResourcePersistentType parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); } @@ -56,11 +61,11 @@ public class EmbeddableImpl extends AbstractAnnotationResource<Type> implements super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new EmbeddableImpl((JavaPersistentTypeResource) parent, (Type) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new EmbeddableImpl((JavaResourcePersistentType) parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java index b5db28d0ef..91e618ca67 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedIdImpl.java @@ -14,12 +14,17 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.EmbeddedId; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class EmbeddedIdImpl extends AbstractAnnotationResource<Attribute> implements EmbeddedId { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected EmbeddedIdImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected EmbeddedIdImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -55,11 +60,11 @@ public class EmbeddedIdImpl extends AbstractAnnotationResource<Attribute> implem super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new EmbeddedIdImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new EmbeddedIdImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java index ed5652c654..8806a0d883 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedImpl.java @@ -14,13 +14,18 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.Embedded; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class EmbeddedImpl extends AbstractAnnotationResource<Attribute> implements Embedded { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected EmbeddedImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected EmbeddedImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -55,11 +60,11 @@ public class EmbeddedImpl extends AbstractAnnotationResource<Attribute> implemen super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new EmbeddedImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new EmbeddedImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullEmbedded(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java index 42734c94bc..1f7d5725b1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EntityImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -19,9 +19,15 @@ import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.EntityAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -public class EntityImpl extends AbstractAnnotationResource<Type> implements Entity +public class EntityImpl extends AbstractAnnotationResource<Type> implements EntityAnnotation { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); @@ -31,7 +37,7 @@ public class EntityImpl extends AbstractAnnotationResource<Type> implements Enti private String name; - protected EntityImpl(JavaPersistentTypeResource parent, Type type) { + protected EntityImpl(JavaResourcePersistentType parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(getMember(), NAME_ADAPTER); } @@ -42,7 +48,7 @@ public class EntityImpl extends AbstractAnnotationResource<Type> implements Enti //*********** Annotation implementation **************** public String getAnnotationName() { - return Entity.ANNOTATION_NAME; + return EntityAnnotation.ANNOTATION_NAME; } //*********** Entity implementation **************** @@ -54,10 +60,10 @@ public class EntityImpl extends AbstractAnnotationResource<Type> implements Enti String oldName = this.name; this.name = newName; this.nameAdapter.setValue(newName); - firePropertyChanged(Entity.NAME_PROPERTY, oldName, newName); + firePropertyChanged(EntityAnnotation.NAME_PROPERTY, oldName, newName); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(NAME_ADAPTER, astRoot); } @@ -95,17 +101,17 @@ public class EntityImpl extends AbstractAnnotationResource<Type> implements Enti super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new EntityImpl((JavaPersistentTypeResource) parent, (Type) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new EntityImpl((JavaResourcePersistentType) parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } public String getAnnotationName() { - return Entity.ANNOTATION_NAME; + return EntityAnnotation.ANNOTATION_NAME; } } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java index b232e5b769..7777ada03d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumeratedImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -19,6 +19,13 @@ import org.eclipse.jpt.core.internal.jdtutility.EnumDeclarationAnnotationElement import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.EnumType; +import org.eclipse.jpt.core.resource.java.Enumerated; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public class EnumeratedImpl extends AbstractAnnotationResource<Attribute> implements Enumerated { @@ -30,7 +37,7 @@ public class EnumeratedImpl extends AbstractAnnotationResource<Attribute> implem private EnumType value; - protected EnumeratedImpl(JavaResource parent, Attribute attribute) { + protected EnumeratedImpl(JavaResourceNode parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, VALUE_ADAPTER); } @@ -54,7 +61,7 @@ public class EnumeratedImpl extends AbstractAnnotationResource<Attribute> implem firePropertyChanged(VALUE_PROPERTY, oldValue, newValue); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_ADAPTER, astRoot); } @@ -90,11 +97,11 @@ public class EnumeratedImpl extends AbstractAnnotationResource<Attribute> implem super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new EnumeratedImpl(parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullEnumerated(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java index ddf961c8fc..f00f26ad0c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValueImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -19,8 +19,15 @@ import org.eclipse.jpt.core.internal.jdtutility.EnumDeclarationAnnotationElement import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; - -public class GeneratedValueImpl extends AbstractAnnotationResource<Member> implements GeneratedValue +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.GeneratedValueAnnotation; +import org.eclipse.jpt.core.resource.java.GenerationType; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; + +public class GeneratedValueImpl extends AbstractAnnotationResource<Member> implements GeneratedValueAnnotation { private final AnnotationElementAdapter<String> strategyAdapter; @@ -37,7 +44,7 @@ public class GeneratedValueImpl extends AbstractAnnotationResource<Member> imple private String generator; - protected GeneratedValueImpl(JavaResource parent, Member member) { + protected GeneratedValueImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.strategyAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, STRATEGY_ADAPTER); this.generatorAdapter = new ShortCircuitAnnotationElementAdapter<String>(member, GENERATOR_ADAPTER); @@ -74,11 +81,11 @@ public class GeneratedValueImpl extends AbstractAnnotationResource<Member> imple firePropertyChanged(GENERATOR_PROPERTY, oldGenerator, newGenerator); } - public ITextRange strategyTextRange(CompilationUnit astRoot) { + public TextRange strategyTextRange(CompilationUnit astRoot) { return this.elementTextRange(STRATEGY_ADAPTER, astRoot); } - public ITextRange generatorTextRange(CompilationUnit astRoot) { + public TextRange generatorTextRange(CompilationUnit astRoot) { return this.elementTextRange(GENERATOR_ADAPTER, astRoot); } @@ -124,11 +131,11 @@ public class GeneratedValueImpl extends AbstractAnnotationResource<Member> imple super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new GeneratedValueImpl(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java index e8221904ef..d6fbf5c6af 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratorImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -18,8 +18,10 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.NumberIntegerExpressionConverter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; +import org.eclipse.jpt.core.resource.java.GeneratorAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; -public abstract class GeneratorImpl extends AbstractAnnotationResource<Member> implements Generator +public abstract class GeneratorImpl extends AbstractAnnotationResource<Member> implements GeneratorAnnotation { // hold this so we can get the 'name' text range private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; @@ -42,7 +44,7 @@ public abstract class GeneratorImpl extends AbstractAnnotationResource<Member> i private Integer allocationSize; - public GeneratorImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + public GeneratorImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { super(parent, member, daa); this.nameDeclarationAdapter = this.nameAdapter(); this.nameAdapter = this.buildAdapter(this.nameDeclarationAdapter); @@ -110,15 +112,15 @@ public abstract class GeneratorImpl extends AbstractAnnotationResource<Member> i firePropertyChanged(NAME_PROPERTY, oldName, newName); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nameDeclarationAdapter, astRoot); } - public ITextRange initialValueTextRange(CompilationUnit astRoot) { + public TextRange initialValueTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.initialValueDeclarationAdapter, astRoot); } - public ITextRange allocationSizeTextRange(CompilationUnit astRoot) { + public TextRange allocationSizeTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.allocationSizeDeclarationAdapter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java index 8b56fe0369..ce0105ac98 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClassImpl.java @@ -1,7 +1,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -12,6 +12,12 @@ import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAda import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleTypeStringExpressionConverter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.IdClass; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public class IdClassImpl extends AbstractAnnotationResource<Type> implements IdClass { @@ -25,7 +31,7 @@ public class IdClassImpl extends AbstractAnnotationResource<Type> implements IdC private String fullyQualifiedValue; - public IdClassImpl(JavaResource parent, Type type) { + public IdClassImpl(JavaResourceNode parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, VALUE_ADAPTER); } @@ -60,7 +66,7 @@ public class IdClassImpl extends AbstractAnnotationResource<Type> implements IdC firePropertyChanged(IdClass.FULLY_QUALIFIED_CLASS_PROPERTY, oldQualifiedClass, newQualifiedClass); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_ADAPTER, astRoot); } @@ -105,11 +111,11 @@ public class IdClassImpl extends AbstractAnnotationResource<Type> implements IdC super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new IdClassImpl(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java index 021d21b565..3ee833ae4c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdImpl.java @@ -14,13 +14,18 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.Id; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class IdImpl extends AbstractAnnotationResource<Attribute> implements Id { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected IdImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected IdImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -55,11 +60,11 @@ public class IdImpl extends AbstractAnnotationResource<Attribute> implements Id super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new IdImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new IdImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java index 23d1e78761..00a9effa88 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; @@ -19,6 +19,13 @@ import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.Inheritance; +import org.eclipse.jpt.core.resource.java.InheritanceType; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; public class InheritanceImpl extends AbstractAnnotationResource<Type> implements Inheritance { @@ -29,7 +36,7 @@ public class InheritanceImpl extends AbstractAnnotationResource<Type> implements private InheritanceType strategy; - protected InheritanceImpl(JavaResource parent, Type type) { + protected InheritanceImpl(JavaResourceNode parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.strategyAdapter = new ShortCircuitAnnotationElementAdapter<String>(type, STRATEGY_ADAPTER); } @@ -53,7 +60,7 @@ public class InheritanceImpl extends AbstractAnnotationResource<Type> implements firePropertyChanged(STRATEGY_PROPERTY, oldStrategy, newStrategy); } - public ITextRange strategyTextRange(CompilationUnit astRoot) { + public TextRange strategyTextRange(CompilationUnit astRoot) { return this.elementTextRange(STRATEGY_ADAPTER, astRoot); } @@ -89,11 +96,11 @@ public class InheritanceImpl extends AbstractAnnotationResource<Type> implements super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new InheritanceImpl(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullInheritance(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResourceImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResourceImpl.java index c26964129e..c6c2b278c5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResourceImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResourceImpl.java @@ -19,11 +19,15 @@ import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.IVariableBinding; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.JPTTools; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; public class JavaPersistentAttributeResourceImpl extends AbstractJavaPersistentResource<Attribute> - implements JavaPersistentAttributeResource + implements JavaResourcePersistentAttribute { private boolean typeIsBasic; @@ -36,7 +40,7 @@ public class JavaPersistentAttributeResourceImpl private String qualifiedReferenceEntityElementTypeName; - public JavaPersistentAttributeResourceImpl(JavaPersistentTypeResource parent, Attribute attribute){ + public JavaPersistentAttributeResourceImpl(JavaResourcePersistentType parent, Attribute attribute){ super(parent, attribute); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResourceImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResourceImpl.java index 8c886f2c07..e7dfb171a1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResourceImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResourceImpl.java @@ -26,19 +26,25 @@ import org.eclipse.jpt.core.internal.jdtutility.FieldAttribute; import org.eclipse.jpt.core.internal.jdtutility.JPTTools; import org.eclipse.jpt.core.internal.jdtutility.MethodAttribute; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.AccessType; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.CommandExecutorProvider; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; -public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResource<Type> implements JavaPersistentTypeResource +public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResource<Type> implements JavaResourcePersistentType { /** * store all member types including those that aren't persistable so we can include validation errors. */ - private final Collection<JavaPersistentTypeResource> nestedTypes; + private final Collection<JavaResourcePersistentType> nestedTypes; - private final Collection<JavaPersistentAttributeResource> attributes; + private final Collection<JavaResourcePersistentAttribute> attributes; private AccessType accessType; @@ -50,10 +56,10 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour private boolean isAbstract; - public JavaPersistentTypeResourceImpl(JavaResource parent, Type type){ + public JavaPersistentTypeResourceImpl(JavaResourceNode parent, Type type){ super(parent, type); - this.nestedTypes = new ArrayList<JavaPersistentTypeResource>(); - this.attributes = new ArrayList<JavaPersistentAttributeResource>(); + this.nestedTypes = new ArrayList<JavaResourcePersistentType>(); + this.attributes = new ArrayList<JavaResourcePersistentAttribute>(); } @Override @@ -149,11 +155,11 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour // ******** JavaPersistentTypeResource implementation ******** - public JavaPersistentTypeResource javaPersistentTypeResource(String fullyQualifiedTypeName) { + public JavaResourcePersistentType javaPersistentTypeResource(String fullyQualifiedTypeName) { if (getQualifiedName().equals(fullyQualifiedTypeName)) { return this; } - for (JavaPersistentTypeResource jptr : CollectionTools.iterable(nestedTypes())) { + for (JavaResourcePersistentType jptr : CollectionTools.iterable(nestedTypes())) { if (jptr.getQualifiedName().equals(fullyQualifiedTypeName)) { return jptr; } @@ -161,19 +167,19 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour return null; } - public Iterator<JavaPersistentTypeResource> nestedTypes() { + public Iterator<JavaResourcePersistentType> nestedTypes() { //TODO since we are filtering how do we handle the case where a type becomes persistable? //what kind of change notificiation for that case? - return new FilteringIterator<JavaPersistentTypeResource, JavaPersistentTypeResource>(new CloneIterator<JavaPersistentTypeResource>(this.nestedTypes)) { + return new FilteringIterator<JavaResourcePersistentType, JavaResourcePersistentType>(new CloneIterator<JavaResourcePersistentType>(this.nestedTypes)) { @Override - protected boolean accept(JavaPersistentTypeResource o) { + protected boolean accept(JavaResourcePersistentType o) { return o.isPersistable(); } }; } - protected JavaPersistentTypeResource nestedTypeFor(IType type) { - for (JavaPersistentTypeResource nestedType : this.nestedTypes) { + protected JavaResourcePersistentType nestedTypeFor(IType type) { + for (JavaResourcePersistentType nestedType : this.nestedTypes) { if (nestedType.isFor(type)) { return nestedType; } @@ -181,26 +187,26 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour return null; } - protected JavaPersistentTypeResource addNestedType(IType nestedType, CompilationUnit astRoot) { - JavaPersistentTypeResource persistentType = createJavaPersistentType(nestedType, astRoot); + protected JavaResourcePersistentType addNestedType(IType nestedType, CompilationUnit astRoot) { + JavaResourcePersistentType persistentType = createJavaPersistentType(nestedType, astRoot); addNestedType(persistentType); return persistentType; } - protected void addNestedType(JavaPersistentTypeResource nestedType) { + protected void addNestedType(JavaResourcePersistentType nestedType) { addItemToCollection(nestedType, this.nestedTypes, NESTED_TYPES_COLLECTION); } - protected void removeNestedType(JavaPersistentTypeResource nestedType) { + protected void removeNestedType(JavaResourcePersistentType nestedType) { removeItemFromCollection(nestedType, this.nestedTypes, NESTED_TYPES_COLLECTION); } - protected JavaPersistentTypeResource createJavaPersistentType(IType nestedType, CompilationUnit astRoot) { + protected JavaResourcePersistentType createJavaPersistentType(IType nestedType, CompilationUnit astRoot) { return createJavaPersistentType(this, nestedType, modifySharedDocumentCommandExecutorProvider(), annotationEditFormatter(), astRoot); } - public static JavaPersistentTypeResource createJavaPersistentType( - JavaResource parent, + public static JavaResourcePersistentType createJavaPersistentType( + JavaResourceNode parent, IType nestedType, CommandExecutorProvider modifySharedDocumentCommandExecutorProvider, AnnotationEditFormatter annotationEditFormatter, @@ -212,46 +218,46 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour return javaPersistentType; } - public Iterator<JavaPersistentAttributeResource> attributes() { + public Iterator<JavaResourcePersistentAttribute> attributes() { //TODO since we are filtering how do we handle the case where an attribute becomes persistable? //what kind of change notificiation for that case? - return new FilteringIterator<JavaPersistentAttributeResource, JavaPersistentAttributeResource>(new CloneIterator<JavaPersistentAttributeResource>(this.attributes)) { + return new FilteringIterator<JavaResourcePersistentAttribute, JavaResourcePersistentAttribute>(new CloneIterator<JavaResourcePersistentAttribute>(this.attributes)) { @Override - protected boolean accept(JavaPersistentAttributeResource o) { + protected boolean accept(JavaResourcePersistentAttribute o) { return o.isPersistable(); } }; } - public Iterator<JavaPersistentAttributeResource> fields() { - return new FilteringIterator<JavaPersistentAttributeResource, JavaPersistentAttributeResource>(attributes()) { + public Iterator<JavaResourcePersistentAttribute> fields() { + return new FilteringIterator<JavaResourcePersistentAttribute, JavaResourcePersistentAttribute>(attributes()) { @Override - protected boolean accept(JavaPersistentAttributeResource o) { + protected boolean accept(JavaResourcePersistentAttribute o) { return o.isForField(); } }; } - public Iterator<JavaPersistentAttributeResource> properties() { - return new FilteringIterator<JavaPersistentAttributeResource, JavaPersistentAttributeResource>(attributes()) { + public Iterator<JavaResourcePersistentAttribute> properties() { + return new FilteringIterator<JavaResourcePersistentAttribute, JavaResourcePersistentAttribute>(attributes()) { @Override - protected boolean accept(JavaPersistentAttributeResource o) { + protected boolean accept(JavaResourcePersistentAttribute o) { return o.isForProperty(); } }; } - protected JavaPersistentAttributeResource addAttribute(IMember jdtMember, CompilationUnit astRoot) { - JavaPersistentAttributeResource persistentAttribute = createJavaPersistentAttribute(jdtMember, astRoot); + protected JavaResourcePersistentAttribute addAttribute(IMember jdtMember, CompilationUnit astRoot) { + JavaResourcePersistentAttribute persistentAttribute = createJavaPersistentAttribute(jdtMember, astRoot); addAttribute(persistentAttribute); return persistentAttribute; } - protected void addAttribute(JavaPersistentAttributeResource attribute) { + protected void addAttribute(JavaResourcePersistentAttribute attribute) { addItemToCollection(attribute, this.attributes, ATTRIBUTES_COLLECTION); } - protected JavaPersistentAttributeResource createJavaPersistentAttribute(IMember member, CompilationUnit astRoot) { + protected JavaResourcePersistentAttribute createJavaPersistentAttribute(IMember member, CompilationUnit astRoot) { Attribute attribute = null; if (member instanceof IField) { attribute = new FieldAttribute((IField) member, this.modifySharedDocumentCommandExecutorProvider(), this.annotationEditFormatter()); @@ -262,17 +268,17 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour else { throw new IllegalArgumentException(); } - JavaPersistentAttributeResource javaPersistentAttribute = new JavaPersistentAttributeResourceImpl(this, attribute); + JavaResourcePersistentAttribute javaPersistentAttribute = new JavaPersistentAttributeResourceImpl(this, attribute); javaPersistentAttribute.initialize(astRoot); return javaPersistentAttribute; } - protected void removeAttribute(JavaPersistentAttributeResource attribute) { + protected void removeAttribute(JavaResourcePersistentAttribute attribute) { removeItemFromCollection(attribute, this.attributes, ATTRIBUTES_COLLECTION); } - protected JavaPersistentAttributeResource attributeFor(IMember member) { - for (JavaPersistentAttributeResource persistentAttribute : this.attributes) { + protected JavaResourcePersistentAttribute attributeFor(IMember member) { + for (JavaResourcePersistentAttribute persistentAttribute : this.attributes) { if (persistentAttribute.isFor(member)) { return persistentAttribute; } @@ -353,10 +359,10 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour super.resolveTypes(astRoot); this.setSuperClassQualifiedName(this.superClassQualifiedName(astRoot)); - for (JavaPersistentAttributeResource attribute : this.attributes) { + for (JavaResourcePersistentAttribute attribute : this.attributes) { attribute.resolveTypes(astRoot); } - for (JavaPersistentTypeResource persistentType : this.nestedTypes) { + for (JavaResourcePersistentType persistentType : this.nestedTypes) { persistentType.resolveTypes(astRoot); } } @@ -376,9 +382,9 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour protected void updateNestedTypes(CompilationUnit astRoot) { IType[] declaredTypes = getMember().declaredTypes(); - List<JavaPersistentTypeResource> nestedTypesToRemove = new ArrayList<JavaPersistentTypeResource>(this.nestedTypes); + List<JavaResourcePersistentType> nestedTypesToRemove = new ArrayList<JavaResourcePersistentType>(this.nestedTypes); for (IType declaredType : declaredTypes) { - JavaPersistentTypeResource nestedType = nestedTypeFor(declaredType); + JavaResourcePersistentType nestedType = nestedTypeFor(declaredType); if (nestedType == null) { nestedType = addNestedType(declaredType, astRoot); } @@ -387,31 +393,31 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour } nestedType.updateFromJava(astRoot); } - for (JavaPersistentTypeResource nestedType : nestedTypesToRemove) { + for (JavaResourcePersistentType nestedType : nestedTypesToRemove) { removeNestedType(nestedType); } } protected void updatePersistentAttributes(CompilationUnit astRoot) { - List<JavaPersistentAttributeResource> persistentAttributesToRemove = new ArrayList<JavaPersistentAttributeResource>(this.attributes); + List<JavaResourcePersistentAttribute> persistentAttributesToRemove = new ArrayList<JavaResourcePersistentAttribute>(this.attributes); updatePersistentFields(astRoot, persistentAttributesToRemove); updatePersistentProperties(astRoot, persistentAttributesToRemove); - for (JavaPersistentAttributeResource persistentAttribute : persistentAttributesToRemove) { + for (JavaResourcePersistentAttribute persistentAttribute : persistentAttributesToRemove) { removeAttribute(persistentAttribute); } } - protected void updatePersistentFields(CompilationUnit astRoot, List<JavaPersistentAttributeResource> persistentAttributesToRemove) { + protected void updatePersistentFields(CompilationUnit astRoot, List<JavaResourcePersistentAttribute> persistentAttributesToRemove) { updatePersistentAttributes(astRoot, persistentAttributesToRemove, getMember().fields()); } - protected void updatePersistentProperties(CompilationUnit astRoot, List<JavaPersistentAttributeResource> persistentAttributesToRemove) { + protected void updatePersistentProperties(CompilationUnit astRoot, List<JavaResourcePersistentAttribute> persistentAttributesToRemove) { updatePersistentAttributes(astRoot, persistentAttributesToRemove, getMember().methods()); } - protected void updatePersistentAttributes(CompilationUnit astRoot, List<JavaPersistentAttributeResource> persistentAttributesToRemove, IMember[] members) { + protected void updatePersistentAttributes(CompilationUnit astRoot, List<JavaResourcePersistentAttribute> persistentAttributesToRemove, IMember[] members) { for (IMember member : members) { - JavaPersistentAttributeResource persistentAttribute = attributeFor(member); + JavaResourcePersistentAttribute persistentAttribute = attributeFor(member); if (persistentAttribute == null) { persistentAttribute = addAttribute(member, astRoot); } @@ -423,7 +429,7 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour } public boolean hasAnyAttributeAnnotations() { - for (JavaPersistentAttributeResource attribute : CollectionTools.iterable(attributes())) { + for (JavaResourcePersistentAttribute attribute : CollectionTools.iterable(attributes())) { if (attribute.hasAnyAnnotation()) { return true; } @@ -444,14 +450,14 @@ public class JavaPersistentTypeResourceImpl extends AbstractJavaPersistentResour private AccessType calculateAccessType() { boolean hasPersistableFields = false; boolean hasPersistableProperties = false; - for (JavaPersistentAttributeResource field : CollectionTools.iterable(fields())) { + for (JavaResourcePersistentAttribute field : CollectionTools.iterable(fields())) { hasPersistableFields = true; if (field.hasAnyAnnotation()) { // any field is annotated => FIELD return AccessType.FIELD; } } - for (JavaPersistentAttributeResource property : CollectionTools.iterable(properties())) { + for (JavaResourcePersistentAttribute property : CollectionTools.iterable(properties())) { hasPersistableProperties = true; if (property.hasAnyAnnotation()) { // none of the fields are annotated and a getter is annotated => PROPERTY diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java index 9d6553effc..2870b120b1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java @@ -15,9 +15,9 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaElementDelta; +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.ResourceModelListener; import org.eclipse.jpt.core.internal.AbstractResourceModel; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.IResourceModelListener; import org.eclipse.jpt.core.internal.jdtutility.AnnotationEditFormatter; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; import org.eclipse.jpt.utility.internal.BitTools; @@ -26,17 +26,17 @@ import org.eclipse.jpt.utility.internal.CommandExecutorProvider; public class JavaResourceModel extends AbstractResourceModel { - private final Collection<IResourceModelListener> resourceModelListeners; + private final Collection<ResourceModelListener> resourceModelListeners; private final JpaCompilationUnitResource compilationUnitResource; public JavaResourceModel( - IFile file, IJpaAnnotationProvider annotationProvider, + IFile file, JpaAnnotationProvider annotationProvider, CommandExecutorProvider modifySharedDocumentCommandExecutorProvider, AnnotationEditFormatter annotationEditFormatter) { super(); - this.resourceModelListeners = new ArrayList<IResourceModelListener>(); + this.resourceModelListeners = new ArrayList<ResourceModelListener>(); this.compilationUnitResource = new JpaCompilationUnitResource(file, annotationProvider, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter, this); } @@ -50,7 +50,7 @@ public class JavaResourceModel return this.compilationUnitResource; } - public void addResourceModelChangeListener(IResourceModelListener listener) { + public void addResourceModelChangeListener(ResourceModelListener listener) { if (listener == null) { throw new IllegalArgumentException("Listener cannot be null"); } @@ -60,7 +60,7 @@ public class JavaResourceModel this.resourceModelListeners.add(listener); } - public void removeResourceModelChangeListener(IResourceModelListener listener) { + public void removeResourceModelChangeListener(ResourceModelListener listener) { if (!this.resourceModelListeners.contains(listener)) { throw new IllegalArgumentException("Listener " + listener + " was never added"); } @@ -71,7 +71,7 @@ public class JavaResourceModel if (resource() == null) { throw new IllegalStateException("Change events should not be fired during construction"); } - for (IResourceModelListener listener : this.resourceModelListeners) { + for (ResourceModelListener listener : this.resourceModelListeners) { listener.resourceModelChanged(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java index a6a2179503..db9cc8c9ba 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -22,6 +22,14 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableJoinColumn; public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinColumn { @@ -34,17 +42,17 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo private String referencedColumnName; - public JoinColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + public JoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.referencedColumnNameDeclarationAdapter = this.buildStringElementAdapter(JPA.JOIN_COLUMN__REFERENCED_COLUMN_NAME); this.referencedColumnNameAdapter = this.buildShortCircuitElementAdapter(this.referencedColumnNameDeclarationAdapter); } - public JoinColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + public JoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { this(parent, member, daa, new MemberAnnotationAdapter(member, daa)); } - public JoinColumnImpl(JavaResource parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { + public JoinColumnImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { this(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa)); } @@ -104,7 +112,7 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - JoinColumn oldColumn = (JoinColumn) oldAnnotation; + JoinColumnAnnotation oldColumn = (JoinColumnAnnotation) oldAnnotation; setReferencedColumnName(oldColumn.getReferencedColumnName()); } @@ -120,7 +128,7 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo firePropertyChanged(REFERENCED_COLUMN_NAME_PROPERTY, oldReferencedColumnName, newReferencedColumnName); } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.referencedColumnNameDeclarationAdapter, astRoot); } @@ -140,11 +148,11 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo // ********** static methods ********** - static JoinColumnImpl createJoinColumn(JavaResource parent, Member member) { + static JoinColumnImpl createJoinColumn(JavaResourceNode parent, Member member) { return new JoinColumnImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER); } - static JoinColumnImpl createNestedJoinColumn(JavaResource parent, Member member, int index, DeclarationAnnotationAdapter joinColumnsAdapter) { + static JoinColumnImpl createNestedJoinColumn(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter joinColumnsAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, joinColumnsAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa); return new JoinColumnImpl(parent, member, idaa, annotationAdapter); @@ -153,7 +161,7 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo private static IndexedDeclarationAnnotationAdapter buildNestedDeclarationAnnotationAdapter(int index, DeclarationAnnotationAdapter joinColumnsAdapter) { return new NestedIndexedDeclarationAnnotationAdapter(joinColumnsAdapter, index, JPA.JOIN_COLUMN); } - static NestableJoinColumn createJoinTableJoinColumn(JavaResource parent, Member member, int index) { + static NestableJoinColumn createJoinTableJoinColumn(JavaResourceNode parent, Member member, int index) { return new JoinColumnImpl(parent, member, buildJoinTableAnnotationAdapter(index)); } @@ -161,7 +169,7 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo return new NestedIndexedDeclarationAnnotationAdapter(JoinTableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__JOIN_COLUMNS, index, JPA.JOIN_COLUMN); } - static NestableJoinColumn createJoinTableInverseJoinColumn(JavaResource parent, Member member, int index) { + static NestableJoinColumn createJoinTableInverseJoinColumn(JavaResourceNode parent, Member member, int index) { return new JoinColumnImpl(parent, member, buildJoinTableInverseAnnotationAdapter(index)); } @@ -170,7 +178,7 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo } - static NestableJoinColumn createAssociationOverrideJoinColumn(DeclarationAnnotationAdapter associationOverrideAdapter, JavaResource parent, Member member, int index) { + static NestableJoinColumn createAssociationOverrideJoinColumn(DeclarationAnnotationAdapter associationOverrideAdapter, JavaResourceNode parent, Member member, int index) { return new JoinColumnImpl(parent, member, buildAssociationOverrideAnnotationAdapter(associationOverrideAdapter, index)); } @@ -199,11 +207,11 @@ public class JoinColumnImpl extends AbstractColumnImpl implements NestableJoinCo super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return JoinColumnImpl.createJoinColumn(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java index 646af96df7..b9b5b5d35f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumnsImpl.java @@ -17,6 +17,12 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JoinColumns; +import org.eclipse.jpt.core.resource.java.NestableJoinColumn; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -27,7 +33,7 @@ public class JoinColumnsImpl extends AbstractAnnotationResource<Member> implemen private List<NestableJoinColumn> joinColumns; - protected JoinColumnsImpl(JavaResource parent, Member member) { + protected JoinColumnsImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.joinColumns = new ArrayList<NestableJoinColumn>(); } @@ -41,7 +47,7 @@ public class JoinColumnsImpl extends AbstractAnnotationResource<Member> implemen } public String getNestableAnnotationName() { - return JoinColumn.ANNOTATION_NAME; + return JoinColumnAnnotation.ANNOTATION_NAME; } public ListIterator<NestableJoinColumn> nestedAnnotations() { @@ -134,11 +140,11 @@ public class JoinColumnsImpl extends AbstractAnnotationResource<Member> implemen super(); } - public JoinColumns buildAnnotation(JavaPersistentResource parent, Member member) { + public JoinColumns buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new JoinColumnsImpl(parent, member); } - public JoinColumns buildNullAnnotation(JavaPersistentResource parent, Member member) { + public JoinColumns buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java index 83ab0a803b..242d58ebb1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTableImpl.java @@ -13,19 +13,29 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableJoinColumn; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class JoinTableImpl extends AbstractTableResource implements JoinTable +public class JoinTableImpl extends AbstractTableResource implements JoinTableAnnotation { - public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(JoinTable.ANNOTATION_NAME); + public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(JoinTableAnnotation.ANNOTATION_NAME); private static final DeclarationAnnotationElementAdapter<String> NAME_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__NAME); @@ -41,7 +51,7 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable private final InverseJoinColumnsContainerAnnotation inverseJoinColumnsContainerAnnotation; - protected JoinTableImpl(JavaResource parent, Member member) { + protected JoinTableImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER)); this.joinColumns = new ArrayList<NestableJoinColumn>(); this.inverseJoinColumns = new ArrayList<NestableJoinColumn>(); @@ -57,7 +67,7 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable } public String getAnnotationName() { - return JoinTable.ANNOTATION_NAME; + return JoinTableAnnotation.ANNOTATION_NAME; } @Override @@ -98,8 +108,8 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable ContainerAnnotationTools.updateNestedAnnotationsFromJava(astRoot, this.inverseJoinColumnsContainerAnnotation); } - public ListIterator<JoinColumn> joinColumns() { - return new CloneListIterator<JoinColumn>(this.joinColumns); + public ListIterator<JoinColumnAnnotation> joinColumns() { + return new CloneListIterator<JoinColumnAnnotation>(this.joinColumns); } public int joinColumnsSize() { @@ -110,13 +120,13 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable return this.joinColumns.get(index); } - public int indexOfJoinColumn(JoinColumn joinColumn) { + public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) { return this.joinColumns.indexOf(joinColumn); } - public JoinColumn addJoinColumn(int index) { + public JoinColumnAnnotation addJoinColumn(int index) { NestableJoinColumn joinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.joinColumnsContainerAnnotation); - fireItemAdded(JoinTable.JOIN_COLUMNS_LIST, index, joinColumn); + fireItemAdded(JoinTableAnnotation.JOIN_COLUMNS_LIST, index, joinColumn); return joinColumn; } @@ -138,15 +148,15 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable public void moveJoinColumn(int targetIndex, int sourceIndex) { moveJoinColumnInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.joinColumnsContainerAnnotation); - fireItemMoved(JoinTable.JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTableAnnotation.JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } protected void moveJoinColumnInternal(int targetIndex, int sourceIndex) { CollectionTools.move(this.joinColumns, targetIndex, sourceIndex); } - public ListIterator<JoinColumn> inverseJoinColumns() { - return new CloneListIterator<JoinColumn>(this.inverseJoinColumns); + public ListIterator<JoinColumnAnnotation> inverseJoinColumns() { + return new CloneListIterator<JoinColumnAnnotation>(this.inverseJoinColumns); } public int inverseJoinColumnsSize() { @@ -157,13 +167,13 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable return this.inverseJoinColumns.get(index); } - public int indexOfInverseJoinColumn(JoinColumn joinColumn) { + public int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn) { return this.inverseJoinColumns.indexOf(joinColumn); } - public JoinColumn addInverseJoinColumn(int index) { + public JoinColumnAnnotation addInverseJoinColumn(int index) { NestableJoinColumn inverseJoinColumn = (NestableJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.inverseJoinColumnsContainerAnnotation); - fireItemAdded(JoinTable.INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn); + fireItemAdded(JoinTableAnnotation.INVERSE_JOIN_COLUMNS_LIST, index, inverseJoinColumn); return inverseJoinColumn; } @@ -185,7 +195,7 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable public void moveInverseJoinColumn(int targetIndex, int sourceIndex) { moveInverseJoinColumnInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.inverseJoinColumnsContainerAnnotation); - fireItemMoved(JoinTable.INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(JoinTableAnnotation.INVERSE_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } protected void moveInverseJoinColumnInternal(int targetIndex, int sourceIndex) { @@ -340,7 +350,7 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable JoinTableImpl.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return JoinTableImpl.this.textRange(astRoot); } } @@ -363,16 +373,16 @@ public class JoinTableImpl extends AbstractTableResource implements JoinTable super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new JoinTableImpl(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullJoinTable(parent); } public String getAnnotationName() { - return JoinTable.ANNOTATION_NAME; + return JoinTableAnnotation.ANNOTATION_NAME; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitResource.java index 522ffe59ea..95d2dc3f8a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JpaCompilationUnitResource.java @@ -15,16 +15,18 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationEditFormatter; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; import org.eclipse.jpt.utility.internal.CommandExecutorProvider; import org.eclipse.jpt.utility.internal.node.Node; -public class JpaCompilationUnitResource extends AbstractResource implements JavaResource +public class JpaCompilationUnitResource extends AbstractResource implements JavaResourceNode { - protected final IJpaAnnotationProvider annotationProvider; + protected final JpaAnnotationProvider annotationProvider; protected final CommandExecutorProvider modifySharedDocumentCommandExecutorProvider; @@ -38,14 +40,14 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java * a public/protected no-arg constructor and there is no way to access * it in a non-public/protected class. */ - protected JavaPersistentTypeResource persistentType; + protected JavaResourcePersistentType persistentType; public static final String PERSISTENT_TYPE_PROPERTY = "persistentTypeProperty"; protected final JavaResourceModel javaResourceModel; public JpaCompilationUnitResource( IFile file, - IJpaAnnotationProvider annotationProvider, + JpaAnnotationProvider annotationProvider, CommandExecutorProvider modifySharedDocumentCommandExecutorProvider, AnnotationEditFormatter annotationEditFormatter, JavaResourceModel javaResourceModel) { @@ -93,7 +95,7 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java } @Override - public IJpaAnnotationProvider annotationProvider() { + public JpaAnnotationProvider annotationProvider() { return this.annotationProvider; } @@ -119,7 +121,7 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java return this.compilationUnit; } - public JavaPersistentTypeResource javaPersistentTypeResource(String fullyQualifiedTypeName) { + public JavaResourcePersistentType javaPersistentTypeResource(String fullyQualifiedTypeName) { return getPersistentType().javaPersistentTypeResource(fullyQualifiedTypeName); } @@ -127,7 +129,7 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java * The persistentType resource for the compilation unit's primary type. * Will be null if the primary type is null. */ - public JavaPersistentTypeResource getPersistentType() { + public JavaResourcePersistentType getPersistentType() { return this.persistentType; //TODO should i only be returning this if it returns true to isPersistable? //that's how we handle nestedTypes on JavaPersistentTypeResource @@ -138,13 +140,13 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java // return null; } - protected void setPersistentType(JavaPersistentTypeResource newPersistentType) { - JavaPersistentTypeResource oldPersistentType = this.persistentType; + protected void setPersistentType(JavaResourcePersistentType newPersistentType) { + JavaResourcePersistentType oldPersistentType = this.persistentType; this.persistentType = newPersistentType; firePropertyChanged(PERSISTENT_TYPE_PROPERTY, oldPersistentType, newPersistentType); } - private JavaPersistentTypeResource createJavaPersistentType(IType iType, CompilationUnit astRoot) { + private JavaResourcePersistentType createJavaPersistentType(IType iType, CompilationUnit astRoot) { return JavaPersistentTypeResourceImpl.createJavaPersistentType(this, iType, @@ -169,7 +171,7 @@ public class JpaCompilationUnitResource extends AbstractResource implements Java } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null;//this.selectionTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java index 1a910eca13..ebf04ab0f3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/LobImpl.java @@ -14,12 +14,17 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.Lob; public class LobImpl extends AbstractAnnotationResource<Attribute> implements Lob { public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected LobImpl(JavaResource parent, Attribute attribute) { + protected LobImpl(JavaResourceNode parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -55,11 +60,11 @@ public class LobImpl extends AbstractAnnotationResource<Attribute> implements Lo super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new LobImpl(parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java index a0cfc4be9c..3f2ad484bd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToManyImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -18,6 +18,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.ManyToMany; public class ManyToManyImpl extends AbstractRelationshipMappingAnnotation implements ManyToMany @@ -36,7 +42,7 @@ public class ManyToManyImpl extends AbstractRelationshipMappingAnnotation implem private String mappedBy; - protected ManyToManyImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected ManyToManyImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER); } @@ -93,7 +99,7 @@ public class ManyToManyImpl extends AbstractRelationshipMappingAnnotation implem return this.mappedByAdapter.getValue(astRoot); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return elementTextRange(MAPPED_BY_ADAPTER, astRoot); } @@ -140,11 +146,11 @@ public class ManyToManyImpl extends AbstractRelationshipMappingAnnotation implem super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new ManyToManyImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new ManyToManyImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java index 6d529fb0c7..06aa6b1a50 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOneImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.BooleanExpressionConverter; @@ -19,6 +19,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.ManyToOne; public class ManyToOneImpl extends AbstractRelationshipMappingAnnotation implements ManyToOne @@ -37,7 +43,7 @@ public class ManyToOneImpl extends AbstractRelationshipMappingAnnotation impleme private Boolean optional; - protected ManyToOneImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected ManyToOneImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.optionalAdapter = this.buildBooleanAnnotationElementAdapter(OPTIONAL_ADAPTER); } @@ -83,7 +89,7 @@ public class ManyToOneImpl extends AbstractRelationshipMappingAnnotation impleme firePropertyChanged(OPTIONAL_PROPERTY, oldOptional, newOptional); } - public ITextRange optionalTextRange(CompilationUnit astRoot) { + public TextRange optionalTextRange(CompilationUnit astRoot) { return elementTextRange(OPTIONAL_ADAPTER, astRoot); } @@ -139,11 +145,11 @@ public class ManyToOneImpl extends AbstractRelationshipMappingAnnotation impleme super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new ManyToOneImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new ManyToOneImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java index 1213817801..ca73af4396 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKeyImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -19,6 +19,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.MapKey; public class MapKeyImpl extends AbstractAnnotationResource<Attribute> implements MapKey { @@ -31,7 +37,7 @@ public class MapKeyImpl extends AbstractAnnotationResource<Attribute> implements private String name; - protected MapKeyImpl(JavaResource parent, Attribute attribute) { + protected MapKeyImpl(JavaResourceNode parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, NAME_ADAPTER); } @@ -55,7 +61,7 @@ public class MapKeyImpl extends AbstractAnnotationResource<Attribute> implements firePropertyChanged(NAME_PROPERTY, oldName, newName); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(NAME_ADAPTER, astRoot); } @@ -96,11 +102,11 @@ public class MapKeyImpl extends AbstractAnnotationResource<Attribute> implements super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new MapKeyImpl(parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java index d10a797dc2..94a2943663 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclassImpl.java @@ -14,13 +14,18 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.MappedSuperclassAnnotation; -public class MappedSuperclassImpl extends AbstractAnnotationResource<Type> implements MappedSuperclass +public class MappedSuperclassImpl extends AbstractAnnotationResource<Type> implements MappedSuperclassAnnotation { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected MappedSuperclassImpl(JavaPersistentTypeResource parent, Type type) { + protected MappedSuperclassImpl(JavaResourcePersistentType parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); } @@ -55,11 +60,11 @@ public class MappedSuperclassImpl extends AbstractAnnotationResource<Type> imple super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new MappedSuperclassImpl((JavaPersistentTypeResource) parent, (Type) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new MappedSuperclassImpl((JavaResourcePersistentType) parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java index bb4e015f04..95b3107086 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueriesImpl.java @@ -17,6 +17,13 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedNativeQueries; +import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; +import org.eclipse.jpt.core.resource.java.NestableNamedNativeQuery; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -27,7 +34,7 @@ public class NamedNativeQueriesImpl extends AbstractAnnotationResource<Type> imp private List<NestableNamedNativeQuery> namedNativeQueries; - protected NamedNativeQueriesImpl(JavaResource parent, Type type) { + protected NamedNativeQueriesImpl(JavaResourceNode parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.namedNativeQueries = new ArrayList<NestableNamedNativeQuery>(); } @@ -41,7 +48,7 @@ public class NamedNativeQueriesImpl extends AbstractAnnotationResource<Type> imp } public String getNestableAnnotationName() { - return NamedNativeQuery.ANNOTATION_NAME; + return NamedNativeQueryAnnotation.ANNOTATION_NAME; } public String getElementName() { @@ -133,11 +140,11 @@ public class NamedNativeQueriesImpl extends AbstractAnnotationResource<Type> imp super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new NamedNativeQueriesImpl(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java index 571ae650ea..17cc898955 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueryImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -26,6 +26,15 @@ import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotati import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleTypeStringExpressionConverter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableNamedNativeQuery; +import org.eclipse.jpt.core.resource.java.NestableQueryHint; public class NamedNativeQueryImpl extends AbstractNamedQuery implements NestableNamedNativeQuery @@ -50,7 +59,7 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery private String resultSetMapping; - protected NamedNativeQueryImpl(JavaResource parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected NamedNativeQueryImpl(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, type, daa, annotationAdapter); this.resultClassDeclarationAdapter = resultClassAdapter(daa); this.resultClassAdapter = this.buildAdapter(this.resultClassDeclarationAdapter); @@ -95,7 +104,7 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - NamedNativeQuery oldNamedQuery = (NamedNativeQuery) oldAnnotation; + NamedNativeQueryAnnotation oldNamedQuery = (NamedNativeQueryAnnotation) oldAnnotation; setResultClass(oldNamedQuery.getResultClass()); setResultSetMapping(oldNamedQuery.getResultSetMapping()); } @@ -132,11 +141,11 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery firePropertyChanged(RESULT_SET_MAPPING_PROPERTY, oldResultSetMapping, newResultSetMapping); } - public ITextRange resultClassTextRange(CompilationUnit astRoot) { + public TextRange resultClassTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.resultClassDeclarationAdapter, astRoot); } - public ITextRange resultSetMappingTextRange(CompilationUnit astRoot) { + public TextRange resultSetMappingTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.resultSetMappingDeclarationAdapter, astRoot); } @@ -169,11 +178,11 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery } // ********** static methods ********** - static NamedNativeQueryImpl createNamedNativeQuery(JavaResource parent, Type type) { + static NamedNativeQueryImpl createNamedNativeQuery(JavaResourceNode parent, Type type) { return new NamedNativeQueryImpl(parent, type, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(type, DECLARATION_ANNOTATION_ADAPTER)); } - static NamedNativeQueryImpl createNestedNamedNativeQuery(JavaResource parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { + static NamedNativeQueryImpl createNestedNamedNativeQuery(JavaResourceNode parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(type, idaa); return new NamedNativeQueryImpl(parent, type, idaa, annotationAdapter); @@ -202,11 +211,11 @@ public class NamedNativeQueryImpl extends AbstractNamedQuery super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return NamedNativeQueryImpl.createNamedNativeQuery(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java index 09d376cd7c..c5b859e111 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueriesImpl.java @@ -17,6 +17,13 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedQueries; +import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; +import org.eclipse.jpt.core.resource.java.NestableNamedQuery; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -27,7 +34,7 @@ public class NamedQueriesImpl extends AbstractAnnotationResource<Type> implement private List<NestableNamedQuery> namedQueries; - protected NamedQueriesImpl(JavaResource parent, Type type) { + protected NamedQueriesImpl(JavaResourceNode parent, Type type) { super(parent, type, DECLARATION_ANNOTATION_ADAPTER); this.namedQueries = new ArrayList<NestableNamedQuery>(); } @@ -41,7 +48,7 @@ public class NamedQueriesImpl extends AbstractAnnotationResource<Type> implement } public String getNestableAnnotationName() { - return NamedQuery.ANNOTATION_NAME; + return NamedQueryAnnotation.ANNOTATION_NAME; } public String getElementName() { @@ -132,11 +139,11 @@ public class NamedQueriesImpl extends AbstractAnnotationResource<Type> implement super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new NamedQueriesImpl(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java index b7bf11399f..cf7c96b5c5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueryImpl.java @@ -19,6 +19,13 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableNamedQuery; +import org.eclipse.jpt.core.resource.java.NestableQueryHint; public class NamedQueryImpl extends AbstractNamedQuery implements NestableNamedQuery @@ -26,7 +33,7 @@ public class NamedQueryImpl extends AbstractNamedQuery public static final SimpleDeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected NamedQueryImpl(JavaResource parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected NamedQueryImpl(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, type, daa, annotationAdapter); } @@ -51,11 +58,11 @@ public class NamedQueryImpl extends AbstractNamedQuery } // ********** static methods ********** - static NamedQueryImpl createNamedQuery(JavaResource parent, Type type) { + static NamedQueryImpl createNamedQuery(JavaResourceNode parent, Type type) { return new NamedQueryImpl(parent, type, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(type, DECLARATION_ANNOTATION_ADAPTER)); } - static NamedQueryImpl createNestedNamedQuery(JavaResource parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { + static NamedQueryImpl createNestedNamedQuery(JavaResourceNode parent, Type type, int index, DeclarationAnnotationAdapter attributeOverridesAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, attributeOverridesAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(type, idaa); return new NamedQueryImpl(parent, type, idaa, annotationAdapter); @@ -84,11 +91,11 @@ public class NamedQueryImpl extends AbstractNamedQuery super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return NamedQueryImpl.createNamedQuery(parent, (Type) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAssociationOverride.java deleted file mode 100644 index 9b698a89cf..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAssociationOverride.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.eclipse.jpt.core.internal.resource.java; - -public interface NestableAssociationOverride - extends AssociationOverride, NestableAnnotation -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAttributeOverride.java deleted file mode 100644 index 7e0dcc41fd..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAttributeOverride.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.eclipse.jpt.core.internal.resource.java; - -public interface NestableAttributeOverride - extends AttributeOverride, NestableAnnotation -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableJoinColumn.java deleted file mode 100644 index 003b2afc9c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableJoinColumn.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.eclipse.jpt.core.internal.resource.java; - -interface NestableJoinColumn extends JoinColumn, NestableAnnotation -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableSecondaryTable.java deleted file mode 100644 index aab4dffc23..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableSecondaryTable.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.eclipse.jpt.core.internal.resource.java; - -public interface NestableSecondaryTable extends SecondaryTable, NestableAnnotation -{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java index b520112fb0..6aca12636b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractColumn.java @@ -10,17 +10,20 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.AbstractColumnAnnotation; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; -public abstract class NullAbstractColumn extends NullNamedColumn implements AbstractColumn, Annotation +public abstract class NullAbstractColumn extends NullNamedColumn implements AbstractColumnAnnotation, Annotation { - protected NullAbstractColumn(JavaResource parent) { + protected NullAbstractColumn(JavaResourceNode parent) { super(parent); } @Override - protected abstract AbstractColumn createColumnResource(); + protected abstract AbstractColumnAnnotation createColumnResource(); public String getTable() { return null; @@ -72,23 +75,23 @@ public abstract class NullAbstractColumn extends NullNamedColumn implements Abst } } - public ITextRange tableTextRange(CompilationUnit astRoot) { + public TextRange tableTextRange(CompilationUnit astRoot) { return null; } - public ITextRange uniqueTextRange(CompilationUnit astRoot) { + public TextRange uniqueTextRange(CompilationUnit astRoot) { return null; } - public ITextRange updatableTextRange(CompilationUnit astRoot) { + public TextRange updatableTextRange(CompilationUnit astRoot) { return null; } - public ITextRange insertableTextRange(CompilationUnit astRoot) { + public TextRange insertableTextRange(CompilationUnit astRoot) { return null; } - public ITextRange nullableTextRange(CompilationUnit astRoot) { + public TextRange nullableTextRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java index 36f9738410..dd58083a43 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAbstractTable.java @@ -11,18 +11,22 @@ package org.eclipse.jpt.core.internal.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.TableAnnotation; +import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public abstract class NullAbstractTable extends AbstractResource implements Table, Annotation +public abstract class NullAbstractTable extends AbstractResource implements TableAnnotation, Annotation { - protected NullAbstractTable(JavaPersistentResource parent) { + protected NullAbstractTable(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public void initialize(CompilationUnit astRoot) { @@ -41,8 +45,8 @@ public abstract class NullAbstractTable extends AbstractResource implements Tabl throw new UnsupportedOperationException(); } - protected Table createTableResource() { - return (Table) parent().addAnnotation(getAnnotationName()); + protected TableAnnotation createTableResource() { + return (TableAnnotation) parent().addAnnotation(getAnnotationName()); } public String getName() { @@ -102,19 +106,19 @@ public abstract class NullAbstractTable extends AbstractResource implements Tabl return 0; } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return null; } - public ITextRange catalogTextRange(CompilationUnit astRoot) { + public TextRange catalogTextRange(CompilationUnit astRoot) { return null; } - public ITextRange schemaTextRange(CompilationUnit astRoot) { + public TextRange schemaTextRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java index 8528e3dff3..52120530a7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java @@ -11,15 +11,20 @@ package org.eclipse.jpt.core.internal.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AssociationOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public class NullAssociationOverride extends AbstractResource implements AssociationOverride, Annotation +public class NullAssociationOverride extends AbstractResource implements AssociationOverrideAnnotation, Annotation { private String name; - public NullAssociationOverride(JavaResource parent, String name) { + public NullAssociationOverride(JavaResourceNode parent, String name) { super(parent); this.name = name; } @@ -41,7 +46,7 @@ public class NullAssociationOverride extends AbstractResource implements Associa } public String getAnnotationName() { - return AssociationOverride.ANNOTATION_NAME; + return AssociationOverrideAnnotation.ANNOTATION_NAME; } public String getName() { @@ -54,15 +59,15 @@ public class NullAssociationOverride extends AbstractResource implements Associa } } - public ListIterator<JoinColumn> joinColumns() { + public ListIterator<JoinColumnAnnotation> joinColumns() { return EmptyListIterator.instance(); } - public JoinColumn joinColumnAt(int index) { + public JoinColumnAnnotation joinColumnAt(int index) { return null; } - public int indexOfJoinColumn(JoinColumn joinColumn) { + public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) { throw new UnsupportedOperationException(); } @@ -70,7 +75,7 @@ public class NullAssociationOverride extends AbstractResource implements Associa return 0; } - public JoinColumn addJoinColumn(int index) { + public JoinColumnAnnotation addJoinColumn(int index) { throw new UnsupportedOperationException(); } @@ -83,12 +88,12 @@ public class NullAssociationOverride extends AbstractResource implements Associa } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } - protected AssociationOverride createAssociationOverrideResource() { - return (AssociationOverride) parent().addAnnotation(getAnnotationName()); + protected AssociationOverrideAnnotation createAssociationOverrideResource() { + return (AssociationOverrideAnnotation) parent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { @@ -100,11 +105,11 @@ public class NullAssociationOverride extends AbstractResource implements Associa return false; } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return null; } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverride.java index 3907bf15ca..a463e96ec1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverride.java @@ -10,10 +10,15 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; -public class NullAttributeOverride extends AbstractResource implements AttributeOverride, Annotation +public class NullAttributeOverride extends AbstractResource implements AttributeOverrideAnnotation, Annotation { //TODO should I hold on to the IColumnMapping that this attribute override is built from? //this would make it more similar to the Virtual mappings concept in xml @@ -23,7 +28,7 @@ public class NullAttributeOverride extends AbstractResource implements Attribute private String name; - public NullAttributeOverride(JavaResource parent, String name) { + public NullAttributeOverride(JavaResourceNode parent, String name) { super(parent); this.name = name; this.column = new NullAttributeOverrideColumn(this); @@ -46,7 +51,7 @@ public class NullAttributeOverride extends AbstractResource implements Attribute } public String getAnnotationName() { - return AttributeOverride.ANNOTATION_NAME; + return AttributeOverrideAnnotation.ANNOTATION_NAME; } public String getName() { @@ -59,15 +64,15 @@ public class NullAttributeOverride extends AbstractResource implements Attribute } } - public Column getNonNullColumn() { + public ColumnAnnotation getNonNullColumn() { return getColumn(); } - public Column getColumn() { + public ColumnAnnotation getColumn() { return this.column; } - public Column addColumn() { + public ColumnAnnotation addColumn() { throw new UnsupportedOperationException(); } @@ -76,12 +81,12 @@ public class NullAttributeOverride extends AbstractResource implements Attribute } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } - protected AttributeOverride createAttributeOverrideResource() { - return (AttributeOverride) parent().addAnnotation(getAnnotationName()); + protected AttributeOverrideAnnotation createAttributeOverrideResource() { + return (AttributeOverrideAnnotation) parent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { @@ -93,11 +98,11 @@ public class NullAttributeOverride extends AbstractResource implements Attribute return false; } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return null; } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java index d065d165a9..fda89806cc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java @@ -10,26 +10,29 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AttributeOverrideAnnotation; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; -public class NullAttributeOverrideColumn extends NullAbstractColumn implements Column, Annotation +public class NullAttributeOverrideColumn extends NullAbstractColumn implements ColumnAnnotation, Annotation { - public NullAttributeOverrideColumn(AttributeOverride parent) { + public NullAttributeOverrideColumn(AttributeOverrideAnnotation parent) { super(parent); } @Override - public AttributeOverride parent() { - return (AttributeOverride) super.parent(); + public AttributeOverrideAnnotation parent() { + return (AttributeOverrideAnnotation) super.parent(); } public String getAnnotationName() { - return Column.ANNOTATION_NAME; + return ColumnAnnotation.ANNOTATION_NAME; } @Override - protected Column createColumnResource() { + protected ColumnAnnotation createColumnResource() { return parent().addColumn(); } @@ -63,15 +66,15 @@ public class NullAttributeOverrideColumn extends NullAbstractColumn implements C } } - public ITextRange scaleTextRange(CompilationUnit astRoot) { + public TextRange scaleTextRange(CompilationUnit astRoot) { return null; } - public ITextRange lengthTextRange(CompilationUnit astRoot) { + public TextRange lengthTextRange(CompilationUnit astRoot) { return null; } - public ITextRange precisionTextRange(CompilationUnit astRoot) { + public TextRange precisionTextRange(CompilationUnit astRoot) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java index 5aa5ac84aa..ab22d3c691 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java @@ -10,12 +10,16 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.Basic; +import org.eclipse.jpt.core.resource.java.FetchType; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class NullBasic extends AbstractResource implements Basic, Annotation { - protected NullBasic(JavaPersistentResource parent) { + protected NullBasic(JavaResourcePersistentMember parent) { super(parent); } @@ -40,8 +44,8 @@ public class NullBasic extends AbstractResource implements Basic, Annotation } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } protected Basic createBasicResource() { @@ -73,15 +77,15 @@ public class NullBasic extends AbstractResource implements Basic, Annotation throw new UnsupportedOperationException(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } - public ITextRange fetchTextRange(CompilationUnit astRoot) { + public TextRange fetchTextRange(CompilationUnit astRoot) { return null; } - public ITextRange optionalTextRange(CompilationUnit astRoot) { + public TextRange optionalTextRange(CompilationUnit astRoot) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java index e17b948d89..420df097b9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java @@ -10,27 +10,30 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.ColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -public class NullColumn extends NullAbstractColumn implements Column, Annotation +public class NullColumn extends NullAbstractColumn implements ColumnAnnotation, Annotation { - public NullColumn(JavaPersistentResource parent) { + public NullColumn(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public String getAnnotationName() { - return Column.ANNOTATION_NAME; + return ColumnAnnotation.ANNOTATION_NAME; } @Override - protected Column createColumnResource() { - return (Column) parent().addAnnotation(getAnnotationName()); + protected ColumnAnnotation createColumnResource() { + return (ColumnAnnotation) parent().addAnnotation(getAnnotationName()); } public Integer getLength() { @@ -63,15 +66,15 @@ public class NullColumn extends NullAbstractColumn implements Column, Annotation } } - public ITextRange scaleTextRange(CompilationUnit astRoot) { + public TextRange scaleTextRange(CompilationUnit astRoot) { return null; } - public ITextRange lengthTextRange(CompilationUnit astRoot) { + public TextRange lengthTextRange(CompilationUnit astRoot) { return null; } - public ITextRange precisionTextRange(CompilationUnit astRoot) { + public TextRange precisionTextRange(CompilationUnit astRoot) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java index 35d3b6fc1e..6bfa0ab74f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java @@ -9,26 +9,31 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.resource.java; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.DiscriminatorColumnAnnotation; +import org.eclipse.jpt.core.resource.java.DiscriminatorType; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -public class NullDiscriminatorColumn extends NullNamedColumn implements DiscriminatorColumn, Annotation + +public class NullDiscriminatorColumn extends NullNamedColumn implements DiscriminatorColumnAnnotation, Annotation { - public NullDiscriminatorColumn(JavaPersistentResource parent) { + public NullDiscriminatorColumn(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public String getAnnotationName() { - return DiscriminatorColumn.ANNOTATION_NAME; + return DiscriminatorColumnAnnotation.ANNOTATION_NAME; } @Override - protected DiscriminatorColumn createColumnResource() { - return (DiscriminatorColumn) parent().addAnnotation(getAnnotationName()); + protected DiscriminatorColumnAnnotation createColumnResource() { + return (DiscriminatorColumnAnnotation) parent().addAnnotation(getAnnotationName()); } public DiscriminatorType getDiscriminatorType() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java index 21062e8f64..394461f841 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java @@ -10,18 +10,21 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.DiscriminatorValue; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class NullDiscriminatorValue extends AbstractResource implements DiscriminatorValue, Annotation { - protected NullDiscriminatorValue(JavaPersistentResource parent) { + protected NullDiscriminatorValue(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public void initialize(CompilationUnit astRoot) { @@ -63,11 +66,11 @@ public class NullDiscriminatorValue extends AbstractResource implements Discrimi } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return null; } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java index 80625329ed..1aa8255055 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java @@ -10,12 +10,15 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.Embedded; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class NullEmbedded extends AbstractResource implements Embedded, Annotation { - protected NullEmbedded(JavaPersistentResource parent) { + protected NullEmbedded(JavaResourcePersistentMember parent) { super(parent); } @@ -40,8 +43,8 @@ public class NullEmbedded extends AbstractResource implements Embedded, Annotati } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } @@ -49,7 +52,7 @@ public class NullEmbedded extends AbstractResource implements Embedded, Annotati throw new UnsupportedOperationException(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java index 43108a09c8..69c511f83c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java @@ -10,18 +10,22 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.EnumType; +import org.eclipse.jpt.core.resource.java.Enumerated; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class NullEnumerated extends AbstractResource implements Enumerated, Annotation { - protected NullEnumerated(JavaPersistentResource parent) { + protected NullEnumerated(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public void initialize(CompilationUnit astRoot) { @@ -63,11 +67,11 @@ public class NullEnumerated extends AbstractResource implements Enumerated, Anno throw new UnsupportedOperationException(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java index 6c80cff7a0..86a27db0a5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java @@ -10,18 +10,22 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.Inheritance; +import org.eclipse.jpt.core.resource.java.InheritanceType; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; public class NullInheritance extends AbstractResource implements Inheritance, Annotation { - protected NullInheritance(JavaPersistentResource parent) { + protected NullInheritance(JavaResourcePersistentMember parent) { super(parent); } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } public void initialize(CompilationUnit astRoot) { @@ -64,11 +68,11 @@ public class NullInheritance extends AbstractResource implements Inheritance, An } - public ITextRange strategyTextRange(CompilationUnit astRoot) { + public TextRange strategyTextRange(CompilationUnit astRoot) { return null; } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java index 677233f3ef..e3b713cc68 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinColumn.java @@ -10,22 +10,25 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; -public class NullJoinColumn extends NullAbstractColumn implements JoinColumn, Annotation +public class NullJoinColumn extends NullAbstractColumn implements JoinColumnAnnotation, Annotation { - public NullJoinColumn(JavaResource parent) { + public NullJoinColumn(JavaResourceNode parent) { super(parent); } public String getAnnotationName() { - return JoinColumn.ANNOTATION_NAME; + return JoinColumnAnnotation.ANNOTATION_NAME; } @Override - protected JoinColumn createColumnResource() { + protected JoinColumnAnnotation createColumnResource() { throw new UnsupportedOperationException(); } @@ -37,7 +40,7 @@ public class NullJoinColumn extends NullAbstractColumn implements JoinColumn, An throw new UnsupportedOperationException(); } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java index ddada229ea..a70b34fa70 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullJoinTable.java @@ -10,40 +10,43 @@ package org.eclipse.jpt.core.internal.resource.java; import java.util.ListIterator; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.JoinTableAnnotation; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; -public class NullJoinTable extends NullAbstractTable implements JoinTable +public class NullJoinTable extends NullAbstractTable implements JoinTableAnnotation { - protected NullJoinTable(JavaPersistentResource parent) { + protected NullJoinTable(JavaResourcePersistentMember parent) { super(parent); } public String getAnnotationName() { - return JoinTable.ANNOTATION_NAME; + return JoinTableAnnotation.ANNOTATION_NAME; } - public JoinColumn addInverseJoinColumn(int index) { + public JoinColumnAnnotation addInverseJoinColumn(int index) { throw new UnsupportedOperationException(); } - public JoinColumn addJoinColumn(int index) { + public JoinColumnAnnotation addJoinColumn(int index) { throw new UnsupportedOperationException(); } - public int indexOfInverseJoinColumn(JoinColumn joinColumn) { + public int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn) { throw new UnsupportedOperationException(); } - public int indexOfJoinColumn(JoinColumn joinColumn) { + public int indexOfJoinColumn(JoinColumnAnnotation joinColumn) { throw new UnsupportedOperationException(); } - public JoinColumn inverseJoinColumnAt(int index) { + public JoinColumnAnnotation inverseJoinColumnAt(int index) { return null; } - public ListIterator<JoinColumn> inverseJoinColumns() { + public ListIterator<JoinColumnAnnotation> inverseJoinColumns() { return EmptyListIterator.instance(); } @@ -51,11 +54,11 @@ public class NullJoinTable extends NullAbstractTable implements JoinTable return 0; } - public JoinColumn joinColumnAt(int index) { + public JoinColumnAnnotation joinColumnAt(int index) { return null; } - public ListIterator<JoinColumn> joinColumns() { + public ListIterator<JoinColumnAnnotation> joinColumns() { return EmptyListIterator.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java index be9274e05b..4736a22b6f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullNamedColumn.java @@ -10,12 +10,15 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NamedColumnAnnotation; -public abstract class NullNamedColumn extends AbstractResource implements NamedColumn, Annotation +public abstract class NullNamedColumn extends AbstractResource implements NamedColumnAnnotation, Annotation { - protected NullNamedColumn(JavaResource parent) { + protected NullNamedColumn(JavaResourceNode parent) { super(parent); } @@ -35,7 +38,7 @@ public abstract class NullNamedColumn extends AbstractResource implements NamedC throw new UnsupportedOperationException(); } - protected abstract NamedColumn createColumnResource(); + protected abstract NamedColumnAnnotation createColumnResource(); public String getName() { return null; @@ -61,15 +64,15 @@ public abstract class NullNamedColumn extends AbstractResource implements NamedC throw new UnsupportedOperationException(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } - public ITextRange columnDefinitionTextRange(CompilationUnit astRoot) { + public TextRange columnDefinitionTextRange(CompilationUnit astRoot) { return null; } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java index d0f4fb65d7..b2b1d0da3b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullPrimaryKeyJoinColumn.java @@ -10,22 +10,25 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; -public class NullPrimaryKeyJoinColumn extends NullNamedColumn implements PrimaryKeyJoinColumn, Annotation +public class NullPrimaryKeyJoinColumn extends NullNamedColumn implements PrimaryKeyJoinColumnAnnotation, Annotation { - public NullPrimaryKeyJoinColumn(JavaResource parent) { + public NullPrimaryKeyJoinColumn(JavaResourceNode parent) { super(parent); } public String getAnnotationName() { - return PrimaryKeyJoinColumn.ANNOTATION_NAME; + return PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME; } @Override - protected PrimaryKeyJoinColumn createColumnResource() { + protected PrimaryKeyJoinColumnAnnotation createColumnResource() { throw new UnsupportedOperationException(); } @@ -37,7 +40,7 @@ public class NullPrimaryKeyJoinColumn extends NullNamedColumn implements Primary throw new UnsupportedOperationException(); } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java index 27b5886f53..a0832f080b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTable.java @@ -9,15 +9,18 @@ ******************************************************************************/ package org.eclipse.jpt.core.internal.resource.java; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.TableAnnotation; -public class NullTable extends NullAbstractTable implements Table + +public class NullTable extends NullAbstractTable implements TableAnnotation { - protected NullTable(JavaPersistentResource parent) { + protected NullTable(JavaResourcePersistentMember parent) { super(parent); } public String getAnnotationName() { - return Table.ANNOTATION_NAME; + return TableAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java index bdaf366091..4c67947c17 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java @@ -10,12 +10,16 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.Temporal; +import org.eclipse.jpt.core.resource.java.TemporalType; public class NullTemporal extends AbstractResource implements Temporal, Annotation { - protected NullTemporal(JavaPersistentResource parent) { + protected NullTemporal(JavaResourcePersistentMember parent) { super(parent); } @@ -40,8 +44,8 @@ public class NullTemporal extends AbstractResource implements Temporal, Annotati } @Override - public JavaPersistentResource parent() { - return (JavaPersistentResource) super.parent(); + public JavaResourcePersistentMember parent() { + return (JavaResourcePersistentMember) super.parent(); } protected Temporal createTemporalResource() { @@ -63,11 +67,11 @@ public class NullTemporal extends AbstractResource implements Temporal, Annotati throw new UnsupportedOperationException(); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return null; } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return null; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java index 8adb00642a..d5a6d6059f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToManyImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -18,6 +18,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.OneToMany; public class OneToManyImpl extends AbstractRelationshipMappingAnnotation implements OneToMany { @@ -35,7 +41,7 @@ public class OneToManyImpl extends AbstractRelationshipMappingAnnotation impleme private String mappedBy; - protected OneToManyImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected OneToManyImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER); } @@ -81,7 +87,7 @@ public class OneToManyImpl extends AbstractRelationshipMappingAnnotation impleme firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return elementTextRange(MAPPED_BY_ADAPTER, astRoot); } @@ -136,11 +142,11 @@ public class OneToManyImpl extends AbstractRelationshipMappingAnnotation impleme super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new OneToManyImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new OneToManyImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java index 2830753b90..6064819b1d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOneImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.BooleanExpressionConverter; @@ -19,6 +19,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.OneToOne; public class OneToOneImpl extends AbstractRelationshipMappingAnnotation implements OneToOne { @@ -43,7 +49,7 @@ public class OneToOneImpl extends AbstractRelationshipMappingAnnotation implemen private String mappedBy; - public OneToOneImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + public OneToOneImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.mappedByAdapter = buildAnnotationElementAdapter(MAPPED_BY_ADAPTER); this.optionalAdapter = this.buildBooleanAnnotationElementAdapter(OPTIONAL_ADAPTER); @@ -102,11 +108,11 @@ public class OneToOneImpl extends AbstractRelationshipMappingAnnotation implemen firePropertyChanged(MAPPED_BY_PROPERTY, oldMappedBy, newMappedBy); } - public ITextRange mappedByTextRange(CompilationUnit astRoot) { + public TextRange mappedByTextRange(CompilationUnit astRoot) { return elementTextRange(MAPPED_BY_ADAPTER, astRoot); } - public ITextRange optionalTextRange(CompilationUnit astRoot) { + public TextRange optionalTextRange(CompilationUnit astRoot) { return elementTextRange(OPTIONAL_ADAPTER, astRoot); } @@ -176,11 +182,11 @@ public class OneToOneImpl extends AbstractRelationshipMappingAnnotation implemen super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new OneToOneImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new OneToOneImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java index 2060997817..db3e5e31b8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderByImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -19,6 +19,12 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.OrderBy; public class OrderByImpl extends AbstractAnnotationResource<Attribute> implements OrderBy { @@ -31,7 +37,7 @@ public class OrderByImpl extends AbstractAnnotationResource<Attribute> implement private String value; - protected OrderByImpl(JavaResource parent, Attribute attribute) { + protected OrderByImpl(JavaResourceNode parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, VALUE_ADAPTER); } @@ -55,7 +61,7 @@ public class OrderByImpl extends AbstractAnnotationResource<Attribute> implement firePropertyChanged(VALUE_PROPERTY, oldValue, newValue); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_ADAPTER, astRoot); } @@ -92,11 +98,11 @@ public class OrderByImpl extends AbstractAnnotationResource<Attribute> implement super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new OrderByImpl(parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java index 9c939d5cfb..0c801d9dc9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; @@ -19,10 +19,14 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.IndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.OverrideAnnotation; public abstract class OverrideImpl extends AbstractAnnotationResource<Member> - implements OverrideResource + implements OverrideAnnotation { // hold this so we can get the 'name' text range private final DeclarationAnnotationElementAdapter<String> nameDeclarationAdapter; @@ -32,7 +36,7 @@ public abstract class OverrideImpl private String name; - protected OverrideImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected OverrideImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.nameDeclarationAdapter = ConversionDeclarationAnnotationElementAdapter.forStrings(daa, JPA.ATTRIBUTE_OVERRIDE__NAME, false); // false = do not remove annotation when empty this.nameAdapter = new ShortCircuitAnnotationElementAdapter<String>(getMember(),this.nameDeclarationAdapter); @@ -51,7 +55,7 @@ public abstract class OverrideImpl } public void initializeFrom(NestableAnnotation oldAnnotation) { - OverrideResource oldOverride = (OverrideResource) oldAnnotation; + OverrideAnnotation oldOverride = (OverrideAnnotation) oldAnnotation; setName(oldOverride.getName()); } @@ -64,10 +68,10 @@ public abstract class OverrideImpl String oldName = this.name; this.name = newName; this.nameAdapter.setValue(newName); - firePropertyChanged(OverrideResource.NAME_PROPERTY, oldName, newName); + firePropertyChanged(OverrideAnnotation.NAME_PROPERTY, oldName, newName); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nameDeclarationAdapter, astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java index 748f524b3a..ab74e5f8e7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -22,6 +22,14 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements NestablePrimaryKeyJoinColumn { @@ -35,17 +43,17 @@ public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements Nes private String referencedColumnName; - protected PrimaryKeyJoinColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.referencedColumnNameDeclarationAdapter = this.buildStringElementAdapter(JPA.PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME); this.referencedColumnNameAdapter = this.buildShortCircuitElementAdapter(this.referencedColumnNameDeclarationAdapter); } - protected PrimaryKeyJoinColumnImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa) { + protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa) { this(parent, member, daa, new MemberAnnotationAdapter(member, daa)); } - protected PrimaryKeyJoinColumnImpl(JavaResource parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { + protected PrimaryKeyJoinColumnImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { this(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa)); } @@ -80,7 +88,7 @@ public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements Nes @Override public void initializeFrom(NestableAnnotation oldAnnotation) { super.initializeFrom(oldAnnotation); - PrimaryKeyJoinColumn oldColumn = (PrimaryKeyJoinColumn) oldAnnotation; + PrimaryKeyJoinColumnAnnotation oldColumn = (PrimaryKeyJoinColumnAnnotation) oldAnnotation; setReferencedColumnName(oldColumn.getReferencedColumnName()); } @@ -109,17 +117,17 @@ public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements Nes return this.elementTouches(this.referencedColumnNameDeclarationAdapter, pos, astRoot); } - public ITextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.referencedColumnNameDeclarationAdapter, astRoot); } // ********** static methods ********** - static PrimaryKeyJoinColumnImpl createPrimaryKeyJoinColumn(JavaResource parent, Member member) { + static PrimaryKeyJoinColumnImpl createPrimaryKeyJoinColumn(JavaResourceNode parent, Member member) { return new PrimaryKeyJoinColumnImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER); } - static PrimaryKeyJoinColumnImpl createNestedPrimaryKeyJoinColumn(JavaResource parent, Member member, int index, DeclarationAnnotationAdapter pkJoinColumnsAdapter) { + static PrimaryKeyJoinColumnImpl createNestedPrimaryKeyJoinColumn(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter pkJoinColumnsAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, pkJoinColumnsAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa); return new PrimaryKeyJoinColumnImpl(parent, member, idaa, annotationAdapter); @@ -130,7 +138,7 @@ public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements Nes } - static NestablePrimaryKeyJoinColumn createSecondaryTablePrimaryKeyJoinColumn(DeclarationAnnotationAdapter secondaryTableAdapter, JavaResource parent, Member member, int index) { + static NestablePrimaryKeyJoinColumn createSecondaryTablePrimaryKeyJoinColumn(DeclarationAnnotationAdapter secondaryTableAdapter, JavaResourceNode parent, Member member, int index) { return new PrimaryKeyJoinColumnImpl(parent, member, buildSecondaryTableAnnotationAdapter(secondaryTableAdapter, index)); } @@ -158,11 +166,11 @@ public class PrimaryKeyJoinColumnImpl extends AbstractNamedColumn implements Nes super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return PrimaryKeyJoinColumnImpl.createPrimaryKeyJoinColumn(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java index 6dd22c8148..b11def2a89 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumnsImpl.java @@ -17,6 +17,12 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumns; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -27,7 +33,7 @@ public class PrimaryKeyJoinColumnsImpl extends AbstractAnnotationResource<Member private List<NestablePrimaryKeyJoinColumn> pkJoinColumns; - protected PrimaryKeyJoinColumnsImpl(JavaResource parent, Member member) { + protected PrimaryKeyJoinColumnsImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.pkJoinColumns = new ArrayList<NestablePrimaryKeyJoinColumn>(); } @@ -41,7 +47,7 @@ public class PrimaryKeyJoinColumnsImpl extends AbstractAnnotationResource<Member } public String getNestableAnnotationName() { - return PrimaryKeyJoinColumn.ANNOTATION_NAME; + return PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME; } public String getElementName() { @@ -134,11 +140,11 @@ public class PrimaryKeyJoinColumnsImpl extends AbstractAnnotationResource<Member super(); } - public PrimaryKeyJoinColumns buildAnnotation(JavaPersistentResource parent, Member member) { + public PrimaryKeyJoinColumns buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new PrimaryKeyJoinColumnsImpl(parent, member); } - public PrimaryKeyJoinColumns buildNullAnnotation(JavaPersistentResource parent, Member member) { + public PrimaryKeyJoinColumns buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java index 0e342e39aa..25dac71043 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHintImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -21,6 +21,11 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Type; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableQueryHint; +import org.eclipse.jpt.core.resource.java.QueryHintAnnotation; public class QueryHintImpl extends AbstractAnnotationResource<Type> implements NestableQueryHint @@ -40,7 +45,7 @@ public class QueryHintImpl extends AbstractAnnotationResource<Type> private String value; - public QueryHintImpl(JavaResource parent, Type type, IndexedDeclarationAnnotationAdapter idaa) { + public QueryHintImpl(JavaResourceNode parent, Type type, IndexedDeclarationAnnotationAdapter idaa) { super(parent, type, idaa, new MemberIndexedAnnotationAdapter(type, idaa)); this.nameDeclarationAdapter = this.nameAdapter(idaa); this.nameAdapter = this.buildAdapter(this.nameDeclarationAdapter); @@ -97,11 +102,11 @@ public class QueryHintImpl extends AbstractAnnotationResource<Type> firePropertyChanged(VALUE_PROPERTY, oldValue, newValue); } - public ITextRange nameTextRange(CompilationUnit astRoot) { + public TextRange nameTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.nameDeclarationAdapter, astRoot); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(this.valueDeclarationAdapter, astRoot); } @@ -124,13 +129,13 @@ public class QueryHintImpl extends AbstractAnnotationResource<Type> } public void initializeFrom(NestableAnnotation oldAnnotation) { - QueryHint oldQueryHint = (QueryHint) oldAnnotation; + QueryHintAnnotation oldQueryHint = (QueryHintAnnotation) oldAnnotation; setName(oldQueryHint.getName()); setValue(oldQueryHint.getValue()); } // ********** static methods ********** - static QueryHintImpl createNamedQueryQueryHint(JavaResource parent, Type type, DeclarationAnnotationAdapter namedQueryAdapter, int index) { + static QueryHintImpl createNamedQueryQueryHint(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter namedQueryAdapter, int index) { return new QueryHintImpl(parent, type, buildNamedQueryQueryHintAnnotationAdapter(namedQueryAdapter, index)); } @@ -138,7 +143,7 @@ public class QueryHintImpl extends AbstractAnnotationResource<Type> return new NestedIndexedDeclarationAnnotationAdapter(namedQueryAdapter, JPA.NAMED_QUERY__HINTS, index, JPA.QUERY_HINT); } - static QueryHintImpl createNamedNativeQueryQueryHint(JavaResource parent, Type type, DeclarationAnnotationAdapter namedNativeQueryAdapter, int index) { + static QueryHintImpl createNamedNativeQueryQueryHint(JavaResourceNode parent, Type type, DeclarationAnnotationAdapter namedNativeQueryAdapter, int index) { return new QueryHintImpl(parent, type, buildNamedNativeQueryQueryHintAnnotationAdapter(namedNativeQueryAdapter, index)); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java index 9b2a97efd6..78b2954721 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTableImpl.java @@ -13,7 +13,7 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.ConversionDeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -25,19 +25,32 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestablePrimaryKeyJoinColumn; +import org.eclipse.jpt.core.resource.java.NestableSecondaryTable; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; +import org.eclipse.jpt.core.resource.java.PrimaryKeyJoinColumnAnnotation; +import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; +import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; public class SecondaryTableImpl extends AbstractTableResource implements NestableSecondaryTable { - private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(SecondaryTable.ANNOTATION_NAME); + private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(SecondaryTableAnnotation.ANNOTATION_NAME); private final List<NestablePrimaryKeyJoinColumn> pkJoinColumns; private final PkJoinColumnsContainerAnnotation pkJoinColumnsContainerAnnotation; - protected SecondaryTableImpl(JavaResource parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { + protected SecondaryTableImpl(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter daa, AnnotationAdapter annotationAdapter) { super(parent, member, daa, annotationAdapter); this.pkJoinColumns = new ArrayList<NestablePrimaryKeyJoinColumn>(); this.pkJoinColumnsContainerAnnotation = new PkJoinColumnsContainerAnnotation(); @@ -69,7 +82,7 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl } public String getAnnotationName() { - return SecondaryTable.ANNOTATION_NAME; + return SecondaryTableAnnotation.ANNOTATION_NAME; } public void moveAnnotation(int newIndex) { @@ -77,7 +90,7 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl } public void initializeFrom(NestableAnnotation oldAnnotation) { - SecondaryTable oldSecondaryTable = (SecondaryTable) oldAnnotation; + SecondaryTableAnnotation oldSecondaryTable = (SecondaryTableAnnotation) oldAnnotation; setName(oldSecondaryTable.getName()); setCatalog(oldSecondaryTable.getCatalog()); setSchema(oldSecondaryTable.getSchema()); @@ -85,7 +98,7 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl NestableUniqueConstraint newUniqueConstraint = addUniqueConstraint(oldSecondaryTable.indexOfUniqueConstraint(uniqueConstraint)); newUniqueConstraint.initializeFrom((NestableAnnotation) uniqueConstraint); } - for (PrimaryKeyJoinColumn pkJoinColumn : CollectionTools.iterable(oldSecondaryTable.pkJoinColumns())) { + for (PrimaryKeyJoinColumnAnnotation pkJoinColumn : CollectionTools.iterable(oldSecondaryTable.pkJoinColumns())) { NestablePrimaryKeyJoinColumn newPkJoinColumn = addPkJoinColumn(oldSecondaryTable.indexOfPkJoinColumn(pkJoinColumn)); newPkJoinColumn.initializeFrom((NestableAnnotation) pkJoinColumn); } @@ -99,8 +112,8 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl // ************* SecondaryTable implementation ******************* - public ListIterator<PrimaryKeyJoinColumn> pkJoinColumns() { - return new CloneListIterator<PrimaryKeyJoinColumn>(this.pkJoinColumns); + public ListIterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns() { + return new CloneListIterator<PrimaryKeyJoinColumnAnnotation>(this.pkJoinColumns); } public int pkJoinColumnsSize() { @@ -111,13 +124,13 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl return this.pkJoinColumns.get(index); } - public int indexOfPkJoinColumn(PrimaryKeyJoinColumn joinColumn) { + public int indexOfPkJoinColumn(PrimaryKeyJoinColumnAnnotation joinColumn) { return this.pkJoinColumns.indexOf(joinColumn); } public NestablePrimaryKeyJoinColumn addPkJoinColumn(int index) { NestablePrimaryKeyJoinColumn pkJoinColumn = (NestablePrimaryKeyJoinColumn) ContainerAnnotationTools.addNestedAnnotation(index, this.pkJoinColumnsContainerAnnotation); - fireItemAdded(SecondaryTable.PK_JOIN_COLUMNS_LIST, index, pkJoinColumn); + fireItemAdded(SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST, index, pkJoinColumn); return pkJoinColumn; } @@ -133,13 +146,13 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl } protected void removePkJoinColumn(NestablePrimaryKeyJoinColumn pkJoinColumn) { - removeItemFromList(pkJoinColumn, this.pkJoinColumns, SecondaryTable.PK_JOIN_COLUMNS_LIST); + removeItemFromList(pkJoinColumn, this.pkJoinColumns, SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST); } public void movePkJoinColumn(int targetIndex, int sourceIndex) { movePkJoinColumnInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.pkJoinColumnsContainerAnnotation); - fireItemMoved(SecondaryTable.PK_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); + fireItemMoved(SecondaryTableAnnotation.PK_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } protected void movePkJoinColumnInternal(int targetIndex, int sourceIndex) { @@ -162,11 +175,11 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl } // ********** static methods ********** - static SecondaryTableImpl createSecondaryTable(JavaResource parent, Member member) { + static SecondaryTableImpl createSecondaryTable(JavaResourceNode parent, Member member) { return new SecondaryTableImpl(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER)); } - static SecondaryTableImpl createNestedSecondaryTable(JavaResource parent, Member member, int index, DeclarationAnnotationAdapter secondaryTablesAdapter) { + static SecondaryTableImpl createNestedSecondaryTable(JavaResourceNode parent, Member member, int index, DeclarationAnnotationAdapter secondaryTablesAdapter) { IndexedDeclarationAnnotationAdapter idaa = buildNestedDeclarationAnnotationAdapter(index, secondaryTablesAdapter); IndexedAnnotationAdapter annotationAdapter = new MemberIndexedAnnotationAdapter(member, idaa); return new SecondaryTableImpl(parent, member, idaa, annotationAdapter); @@ -265,7 +278,7 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl SecondaryTableImpl.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return SecondaryTableImpl.this.textRange(astRoot); } @@ -293,16 +306,16 @@ public class SecondaryTableImpl extends AbstractTableResource implements Nestabl super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return SecondaryTableImpl.createSecondaryTable(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } public String getAnnotationName() { - return SecondaryTable.ANNOTATION_NAME; + return SecondaryTableAnnotation.ANNOTATION_NAME; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java index 9acf0d174d..68424d1ca5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTablesImpl.java @@ -16,6 +16,13 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.NestableSecondaryTable; +import org.eclipse.jpt.core.resource.java.SecondaryTableAnnotation; +import org.eclipse.jpt.core.resource.java.SecondaryTables; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -25,7 +32,7 @@ public class SecondaryTablesImpl extends AbstractAnnotationResource<Member> impl private final List<NestableSecondaryTable> secondaryTables; - protected SecondaryTablesImpl(JavaPersistentTypeResource parent, Member member) { + protected SecondaryTablesImpl(JavaResourcePersistentType parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.secondaryTables = new ArrayList<NestableSecondaryTable>(); } @@ -39,7 +46,7 @@ public class SecondaryTablesImpl extends AbstractAnnotationResource<Member> impl } public String getNestableAnnotationName() { - return SecondaryTable.ANNOTATION_NAME; + return SecondaryTableAnnotation.ANNOTATION_NAME; } public String getElementName() { @@ -136,11 +143,11 @@ public class SecondaryTablesImpl extends AbstractAnnotationResource<Member> impl super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new SecondaryTablesImpl((JavaPersistentTypeResource) parent, member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new SecondaryTablesImpl((JavaResourcePersistentType) parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java index 89b4966956..685e6c4313 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGeneratorImpl.java @@ -10,14 +10,20 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; - -public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGenerator +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.SequenceGeneratorAnnotation; + +public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGeneratorAnnotation { private final AnnotationElementAdapter<String> sequenceNameAdapter; @@ -33,7 +39,7 @@ public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGene private String sequenceName; - protected SequenceGeneratorImpl(JavaResource parent, Member member) { + protected SequenceGeneratorImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.sequenceNameAdapter = this.buildAdapter(SEQUENCE_NAME_ADAPTER); } @@ -82,7 +88,7 @@ public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGene firePropertyChanged(SEQUENCE_NAME_PROPERTY, oldSequenceName, newSequenceName); } - public ITextRange sequenceNameTextRange(CompilationUnit astRoot) { + public TextRange sequenceNameTextRange(CompilationUnit astRoot) { return this.elementTextRange(SEQUENCE_NAME_ADAPTER, astRoot); } @@ -125,11 +131,11 @@ public class SequenceGeneratorImpl extends GeneratorImpl implements SequenceGene super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new SequenceGeneratorImpl(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java index 13bda4e0ae..fdd67560b4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGeneratorImpl.java @@ -13,16 +13,26 @@ import java.util.ArrayList; import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.ContainerAnnotation; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; +import org.eclipse.jpt.core.resource.java.TableAnnotation; +import org.eclipse.jpt.core.resource.java.TableGeneratorAnnotation; +import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator +public class TableGeneratorImpl extends GeneratorImpl implements TableGeneratorAnnotation { private final AnnotationElementAdapter<String> tableAdapter; @@ -73,7 +83,7 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator private final UniqueConstraintsContainerAnnotation uniqueConstraintsContainerAnnotation; - protected TableGeneratorImpl(JavaResource parent, Member member) { + protected TableGeneratorImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER); this.tableAdapter = this.buildAdapter(TABLE_ADAPTER); this.catalogAdapter = this.buildAdapter(CATALOG_ADAPTER); @@ -208,7 +218,7 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator public NestableUniqueConstraint addUniqueConstraint(int index) { NestableUniqueConstraint uniqueConstraint = (NestableUniqueConstraint) ContainerAnnotationTools.addNestedAnnotation(index, this.uniqueConstraintsContainerAnnotation); - fireItemAdded(TableGenerator.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint); + fireItemAdded(TableGeneratorAnnotation.UNIQUE_CONSTRAINTS_LIST, index, uniqueConstraint); return uniqueConstraint; } @@ -230,7 +240,7 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator public void moveUniqueConstraint(int targetIndex, int sourceIndex) { moveUniqueConstraintInternal(targetIndex, sourceIndex); ContainerAnnotationTools.synchAnnotationsAfterMove(targetIndex, sourceIndex, this.uniqueConstraintsContainerAnnotation); - fireItemMoved(Table.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex); + fireItemMoved(TableAnnotation.UNIQUE_CONSTRAINTS_LIST, targetIndex, sourceIndex); } protected void moveUniqueConstraintInternal(int targetIndex, int sourceIndex) { @@ -249,27 +259,27 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator return UniqueConstraintImpl.createTableGeneratorUniqueConstraint(this, this.getMember(), index); } - public ITextRange tableTextRange(CompilationUnit astRoot) { + public TextRange tableTextRange(CompilationUnit astRoot) { return this.elementTextRange(TABLE_ADAPTER, astRoot); } - public ITextRange catalogTextRange(CompilationUnit astRoot) { + public TextRange catalogTextRange(CompilationUnit astRoot) { return this.elementTextRange(CATALOG_ADAPTER, astRoot); } - public ITextRange schemaTextRange(CompilationUnit astRoot) { + public TextRange schemaTextRange(CompilationUnit astRoot) { return this.elementTextRange(SCHEMA_ADAPTER, astRoot); } - public ITextRange pkColumnNameTextRange(CompilationUnit astRoot) { + public TextRange pkColumnNameTextRange(CompilationUnit astRoot) { return this.elementTextRange(PK_COLUMN_NAME_ADAPTER, astRoot); } - public ITextRange pkColumnValueTextRange(CompilationUnit astRoot) { + public TextRange pkColumnValueTextRange(CompilationUnit astRoot) { return this.elementTextRange(PK_COLUMN_VALUE_ADAPTER, astRoot); } - public ITextRange valueColumnNameTextRange(CompilationUnit astRoot) { + public TextRange valueColumnNameTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_COLUMN_NAME_ADAPTER, astRoot); } @@ -411,7 +421,7 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator TableGeneratorImpl.this.updateFromJava(astRoot); } - public ITextRange textRange(CompilationUnit astRoot) { + public TextRange textRange(CompilationUnit astRoot) { return TableGeneratorImpl.this.textRange(astRoot); } @@ -439,11 +449,11 @@ public class TableGeneratorImpl extends GeneratorImpl implements TableGenerator super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new TableGeneratorImpl(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java index 65548173e8..555be9be6e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableImpl.java @@ -15,6 +15,13 @@ import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationElementAdap import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; +import org.eclipse.jpt.core.resource.java.TableAnnotation; public class TableImpl extends AbstractTableResource { @@ -28,12 +35,12 @@ public class TableImpl extends AbstractTableResource private static final DeclarationAnnotationElementAdapter<String> CATALOG_ADAPTER = ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__CATALOG); - protected TableImpl(JavaResource parent, Member member) { + protected TableImpl(JavaResourceNode parent, Member member) { super(parent, member, DECLARATION_ANNOTATION_ADAPTER, new MemberAnnotationAdapter(member, DECLARATION_ANNOTATION_ADAPTER)); } public String getAnnotationName() { - return Table.ANNOTATION_NAME; + return TableAnnotation.ANNOTATION_NAME; } @Override @@ -78,11 +85,11 @@ public class TableImpl extends AbstractTableResource super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new TableImpl(parent, member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullTable(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java index e001eaf4a4..c5f1d0ff35 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalImpl.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.jdtutility.AnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; @@ -19,6 +19,13 @@ import org.eclipse.jpt.core.internal.jdtutility.EnumDeclarationAnnotationElement import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.Temporal; +import org.eclipse.jpt.core.resource.java.TemporalType; public class TemporalImpl extends AbstractAnnotationResource<Attribute> implements Temporal { @@ -30,7 +37,7 @@ public class TemporalImpl extends AbstractAnnotationResource<Attribute> implemen private TemporalType value; - protected TemporalImpl(JavaResource parent, Attribute attribute) { + protected TemporalImpl(JavaResourceNode parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); this.valueAdapter = new ShortCircuitAnnotationElementAdapter<String>(attribute, VALUE_ADAPTER); } @@ -54,7 +61,7 @@ public class TemporalImpl extends AbstractAnnotationResource<Attribute> implemen firePropertyChanged(VALUE_PROPERTY, oldValue, newValue); } - public ITextRange valueTextRange(CompilationUnit astRoot) { + public TextRange valueTextRange(CompilationUnit astRoot) { return this.elementTextRange(VALUE_ADAPTER, astRoot); } @@ -90,11 +97,11 @@ public class TemporalImpl extends AbstractAnnotationResource<Attribute> implemen super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { return new TemporalImpl(parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return new NullTemporal(parent); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java index 114ecd0127..1e7e7b36b0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TransientImpl.java @@ -14,12 +14,17 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.Transient; public class TransientImpl extends AbstractAnnotationResource<Attribute> implements Transient { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - protected TransientImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + protected TransientImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -54,11 +59,11 @@ public class TransientImpl extends AbstractAnnotationResource<Attribute> impleme super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new TransientImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new TransientImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java index 5060256f4f..fef81ac5d7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraintImpl.java @@ -26,6 +26,11 @@ import org.eclipse.jpt.core.internal.jdtutility.MemberIndexedAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.NestedIndexedDeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.ShortCircuitArrayAnnotationElementAdapter; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JavaResourceNode; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; +import org.eclipse.jpt.core.resource.java.NestableUniqueConstraint; +import org.eclipse.jpt.core.resource.java.UniqueConstraint; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -41,7 +46,7 @@ public class UniqueConstraintImpl extends AbstractAnnotationResource<Member> imp private final List<String> columnNames; - public UniqueConstraintImpl(JavaResource parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { + public UniqueConstraintImpl(JavaResourceNode parent, Member member, IndexedDeclarationAnnotationAdapter idaa) { super(parent, member, idaa, new MemberIndexedAnnotationAdapter(member, idaa)); this.columnNamesDeclarationAdapter = buildArrayAnnotationElementAdapter(idaa, JPA.UNIQUE_CONSTRAINT__COLUMN_NAMES); this.columnNamesAdapter = this.buildAnnotationElementAdapter(this.columnNamesDeclarationAdapter); @@ -127,7 +132,7 @@ public class UniqueConstraintImpl extends AbstractAnnotationResource<Member> imp } // ********** static methods ********** - static NestableUniqueConstraint createSecondaryTableUniqueConstraint(JavaResource parent, Member member, DeclarationAnnotationAdapter declarationAnnotationAdapter, int index) { + static NestableUniqueConstraint createSecondaryTableUniqueConstraint(JavaResourceNode parent, Member member, DeclarationAnnotationAdapter declarationAnnotationAdapter, int index) { return new UniqueConstraintImpl(parent, member, buildSecondaryTableUniqueConstraintAnnotationAdapter(declarationAnnotationAdapter, index)); } @@ -135,7 +140,7 @@ public class UniqueConstraintImpl extends AbstractAnnotationResource<Member> imp return new NestedIndexedDeclarationAnnotationAdapter(declarationAnnotationAdapter, JPA.SECONDARY_TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT); } - static NestableUniqueConstraint createJoinTableUniqueConstraint(JavaResource parent, Member member, int index) { + static NestableUniqueConstraint createJoinTableUniqueConstraint(JavaResourceNode parent, Member member, int index) { return new UniqueConstraintImpl(parent, member, buildJoinTableUniqueConstraintAnnotationAdapter(index)); } @@ -143,7 +148,7 @@ public class UniqueConstraintImpl extends AbstractAnnotationResource<Member> imp return new NestedIndexedDeclarationAnnotationAdapter(JoinTableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.JOIN_TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT); } - static NestableUniqueConstraint createTableUniqueConstraint(JavaResource parent, Member member, int index) { + static NestableUniqueConstraint createTableUniqueConstraint(JavaResourceNode parent, Member member, int index) { return new UniqueConstraintImpl(parent, member, buildTableUniqueConstraintAnnotationAdapter(index)); } @@ -151,7 +156,7 @@ public class UniqueConstraintImpl extends AbstractAnnotationResource<Member> imp return new NestedIndexedDeclarationAnnotationAdapter(TableImpl.DECLARATION_ANNOTATION_ADAPTER, JPA.TABLE__UNIQUE_CONSTRAINTS, index, JPA.UNIQUE_CONSTRAINT); } - static NestableUniqueConstraint createTableGeneratorUniqueConstraint(JavaResource parent, Member member, int index) { + static NestableUniqueConstraint createTableGeneratorUniqueConstraint(JavaResourceNode parent, Member member, int index) { return new UniqueConstraintImpl(parent, member, buildTableGeneratorUniqueConstraintAnnotationAdapter(index)); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java index f6f675a429..560c600141 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/VersionImpl.java @@ -14,12 +14,17 @@ import org.eclipse.jpt.core.internal.jdtutility.Attribute; import org.eclipse.jpt.core.internal.jdtutility.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.jdtutility.SimpleDeclarationAnnotationAdapter; +import org.eclipse.jpt.core.resource.java.Annotation; +import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; +import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; +import org.eclipse.jpt.core.resource.java.Version; public class VersionImpl extends AbstractAnnotationResource<Attribute> implements Version { private static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_ADAPTER = new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); - public VersionImpl(JavaPersistentAttributeResource parent, Attribute attribute) { + public VersionImpl(JavaResourcePersistentAttribute parent, Attribute attribute) { super(parent, attribute, DECLARATION_ANNOTATION_ADAPTER); } @@ -54,11 +59,11 @@ public class VersionImpl extends AbstractAnnotationResource<Attribute> implement super(); } - public Annotation buildAnnotation(JavaPersistentResource parent, Member member) { - return new VersionImpl((JavaPersistentAttributeResource) parent, (Attribute) member); + public Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member) { + return new VersionImpl((JavaResourcePersistentAttribute) parent, (Attribute) member); } - public Annotation buildNullAnnotation(JavaPersistentResource parent, Member member) { + public Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java index cefc718769..46cba25ff1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/AttributeOverrideTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java index 7ca5060fc4..0be983c109 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/BasicTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java index f2f532102c..88d059f734 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ColumnTranslator.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java index ba817b677c..646aefc20b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedIdTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java index 7b661f1e82..c359381498 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/EmbeddedTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java index dca385e7fd..83b201e1b6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/GeneratedValueTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java index fab983de6f..f91dd51792 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/IdTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java index 90074a277c..5f97b6019b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinColumnTranslator.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jpt.core.internal.resource.common.translators.BooleanTranslator; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java index 2aaefeb280..aa4b214a07 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/JoinTableTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java index d6fa4ce3b6..e94247af64 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToManyTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java index 25e15ac04b..889d834e1a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/ManyToOneTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java index 6051c520d9..6f0dadcbc7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToManyTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java index 87d760fcf6..3c60c431b8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OneToOneTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java index 910cdb0cb1..aa74a96d3f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/OrmXmlMapper.java @@ -8,7 +8,7 @@ *******************************************************************************/ package org.eclipse.jpt.core.internal.resource.orm.translators; -import org.eclipse.jpt.core.internal.resource.orm.OrmPackage; +import org.eclipse.jpt.core.resource.orm.OrmPackage; public interface OrmXmlMapper { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java index d82544f37c..e4aa20472e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/SequenceGeneratorTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java index 62767a1fda..8e25e649c1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TableGeneratorTranslator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java index e540fe7e6c..f51f1827b4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/TransientTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java index 2c024721ec..1d49b79428 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/translators/VersionTranslator.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.core.internal.resource.orm.translators; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.orm.OrmFactory; +import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.wst.common.internal.emf.resource.IDTranslator; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmAdapterFactory.java deleted file mode 100644 index 6fbc0248d7..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmAdapterFactory.java +++ /dev/null @@ -1,1812 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: OrmAdapterFactory.java,v 1.2 2008/02/03 16:40:54 tle Exp $ - */ -package org.eclipse.jpt.core.internal.resource.orm.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jpt.core.internal.resource.orm.*; -import org.eclipse.jpt.core.internal.resource.orm.AbstractColumn; -import org.eclipse.jpt.core.internal.resource.orm.AbstractTable; -import org.eclipse.jpt.core.internal.resource.orm.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.Attributes; -import org.eclipse.jpt.core.internal.resource.orm.Basic; -import org.eclipse.jpt.core.internal.resource.orm.CascadeType; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.ColumnMapping; -import org.eclipse.jpt.core.internal.resource.orm.ColumnResult; -import org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; -import org.eclipse.jpt.core.internal.resource.orm.Embedded; -import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.EntityListener; -import org.eclipse.jpt.core.internal.resource.orm.EntityListeners; -import org.eclipse.jpt.core.internal.resource.orm.EntityMappings; -import org.eclipse.jpt.core.internal.resource.orm.EntityResult; -import org.eclipse.jpt.core.internal.resource.orm.EventMethod; -import org.eclipse.jpt.core.internal.resource.orm.FieldResult; -import org.eclipse.jpt.core.internal.resource.orm.GeneratedValue; -import org.eclipse.jpt.core.internal.resource.orm.Id; -import org.eclipse.jpt.core.internal.resource.orm.IdClass; -import org.eclipse.jpt.core.internal.resource.orm.Inheritance; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.JoinTable; -import org.eclipse.jpt.core.internal.resource.orm.Lob; -import org.eclipse.jpt.core.internal.resource.orm.ManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.ManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.MapKey; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; -import org.eclipse.jpt.core.internal.resource.orm.NamedColumn; -import org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedQuery; -import org.eclipse.jpt.core.internal.resource.orm.OneToMany; -import org.eclipse.jpt.core.internal.resource.orm.OneToOne; -import org.eclipse.jpt.core.internal.resource.orm.OrmPackage; -import org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.core.internal.resource.orm.PostLoad; -import org.eclipse.jpt.core.internal.resource.orm.PostPersist; -import org.eclipse.jpt.core.internal.resource.orm.PostRemove; -import org.eclipse.jpt.core.internal.resource.orm.PostUpdate; -import org.eclipse.jpt.core.internal.resource.orm.PrePersist; -import org.eclipse.jpt.core.internal.resource.orm.PreRemove; -import org.eclipse.jpt.core.internal.resource.orm.PreUpdate; -import org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.QueryHint; -import org.eclipse.jpt.core.internal.resource.orm.SecondaryTable; -import org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator; -import org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping; -import org.eclipse.jpt.core.internal.resource.orm.Table; -import org.eclipse.jpt.core.internal.resource.orm.TableGenerator; -import org.eclipse.jpt.core.internal.resource.orm.Transient; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint; -import org.eclipse.jpt.core.internal.resource.orm.Version; - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage - * @generated - */ -public class OrmAdapterFactory extends AdapterFactoryImpl -{ - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static OrmPackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public OrmAdapterFactory() - { - if (modelPackage == null) - { - modelPackage = OrmPackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { - return true; - } - if (object instanceof EObject) - { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected OrmSwitch<Adapter> modelSwitch = - new OrmSwitch<Adapter>() - { - @Override - public Adapter caseEntityMappings(EntityMappings object) - { - return createEntityMappingsAdapter(); - } - @Override - public Adapter casePersistenceUnitMetadata(PersistenceUnitMetadata object) - { - return createPersistenceUnitMetadataAdapter(); - } - @Override - public Adapter casePersistenceUnitDefaults(PersistenceUnitDefaults object) - { - return createPersistenceUnitDefaultsAdapter(); - } - @Override - public Adapter caseTypeMapping(TypeMapping object) - { - return createTypeMappingAdapter(); - } - @Override - public Adapter caseMappedSuperclass(MappedSuperclass object) - { - return createMappedSuperclassAdapter(); - } - @Override - public Adapter caseEntity(Entity object) - { - return createEntityAdapter(); - } - @Override - public Adapter caseEmbeddable(Embeddable object) - { - return createEmbeddableAdapter(); - } - @Override - public Adapter caseAttributes(Attributes object) - { - return createAttributesAdapter(); - } - @Override - public Adapter caseAttributeMapping(AttributeMapping object) - { - return createAttributeMappingAdapter(); - } - @Override - public Adapter caseColumnMapping(ColumnMapping object) - { - return createColumnMappingAdapter(); - } - @Override - public Adapter caseRelationshipMapping(RelationshipMapping object) - { - return createRelationshipMappingAdapter(); - } - @Override - public Adapter caseMultiRelationshipMapping(MultiRelationshipMapping object) - { - return createMultiRelationshipMappingAdapter(); - } - @Override - public Adapter caseSingleRelationshipMapping(SingleRelationshipMapping object) - { - return createSingleRelationshipMappingAdapter(); - } - @Override - public Adapter caseId(Id object) - { - return createIdAdapter(); - } - @Override - public Adapter caseIdImpl(IdImpl object) - { - return createIdImplAdapter(); - } - @Override - public Adapter caseEmbeddedId(EmbeddedId object) - { - return createEmbeddedIdAdapter(); - } - @Override - public Adapter caseEmbeddedIdImpl(EmbeddedIdImpl object) - { - return createEmbeddedIdImplAdapter(); - } - @Override - public Adapter caseBasic(Basic object) - { - return createBasicAdapter(); - } - @Override - public Adapter caseBasicImpl(BasicImpl object) - { - return createBasicImplAdapter(); - } - @Override - public Adapter caseVersion(Version object) - { - return createVersionAdapter(); - } - @Override - public Adapter caseVersionImpl(VersionImpl object) - { - return createVersionImplAdapter(); - } - @Override - public Adapter caseManyToOne(ManyToOne object) - { - return createManyToOneAdapter(); - } - @Override - public Adapter caseManyToOneImpl(ManyToOneImpl object) - { - return createManyToOneImplAdapter(); - } - @Override - public Adapter caseOneToMany(OneToMany object) - { - return createOneToManyAdapter(); - } - @Override - public Adapter caseOneToManyImpl(OneToManyImpl object) - { - return createOneToManyImplAdapter(); - } - @Override - public Adapter caseOneToOne(OneToOne object) - { - return createOneToOneAdapter(); - } - @Override - public Adapter caseOneToOneImpl(OneToOneImpl object) - { - return createOneToOneImplAdapter(); - } - @Override - public Adapter caseManyToMany(ManyToMany object) - { - return createManyToManyAdapter(); - } - @Override - public Adapter caseManyToManyImpl(ManyToManyImpl object) - { - return createManyToManyImplAdapter(); - } - @Override - public Adapter caseEmbedded(Embedded object) - { - return createEmbeddedAdapter(); - } - @Override - public Adapter caseEmbeddedImpl(EmbeddedImpl object) - { - return createEmbeddedImplAdapter(); - } - @Override - public Adapter caseTransient(Transient object) - { - return createTransientAdapter(); - } - @Override - public Adapter caseTransientImpl(TransientImpl object) - { - return createTransientImplAdapter(); - } - @Override - public Adapter caseAssociationOverride(AssociationOverride object) - { - return createAssociationOverrideAdapter(); - } - @Override - public Adapter caseAttributeOverride(AttributeOverride object) - { - return createAttributeOverrideAdapter(); - } - @Override - public Adapter caseAttributeOverrideImpl(AttributeOverrideImpl object) - { - return createAttributeOverrideImplAdapter(); - } - @Override - public Adapter caseCascadeType(CascadeType object) - { - return createCascadeTypeAdapter(); - } - @Override - public Adapter caseCascadeTypeImpl(CascadeTypeImpl object) - { - return createCascadeTypeImplAdapter(); - } - @Override - public Adapter caseNamedColumn(NamedColumn object) - { - return createNamedColumnAdapter(); - } - @Override - public Adapter caseAbstractColumn(AbstractColumn object) - { - return createAbstractColumnAdapter(); - } - @Override - public Adapter caseColumn(Column object) - { - return createColumnAdapter(); - } - @Override - public Adapter caseColumnImpl(ColumnImpl object) - { - return createColumnImplAdapter(); - } - @Override - public Adapter caseColumnResult(ColumnResult object) - { - return createColumnResultAdapter(); - } - @Override - public Adapter caseDiscriminatorColumn(DiscriminatorColumn object) - { - return createDiscriminatorColumnAdapter(); - } - @Override - public Adapter caseEntityListeners(EntityListeners object) - { - return createEntityListenersAdapter(); - } - @Override - public Adapter caseEntityListener(EntityListener object) - { - return createEntityListenerAdapter(); - } - @Override - public Adapter caseEntityResult(EntityResult object) - { - return createEntityResultAdapter(); - } - @Override - public Adapter caseEventMethod(EventMethod object) - { - return createEventMethodAdapter(); - } - @Override - public Adapter caseFieldResult(FieldResult object) - { - return createFieldResultAdapter(); - } - @Override - public Adapter caseGeneratedValue(GeneratedValue object) - { - return createGeneratedValueAdapter(); - } - @Override - public Adapter caseGeneratedValueImpl(GeneratedValueImpl object) - { - return createGeneratedValueImplAdapter(); - } - @Override - public Adapter caseIdClass(IdClass object) - { - return createIdClassAdapter(); - } - @Override - public Adapter caseInheritance(Inheritance object) - { - return createInheritanceAdapter(); - } - @Override - public Adapter caseJoinColumn(JoinColumn object) - { - return createJoinColumnAdapter(); - } - @Override - public Adapter caseJoinColumnImpl(JoinColumnImpl object) - { - return createJoinColumnImplAdapter(); - } - @Override - public Adapter caseJoinTable(JoinTable object) - { - return createJoinTableAdapter(); - } - @Override - public Adapter caseJoinTableImpl(JoinTableImpl object) - { - return createJoinTableImplAdapter(); - } - @Override - public Adapter caseLob(Lob object) - { - return createLobAdapter(); - } - @Override - public Adapter caseMapKey(MapKey object) - { - return createMapKeyAdapter(); - } - @Override - public Adapter caseMapKeyImpl(MapKeyImpl object) - { - return createMapKeyImplAdapter(); - } - @Override - public Adapter caseQuery(Query object) - { - return createQueryAdapter(); - } - @Override - public Adapter caseNamedNativeQuery(NamedNativeQuery object) - { - return createNamedNativeQueryAdapter(); - } - @Override - public Adapter caseNamedQuery(NamedQuery object) - { - return createNamedQueryAdapter(); - } - @Override - public Adapter casePostLoad(PostLoad object) - { - return createPostLoadAdapter(); - } - @Override - public Adapter casePostPersist(PostPersist object) - { - return createPostPersistAdapter(); - } - @Override - public Adapter casePostRemove(PostRemove object) - { - return createPostRemoveAdapter(); - } - @Override - public Adapter casePostUpdate(PostUpdate object) - { - return createPostUpdateAdapter(); - } - @Override - public Adapter casePrePersist(PrePersist object) - { - return createPrePersistAdapter(); - } - @Override - public Adapter casePreRemove(PreRemove object) - { - return createPreRemoveAdapter(); - } - @Override - public Adapter casePreUpdate(PreUpdate object) - { - return createPreUpdateAdapter(); - } - @Override - public Adapter casePrimaryKeyJoinColumn(PrimaryKeyJoinColumn object) - { - return createPrimaryKeyJoinColumnAdapter(); - } - @Override - public Adapter caseQueryHint(QueryHint object) - { - return createQueryHintAdapter(); - } - @Override - public Adapter caseAbstractTable(AbstractTable object) - { - return createAbstractTableAdapter(); - } - @Override - public Adapter caseTable(Table object) - { - return createTableAdapter(); - } - @Override - public Adapter caseSecondaryTable(SecondaryTable object) - { - return createSecondaryTableAdapter(); - } - @Override - public Adapter caseGenerator(Generator object) - { - return createGeneratorAdapter(); - } - @Override - public Adapter caseSequenceGenerator(SequenceGenerator object) - { - return createSequenceGeneratorAdapter(); - } - @Override - public Adapter caseSequenceGeneratorImpl(SequenceGeneratorImpl object) - { - return createSequenceGeneratorImplAdapter(); - } - @Override - public Adapter caseSqlResultSetMapping(SqlResultSetMapping object) - { - return createSqlResultSetMappingAdapter(); - } - @Override - public Adapter caseTableGenerator(TableGenerator object) - { - return createTableGeneratorAdapter(); - } - @Override - public Adapter caseTableGeneratorImpl(TableGeneratorImpl object) - { - return createTableGeneratorImplAdapter(); - } - @Override - public Adapter caseUniqueConstraint(UniqueConstraint object) - { - return createUniqueConstraintAdapter(); - } - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) - { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings <em>Entity Mappings</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings - * @generated - */ - public Adapter createEntityMappingsAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata - * @generated - */ - public Adapter createPersistenceUnitMetadataAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults - * @generated - */ - public Adapter createPersistenceUnitDefaultsAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping <em>Type Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping - * @generated - */ - public Adapter createTypeMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass <em>Mapped Superclass</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass - * @generated - */ - public Adapter createMappedSuperclassAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Entity <em>Entity</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity - * @generated - */ - public Adapter createEntityAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Embeddable <em>Embeddable</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Embeddable - * @generated - */ - public Adapter createEmbeddableAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes <em>Attributes</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes - * @generated - */ - public Adapter createAttributesAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping <em>Attribute Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeMapping - * @generated - */ - public Adapter createAttributeMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping <em>Column Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnMapping - * @generated - */ - public Adapter createColumnMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping <em>Relationship Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping - * @generated - */ - public Adapter createRelationshipMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping <em>Multi Relationship Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping - * @generated - */ - public Adapter createMultiRelationshipMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping <em>Single Relationship Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping - * @generated - */ - public Adapter createSingleRelationshipMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Id <em>Id</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Id - * @generated - */ - public Adapter createIdAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl <em>Id Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.IdImpl - * @generated - */ - public Adapter createIdImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId <em>Embedded Id</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedId - * @generated - */ - public Adapter createEmbeddedIdAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl - * @generated - */ - public Adapter createEmbeddedIdImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Basic <em>Basic</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic - * @generated - */ - public Adapter createBasicAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl <em>Basic Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.BasicImpl - * @generated - */ - public Adapter createBasicImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Version <em>Version</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Version - * @generated - */ - public Adapter createVersionAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl <em>Version Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.VersionImpl - * @generated - */ - public Adapter createVersionImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOne <em>Many To One</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOne - * @generated - */ - public Adapter createManyToOneAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl - * @generated - */ - public Adapter createManyToOneImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany <em>One To Many</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToMany - * @generated - */ - public Adapter createOneToManyAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl <em>One To Many Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl - * @generated - */ - public Adapter createOneToManyImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne <em>One To One</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne - * @generated - */ - public Adapter createOneToOneAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl <em>One To One Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl - * @generated - */ - public Adapter createOneToOneImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToMany <em>Many To Many</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToMany - * @generated - */ - public Adapter createManyToManyAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl - * @generated - */ - public Adapter createManyToManyImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Embedded <em>Embedded</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Embedded - * @generated - */ - public Adapter createEmbeddedAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl - * @generated - */ - public Adapter createEmbeddedImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Transient <em>Transient</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Transient - * @generated - */ - public Adapter createTransientAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.TransientImpl <em>Transient Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.TransientImpl - * @generated - */ - public Adapter createTransientImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride <em>Association Override</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride - * @generated - */ - public Adapter createAssociationOverrideAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride <em>Attribute Override</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride - * @generated - */ - public Adapter createAttributeOverrideAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl - * @generated - */ - public Adapter createAttributeOverrideImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType <em>Cascade Type</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType - * @generated - */ - public Adapter createCascadeTypeAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl - * @generated - */ - public Adapter createCascadeTypeImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn <em>Named Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn - * @generated - */ - public Adapter createNamedColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn <em>Abstract Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn - * @generated - */ - public Adapter createAbstractColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Column <em>Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Column - * @generated - */ - public Adapter createColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl <em>Column Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnImpl - * @generated - */ - public Adapter createColumnImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult <em>Column Result</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnResult - * @generated - */ - public Adapter createColumnResultAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn <em>Discriminator Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn - * @generated - */ - public Adapter createDiscriminatorColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners <em>Entity Listeners</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListeners - * @generated - */ - public Adapter createEntityListenersAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener <em>Entity Listener</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener - * @generated - */ - public Adapter createEntityListenerAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult <em>Entity Result</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult - * @generated - */ - public Adapter createEntityResultAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult <em>Field Result</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult - * @generated - */ - public Adapter createFieldResultAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue <em>Generated Value</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue - * @generated - */ - public Adapter createGeneratedValueAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl - * @generated - */ - public Adapter createGeneratedValueImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass <em>Id Class</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.IdClass - * @generated - */ - public Adapter createIdClassAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance <em>Inheritance</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Inheritance - * @generated - */ - public Adapter createInheritanceAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn <em>Join Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumn - * @generated - */ - public Adapter createJoinColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl - * @generated - */ - public Adapter createJoinColumnImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable <em>Join Table</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable - * @generated - */ - public Adapter createJoinTableAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl <em>Join Table Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl - * @generated - */ - public Adapter createJoinTableImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Lob <em>Lob</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Lob - * @generated - */ - public Adapter createLobAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey <em>Map Key</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.MapKey - * @generated - */ - public Adapter createMapKeyAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl <em>Map Key Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl - * @generated - */ - public Adapter createMapKeyImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Query <em>Query</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Query - * @generated - */ - public Adapter createQueryAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod <em>Event Method</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.EventMethod - * @generated - */ - public Adapter createEventMethodAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery <em>Named Native Query</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery - * @generated - */ - public Adapter createNamedNativeQueryAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery <em>Named Query</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedQuery - * @generated - */ - public Adapter createNamedQueryAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PostLoad <em>Post Load</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PostLoad - * @generated - */ - public Adapter createPostLoadAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PostPersist <em>Post Persist</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PostPersist - * @generated - */ - public Adapter createPostPersistAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PostRemove <em>Post Remove</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PostRemove - * @generated - */ - public Adapter createPostRemoveAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PostUpdate <em>Post Update</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PostUpdate - * @generated - */ - public Adapter createPostUpdateAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PrePersist <em>Pre Persist</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PrePersist - * @generated - */ - public Adapter createPrePersistAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PreRemove <em>Pre Remove</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PreRemove - * @generated - */ - public Adapter createPreRemoveAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PreUpdate <em>Pre Update</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PreUpdate - * @generated - */ - public Adapter createPreUpdateAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint <em>Query Hint</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint - * @generated - */ - public Adapter createQueryHintAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable <em>Abstract Table</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable - * @generated - */ - public Adapter createAbstractTableAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping - * @generated - */ - public Adapter createSqlResultSetMappingAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn <em>Primary Key Join Column</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn - * @generated - */ - public Adapter createPrimaryKeyJoinColumnAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable <em>Secondary Table</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.SecondaryTable - * @generated - */ - public Adapter createSecondaryTableAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Generator <em>Generator</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Generator - * @generated - */ - public Adapter createGeneratorAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator <em>Sequence Generator</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator - * @generated - */ - public Adapter createSequenceGeneratorAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl - * @generated - */ - public Adapter createSequenceGeneratorImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.Table <em>Table</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.Table - * @generated - */ - public Adapter createTableAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator <em>Table Generator</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator - * @generated - */ - public Adapter createTableGeneratorAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl - * @generated - */ - public Adapter createTableGeneratorImplAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint <em>Unique Constraint</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint - * @generated - */ - public Adapter createUniqueConstraintAdapter() - { - return null; - } - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() - { - return null; - } - -} //OrmAdapterFactory diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmSwitch.java deleted file mode 100644 index 3f881d6e19..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/util/OrmSwitch.java +++ /dev/null @@ -1,2159 +0,0 @@ -/** - * <copyright> - * </copyright> - * - * $Id: OrmSwitch.java,v 1.2 2008/02/03 16:40:54 tle Exp $ - */ -package org.eclipse.jpt.core.internal.resource.orm.util; - -import java.util.List; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jpt.core.internal.resource.orm.*; -import org.eclipse.jpt.core.internal.resource.orm.AbstractColumn; -import org.eclipse.jpt.core.internal.resource.orm.AbstractTable; -import org.eclipse.jpt.core.internal.resource.orm.AssociationOverride; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeOverride; -import org.eclipse.jpt.core.internal.resource.orm.Attributes; -import org.eclipse.jpt.core.internal.resource.orm.Basic; -import org.eclipse.jpt.core.internal.resource.orm.CascadeType; -import org.eclipse.jpt.core.internal.resource.orm.Column; -import org.eclipse.jpt.core.internal.resource.orm.ColumnMapping; -import org.eclipse.jpt.core.internal.resource.orm.ColumnResult; -import org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn; -import org.eclipse.jpt.core.internal.resource.orm.Embeddable; -import org.eclipse.jpt.core.internal.resource.orm.Embedded; -import org.eclipse.jpt.core.internal.resource.orm.EmbeddedId; -import org.eclipse.jpt.core.internal.resource.orm.Entity; -import org.eclipse.jpt.core.internal.resource.orm.EntityListener; -import org.eclipse.jpt.core.internal.resource.orm.EntityListeners; -import org.eclipse.jpt.core.internal.resource.orm.EntityMappings; -import org.eclipse.jpt.core.internal.resource.orm.EntityResult; -import org.eclipse.jpt.core.internal.resource.orm.EventMethod; -import org.eclipse.jpt.core.internal.resource.orm.FieldResult; -import org.eclipse.jpt.core.internal.resource.orm.GeneratedValue; -import org.eclipse.jpt.core.internal.resource.orm.Id; -import org.eclipse.jpt.core.internal.resource.orm.IdClass; -import org.eclipse.jpt.core.internal.resource.orm.Inheritance; -import org.eclipse.jpt.core.internal.resource.orm.JoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.JoinTable; -import org.eclipse.jpt.core.internal.resource.orm.Lob; -import org.eclipse.jpt.core.internal.resource.orm.ManyToMany; -import org.eclipse.jpt.core.internal.resource.orm.ManyToOne; -import org.eclipse.jpt.core.internal.resource.orm.MapKey; -import org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass; -import org.eclipse.jpt.core.internal.resource.orm.NamedColumn; -import org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery; -import org.eclipse.jpt.core.internal.resource.orm.NamedQuery; -import org.eclipse.jpt.core.internal.resource.orm.OneToMany; -import org.eclipse.jpt.core.internal.resource.orm.OneToOne; -import org.eclipse.jpt.core.internal.resource.orm.OrmPackage; -import org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.core.internal.resource.orm.PostLoad; -import org.eclipse.jpt.core.internal.resource.orm.PostPersist; -import org.eclipse.jpt.core.internal.resource.orm.PostRemove; -import org.eclipse.jpt.core.internal.resource.orm.PostUpdate; -import org.eclipse.jpt.core.internal.resource.orm.PrePersist; -import org.eclipse.jpt.core.internal.resource.orm.PreRemove; -import org.eclipse.jpt.core.internal.resource.orm.PreUpdate; -import org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.resource.orm.QueryHint; -import org.eclipse.jpt.core.internal.resource.orm.SecondaryTable; -import org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator; -import org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping; -import org.eclipse.jpt.core.internal.resource.orm.Table; -import org.eclipse.jpt.core.internal.resource.orm.TableGenerator; -import org.eclipse.jpt.core.internal.resource.orm.Transient; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint; -import org.eclipse.jpt.core.internal.resource.orm.Version; - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage - * @generated - */ -public class OrmSwitch<T> -{ - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static OrmPackage modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public OrmSwitch() - { - if (modelPackage == null) - { - modelPackage = OrmPackage.eINSTANCE; - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public T doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { - case OrmPackage.ENTITY_MAPPINGS: - { - EntityMappings entityMappings = (EntityMappings)theEObject; - T result = caseEntityMappings(entityMappings); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PERSISTENCE_UNIT_METADATA: - { - PersistenceUnitMetadata persistenceUnitMetadata = (PersistenceUnitMetadata)theEObject; - T result = casePersistenceUnitMetadata(persistenceUnitMetadata); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PERSISTENCE_UNIT_DEFAULTS: - { - PersistenceUnitDefaults persistenceUnitDefaults = (PersistenceUnitDefaults)theEObject; - T result = casePersistenceUnitDefaults(persistenceUnitDefaults); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TYPE_MAPPING: - { - TypeMapping typeMapping = (TypeMapping)theEObject; - T result = caseTypeMapping(typeMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MAPPED_SUPERCLASS: - { - MappedSuperclass mappedSuperclass = (MappedSuperclass)theEObject; - T result = caseMappedSuperclass(mappedSuperclass); - if (result == null) result = caseTypeMapping(mappedSuperclass); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ENTITY: - { - Entity entity = (Entity)theEObject; - T result = caseEntity(entity); - if (result == null) result = caseTypeMapping(entity); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EMBEDDABLE: - { - Embeddable embeddable = (Embeddable)theEObject; - T result = caseEmbeddable(embeddable); - if (result == null) result = caseTypeMapping(embeddable); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ATTRIBUTES: - { - Attributes attributes = (Attributes)theEObject; - T result = caseAttributes(attributes); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ATTRIBUTE_MAPPING: - { - AttributeMapping attributeMapping = (AttributeMapping)theEObject; - T result = caseAttributeMapping(attributeMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.COLUMN_MAPPING: - { - ColumnMapping columnMapping = (ColumnMapping)theEObject; - T result = caseColumnMapping(columnMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.RELATIONSHIP_MAPPING: - { - RelationshipMapping relationshipMapping = (RelationshipMapping)theEObject; - T result = caseRelationshipMapping(relationshipMapping); - if (result == null) result = caseAttributeMapping(relationshipMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MULTI_RELATIONSHIP_MAPPING: - { - MultiRelationshipMapping multiRelationshipMapping = (MultiRelationshipMapping)theEObject; - T result = caseMultiRelationshipMapping(multiRelationshipMapping); - if (result == null) result = caseRelationshipMapping(multiRelationshipMapping); - if (result == null) result = caseAttributeMapping(multiRelationshipMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.SINGLE_RELATIONSHIP_MAPPING: - { - SingleRelationshipMapping singleRelationshipMapping = (SingleRelationshipMapping)theEObject; - T result = caseSingleRelationshipMapping(singleRelationshipMapping); - if (result == null) result = caseRelationshipMapping(singleRelationshipMapping); - if (result == null) result = caseAttributeMapping(singleRelationshipMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ID: - { - Id id = (Id)theEObject; - T result = caseId(id); - if (result == null) result = caseAttributeMapping(id); - if (result == null) result = caseColumnMapping(id); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ID_IMPL: - { - IdImpl idImpl = (IdImpl)theEObject; - T result = caseIdImpl(idImpl); - if (result == null) result = caseId(idImpl); - if (result == null) result = caseAttributeMapping(idImpl); - if (result == null) result = caseColumnMapping(idImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EMBEDDED_ID: - { - EmbeddedId embeddedId = (EmbeddedId)theEObject; - T result = caseEmbeddedId(embeddedId); - if (result == null) result = caseAttributeMapping(embeddedId); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EMBEDDED_ID_IMPL: - { - EmbeddedIdImpl embeddedIdImpl = (EmbeddedIdImpl)theEObject; - T result = caseEmbeddedIdImpl(embeddedIdImpl); - if (result == null) result = caseEmbeddedId(embeddedIdImpl); - if (result == null) result = caseAttributeMapping(embeddedIdImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.BASIC: - { - Basic basic = (Basic)theEObject; - T result = caseBasic(basic); - if (result == null) result = caseAttributeMapping(basic); - if (result == null) result = caseColumnMapping(basic); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.BASIC_IMPL: - { - BasicImpl basicImpl = (BasicImpl)theEObject; - T result = caseBasicImpl(basicImpl); - if (result == null) result = caseBasic(basicImpl); - if (result == null) result = caseAttributeMapping(basicImpl); - if (result == null) result = caseColumnMapping(basicImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.VERSION: - { - Version version = (Version)theEObject; - T result = caseVersion(version); - if (result == null) result = caseAttributeMapping(version); - if (result == null) result = caseColumnMapping(version); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.VERSION_IMPL: - { - VersionImpl versionImpl = (VersionImpl)theEObject; - T result = caseVersionImpl(versionImpl); - if (result == null) result = caseVersion(versionImpl); - if (result == null) result = caseAttributeMapping(versionImpl); - if (result == null) result = caseColumnMapping(versionImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MANY_TO_ONE: - { - ManyToOne manyToOne = (ManyToOne)theEObject; - T result = caseManyToOne(manyToOne); - if (result == null) result = caseSingleRelationshipMapping(manyToOne); - if (result == null) result = caseRelationshipMapping(manyToOne); - if (result == null) result = caseAttributeMapping(manyToOne); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MANY_TO_ONE_IMPL: - { - ManyToOneImpl manyToOneImpl = (ManyToOneImpl)theEObject; - T result = caseManyToOneImpl(manyToOneImpl); - if (result == null) result = caseManyToOne(manyToOneImpl); - if (result == null) result = caseSingleRelationshipMapping(manyToOneImpl); - if (result == null) result = caseRelationshipMapping(manyToOneImpl); - if (result == null) result = caseAttributeMapping(manyToOneImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ONE_TO_MANY: - { - OneToMany oneToMany = (OneToMany)theEObject; - T result = caseOneToMany(oneToMany); - if (result == null) result = caseMultiRelationshipMapping(oneToMany); - if (result == null) result = caseRelationshipMapping(oneToMany); - if (result == null) result = caseAttributeMapping(oneToMany); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ONE_TO_MANY_IMPL: - { - OneToManyImpl oneToManyImpl = (OneToManyImpl)theEObject; - T result = caseOneToManyImpl(oneToManyImpl); - if (result == null) result = caseOneToMany(oneToManyImpl); - if (result == null) result = caseMultiRelationshipMapping(oneToManyImpl); - if (result == null) result = caseRelationshipMapping(oneToManyImpl); - if (result == null) result = caseAttributeMapping(oneToManyImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ONE_TO_ONE: - { - OneToOne oneToOne = (OneToOne)theEObject; - T result = caseOneToOne(oneToOne); - if (result == null) result = caseSingleRelationshipMapping(oneToOne); - if (result == null) result = caseRelationshipMapping(oneToOne); - if (result == null) result = caseAttributeMapping(oneToOne); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ONE_TO_ONE_IMPL: - { - OneToOneImpl oneToOneImpl = (OneToOneImpl)theEObject; - T result = caseOneToOneImpl(oneToOneImpl); - if (result == null) result = caseOneToOne(oneToOneImpl); - if (result == null) result = caseSingleRelationshipMapping(oneToOneImpl); - if (result == null) result = caseRelationshipMapping(oneToOneImpl); - if (result == null) result = caseAttributeMapping(oneToOneImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MANY_TO_MANY: - { - ManyToMany manyToMany = (ManyToMany)theEObject; - T result = caseManyToMany(manyToMany); - if (result == null) result = caseMultiRelationshipMapping(manyToMany); - if (result == null) result = caseRelationshipMapping(manyToMany); - if (result == null) result = caseAttributeMapping(manyToMany); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MANY_TO_MANY_IMPL: - { - ManyToManyImpl manyToManyImpl = (ManyToManyImpl)theEObject; - T result = caseManyToManyImpl(manyToManyImpl); - if (result == null) result = caseManyToMany(manyToManyImpl); - if (result == null) result = caseMultiRelationshipMapping(manyToManyImpl); - if (result == null) result = caseRelationshipMapping(manyToManyImpl); - if (result == null) result = caseAttributeMapping(manyToManyImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EMBEDDED: - { - Embedded embedded = (Embedded)theEObject; - T result = caseEmbedded(embedded); - if (result == null) result = caseAttributeMapping(embedded); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EMBEDDED_IMPL: - { - EmbeddedImpl embeddedImpl = (EmbeddedImpl)theEObject; - T result = caseEmbeddedImpl(embeddedImpl); - if (result == null) result = caseEmbedded(embeddedImpl); - if (result == null) result = caseAttributeMapping(embeddedImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TRANSIENT: - { - Transient transient_ = (Transient)theEObject; - T result = caseTransient(transient_); - if (result == null) result = caseAttributeMapping(transient_); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TRANSIENT_IMPL: - { - TransientImpl transientImpl = (TransientImpl)theEObject; - T result = caseTransientImpl(transientImpl); - if (result == null) result = caseTransient(transientImpl); - if (result == null) result = caseAttributeMapping(transientImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ASSOCIATION_OVERRIDE: - { - AssociationOverride associationOverride = (AssociationOverride)theEObject; - T result = caseAssociationOverride(associationOverride); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ATTRIBUTE_OVERRIDE: - { - AttributeOverride attributeOverride = (AttributeOverride)theEObject; - T result = caseAttributeOverride(attributeOverride); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ATTRIBUTE_OVERRIDE_IMPL: - { - AttributeOverrideImpl attributeOverrideImpl = (AttributeOverrideImpl)theEObject; - T result = caseAttributeOverrideImpl(attributeOverrideImpl); - if (result == null) result = caseAttributeOverride(attributeOverrideImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.CASCADE_TYPE: - { - CascadeType cascadeType = (CascadeType)theEObject; - T result = caseCascadeType(cascadeType); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.CASCADE_TYPE_IMPL: - { - CascadeTypeImpl cascadeTypeImpl = (CascadeTypeImpl)theEObject; - T result = caseCascadeTypeImpl(cascadeTypeImpl); - if (result == null) result = caseCascadeType(cascadeTypeImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.NAMED_COLUMN: - { - NamedColumn namedColumn = (NamedColumn)theEObject; - T result = caseNamedColumn(namedColumn); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ABSTRACT_COLUMN: - { - AbstractColumn abstractColumn = (AbstractColumn)theEObject; - T result = caseAbstractColumn(abstractColumn); - if (result == null) result = caseNamedColumn(abstractColumn); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.COLUMN: - { - Column column = (Column)theEObject; - T result = caseColumn(column); - if (result == null) result = caseAbstractColumn(column); - if (result == null) result = caseNamedColumn(column); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.COLUMN_IMPL: - { - ColumnImpl columnImpl = (ColumnImpl)theEObject; - T result = caseColumnImpl(columnImpl); - if (result == null) result = caseColumn(columnImpl); - if (result == null) result = caseAbstractColumn(columnImpl); - if (result == null) result = caseNamedColumn(columnImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.COLUMN_RESULT: - { - ColumnResult columnResult = (ColumnResult)theEObject; - T result = caseColumnResult(columnResult); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.DISCRIMINATOR_COLUMN: - { - DiscriminatorColumn discriminatorColumn = (DiscriminatorColumn)theEObject; - T result = caseDiscriminatorColumn(discriminatorColumn); - if (result == null) result = caseNamedColumn(discriminatorColumn); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ENTITY_LISTENERS: - { - EntityListeners entityListeners = (EntityListeners)theEObject; - T result = caseEntityListeners(entityListeners); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ENTITY_LISTENER: - { - EntityListener entityListener = (EntityListener)theEObject; - T result = caseEntityListener(entityListener); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ENTITY_RESULT: - { - EntityResult entityResult = (EntityResult)theEObject; - T result = caseEntityResult(entityResult); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.EVENT_METHOD: - { - EventMethod eventMethod = (EventMethod)theEObject; - T result = caseEventMethod(eventMethod); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.FIELD_RESULT: - { - FieldResult fieldResult = (FieldResult)theEObject; - T result = caseFieldResult(fieldResult); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.GENERATED_VALUE: - { - GeneratedValue generatedValue = (GeneratedValue)theEObject; - T result = caseGeneratedValue(generatedValue); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.GENERATED_VALUE_IMPL: - { - GeneratedValueImpl generatedValueImpl = (GeneratedValueImpl)theEObject; - T result = caseGeneratedValueImpl(generatedValueImpl); - if (result == null) result = caseGeneratedValue(generatedValueImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ID_CLASS: - { - IdClass idClass = (IdClass)theEObject; - T result = caseIdClass(idClass); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.INHERITANCE: - { - Inheritance inheritance = (Inheritance)theEObject; - T result = caseInheritance(inheritance); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.JOIN_COLUMN: - { - JoinColumn joinColumn = (JoinColumn)theEObject; - T result = caseJoinColumn(joinColumn); - if (result == null) result = caseAbstractColumn(joinColumn); - if (result == null) result = caseNamedColumn(joinColumn); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.JOIN_COLUMN_IMPL: - { - JoinColumnImpl joinColumnImpl = (JoinColumnImpl)theEObject; - T result = caseJoinColumnImpl(joinColumnImpl); - if (result == null) result = caseJoinColumn(joinColumnImpl); - if (result == null) result = caseAbstractColumn(joinColumnImpl); - if (result == null) result = caseNamedColumn(joinColumnImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.JOIN_TABLE: - { - JoinTable joinTable = (JoinTable)theEObject; - T result = caseJoinTable(joinTable); - if (result == null) result = caseAbstractTable(joinTable); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.JOIN_TABLE_IMPL: - { - JoinTableImpl joinTableImpl = (JoinTableImpl)theEObject; - T result = caseJoinTableImpl(joinTableImpl); - if (result == null) result = caseJoinTable(joinTableImpl); - if (result == null) result = caseAbstractTable(joinTableImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.LOB: - { - Lob lob = (Lob)theEObject; - T result = caseLob(lob); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MAP_KEY: - { - MapKey mapKey = (MapKey)theEObject; - T result = caseMapKey(mapKey); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.MAP_KEY_IMPL: - { - MapKeyImpl mapKeyImpl = (MapKeyImpl)theEObject; - T result = caseMapKeyImpl(mapKeyImpl); - if (result == null) result = caseMapKey(mapKeyImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.QUERY: - { - Query query = (Query)theEObject; - T result = caseQuery(query); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.NAMED_NATIVE_QUERY: - { - NamedNativeQuery namedNativeQuery = (NamedNativeQuery)theEObject; - T result = caseNamedNativeQuery(namedNativeQuery); - if (result == null) result = caseQuery(namedNativeQuery); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.NAMED_QUERY: - { - NamedQuery namedQuery = (NamedQuery)theEObject; - T result = caseNamedQuery(namedQuery); - if (result == null) result = caseQuery(namedQuery); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.POST_LOAD: - { - PostLoad postLoad = (PostLoad)theEObject; - T result = casePostLoad(postLoad); - if (result == null) result = caseEventMethod(postLoad); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.POST_PERSIST: - { - PostPersist postPersist = (PostPersist)theEObject; - T result = casePostPersist(postPersist); - if (result == null) result = caseEventMethod(postPersist); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.POST_REMOVE: - { - PostRemove postRemove = (PostRemove)theEObject; - T result = casePostRemove(postRemove); - if (result == null) result = caseEventMethod(postRemove); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.POST_UPDATE: - { - PostUpdate postUpdate = (PostUpdate)theEObject; - T result = casePostUpdate(postUpdate); - if (result == null) result = caseEventMethod(postUpdate); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PRE_PERSIST: - { - PrePersist prePersist = (PrePersist)theEObject; - T result = casePrePersist(prePersist); - if (result == null) result = caseEventMethod(prePersist); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PRE_REMOVE: - { - PreRemove preRemove = (PreRemove)theEObject; - T result = casePreRemove(preRemove); - if (result == null) result = caseEventMethod(preRemove); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PRE_UPDATE: - { - PreUpdate preUpdate = (PreUpdate)theEObject; - T result = casePreUpdate(preUpdate); - if (result == null) result = caseEventMethod(preUpdate); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.PRIMARY_KEY_JOIN_COLUMN: - { - PrimaryKeyJoinColumn primaryKeyJoinColumn = (PrimaryKeyJoinColumn)theEObject; - T result = casePrimaryKeyJoinColumn(primaryKeyJoinColumn); - if (result == null) result = caseNamedColumn(primaryKeyJoinColumn); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.QUERY_HINT: - { - QueryHint queryHint = (QueryHint)theEObject; - T result = caseQueryHint(queryHint); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.ABSTRACT_TABLE: - { - AbstractTable abstractTable = (AbstractTable)theEObject; - T result = caseAbstractTable(abstractTable); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TABLE: - { - Table table = (Table)theEObject; - T result = caseTable(table); - if (result == null) result = caseAbstractTable(table); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.SECONDARY_TABLE: - { - SecondaryTable secondaryTable = (SecondaryTable)theEObject; - T result = caseSecondaryTable(secondaryTable); - if (result == null) result = caseAbstractTable(secondaryTable); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.GENERATOR: - { - Generator generator = (Generator)theEObject; - T result = caseGenerator(generator); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.SEQUENCE_GENERATOR: - { - SequenceGenerator sequenceGenerator = (SequenceGenerator)theEObject; - T result = caseSequenceGenerator(sequenceGenerator); - if (result == null) result = caseGenerator(sequenceGenerator); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.SEQUENCE_GENERATOR_IMPL: - { - SequenceGeneratorImpl sequenceGeneratorImpl = (SequenceGeneratorImpl)theEObject; - T result = caseSequenceGeneratorImpl(sequenceGeneratorImpl); - if (result == null) result = caseSequenceGenerator(sequenceGeneratorImpl); - if (result == null) result = caseGenerator(sequenceGeneratorImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.SQL_RESULT_SET_MAPPING: - { - SqlResultSetMapping sqlResultSetMapping = (SqlResultSetMapping)theEObject; - T result = caseSqlResultSetMapping(sqlResultSetMapping); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TABLE_GENERATOR: - { - TableGenerator tableGenerator = (TableGenerator)theEObject; - T result = caseTableGenerator(tableGenerator); - if (result == null) result = caseGenerator(tableGenerator); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.TABLE_GENERATOR_IMPL: - { - TableGeneratorImpl tableGeneratorImpl = (TableGeneratorImpl)theEObject; - T result = caseTableGeneratorImpl(tableGeneratorImpl); - if (result == null) result = caseTableGenerator(tableGeneratorImpl); - if (result == null) result = caseGenerator(tableGeneratorImpl); - if (result == null) result = defaultCase(theEObject); - return result; - } - case OrmPackage.UNIQUE_CONSTRAINT: - { - UniqueConstraint uniqueConstraint = (UniqueConstraint)theEObject; - T result = caseUniqueConstraint(uniqueConstraint); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Entity Mappings</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Entity Mappings</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEntityMappings(EntityMappings object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Metadata</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Persistence Unit Metadata</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePersistenceUnitMetadata(PersistenceUnitMetadata object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Persistence Unit Defaults</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Persistence Unit Defaults</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePersistenceUnitDefaults(PersistenceUnitDefaults object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Type Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Type Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTypeMapping(TypeMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Mapped Superclass</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Mapped Superclass</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMappedSuperclass(MappedSuperclass object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Entity</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Entity</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEntity(Entity object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Embeddable</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Embeddable</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEmbeddable(Embeddable object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Attributes</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Attributes</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAttributes(Attributes object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Attribute Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Attribute Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAttributeMapping(AttributeMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Column Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Column Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseColumnMapping(ColumnMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Relationship Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Relationship Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseRelationshipMapping(RelationshipMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Multi Relationship Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Multi Relationship Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMultiRelationshipMapping(MultiRelationshipMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Single Relationship Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Single Relationship Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSingleRelationshipMapping(SingleRelationshipMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Id</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Id</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseId(Id object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Id Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Id Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseIdImpl(IdImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Embedded Id</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Embedded Id</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEmbeddedId(EmbeddedId object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Embedded Id Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Embedded Id Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEmbeddedIdImpl(EmbeddedIdImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Basic</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Basic</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseBasic(Basic object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Basic Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Basic Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseBasicImpl(BasicImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Version</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Version</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseVersion(Version object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Version Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Version Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseVersionImpl(VersionImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Many To One</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Many To One</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseManyToOne(ManyToOne object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Many To One Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Many To One Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseManyToOneImpl(ManyToOneImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>One To Many</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>One To Many</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseOneToMany(OneToMany object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>One To Many Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>One To Many Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseOneToManyImpl(OneToManyImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>One To One</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>One To One</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseOneToOne(OneToOne object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>One To One Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>One To One Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseOneToOneImpl(OneToOneImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Many To Many</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Many To Many</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseManyToMany(ManyToMany object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Many To Many Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Many To Many Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseManyToManyImpl(ManyToManyImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Embedded</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Embedded</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEmbedded(Embedded object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Embedded Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Embedded Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEmbeddedImpl(EmbeddedImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Transient</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Transient</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTransient(Transient object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Transient Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Transient Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTransientImpl(TransientImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Association Override</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Association Override</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAssociationOverride(AssociationOverride object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Attribute Override</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Attribute Override</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAttributeOverride(AttributeOverride object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Attribute Override Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Attribute Override Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAttributeOverrideImpl(AttributeOverrideImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Cascade Type</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Cascade Type</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseCascadeType(CascadeType object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Cascade Type Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Cascade Type Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseCascadeTypeImpl(CascadeTypeImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Named Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Named Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseNamedColumn(NamedColumn object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Abstract Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Abstract Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAbstractColumn(AbstractColumn object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseColumn(Column object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Column Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Column Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseColumnImpl(ColumnImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Column Result</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Column Result</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseColumnResult(ColumnResult object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Discriminator Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Discriminator Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseDiscriminatorColumn(DiscriminatorColumn object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Entity Listeners</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Entity Listeners</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEntityListeners(EntityListeners object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Entity Listener</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Entity Listener</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEntityListener(EntityListener object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Entity Result</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Entity Result</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEntityResult(EntityResult object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Field Result</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Field Result</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseFieldResult(FieldResult object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Generated Value</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Generated Value</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseGeneratedValue(GeneratedValue object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Generated Value Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Generated Value Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseGeneratedValueImpl(GeneratedValueImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Id Class</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Id Class</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseIdClass(IdClass object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Inheritance</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Inheritance</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseInheritance(Inheritance object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Join Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Join Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseJoinColumn(JoinColumn object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Join Column Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Join Column Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseJoinColumnImpl(JoinColumnImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Join Table</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Join Table</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseJoinTable(JoinTable object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Join Table Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Join Table Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseJoinTableImpl(JoinTableImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Lob</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Lob</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseLob(Lob object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Map Key</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Map Key</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMapKey(MapKey object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Map Key Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Map Key Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseMapKeyImpl(MapKeyImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Query</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Query</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseQuery(Query object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Event Method</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Event Method</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseEventMethod(EventMethod object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Named Native Query</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Named Native Query</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseNamedNativeQuery(NamedNativeQuery object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Named Query</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Named Query</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseNamedQuery(NamedQuery object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Post Load</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Post Load</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePostLoad(PostLoad object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Post Persist</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Post Persist</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePostPersist(PostPersist object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Post Remove</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Post Remove</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePostRemove(PostRemove object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Post Update</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Post Update</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePostUpdate(PostUpdate object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Pre Persist</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Pre Persist</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePrePersist(PrePersist object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Pre Remove</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Pre Remove</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePreRemove(PreRemove object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Pre Update</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Pre Update</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePreUpdate(PreUpdate object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Query Hint</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Query Hint</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseQueryHint(QueryHint object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Abstract Table</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Abstract Table</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseAbstractTable(AbstractTable object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Sql Result Set Mapping</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Sql Result Set Mapping</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSqlResultSetMapping(SqlResultSetMapping object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Primary Key Join Column</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Primary Key Join Column</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T casePrimaryKeyJoinColumn(PrimaryKeyJoinColumn object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Secondary Table</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Secondary Table</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSecondaryTable(SecondaryTable object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Generator</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Generator</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseGenerator(Generator object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Sequence Generator</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Sequence Generator</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSequenceGenerator(SequenceGenerator object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Sequence Generator Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Sequence Generator Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSequenceGeneratorImpl(SequenceGeneratorImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Table</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Table</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTable(Table object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Table Generator</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Table Generator</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTableGenerator(TableGenerator object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Table Generator Impl</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Table Generator Impl</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTableGeneratorImpl(TableGeneratorImpl object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Unique Constraint</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Unique Constraint</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseUniqueConstraint(UniqueConstraint object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - public T defaultCase(EObject object) - { - return null; - } - -} //OrmSwitch diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java index ff50003511..94f75c440f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/JavaClassRefTranslator.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.resource.persistence.translators; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; +import org.eclipse.jpt.core.resource.persistence.PersistencePackage; import org.eclipse.wst.common.internal.emf.resource.Translator; public class JavaClassRefTranslator extends Translator diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java index 231ce9ee1a..f7fca54fd9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/MappingFileTranslator.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.resource.persistence.translators; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; +import org.eclipse.jpt.core.resource.persistence.PersistencePackage; import org.eclipse.wst.common.internal.emf.resource.Translator; public class MappingFileTranslator extends Translator diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java index 3a0e0ad9ef..dfc4186d4e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/translators/PersistenceXmlMapper.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jpt.core.internal.resource.persistence.translators; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; +import org.eclipse.jpt.core.resource.persistence.PersistencePackage; public interface PersistenceXmlMapper { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceAdapterFactory.java deleted file mode 100644 index dc2e9d2667..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceAdapterFactory.java +++ /dev/null @@ -1,244 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.resource.persistence.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperties; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperty; - -/** - * <!-- begin-user-doc --> - * The <b>Adapter Factory</b> for the model. - * It provides an adapter <code>createXXX</code> method for each class of the model. - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage - * @generated - */ -public class PersistenceAdapterFactory extends AdapterFactoryImpl -{ - /** - * The cached model package. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static PersistencePackage modelPackage; - - /** - * Creates an instance of the adapter factory. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public PersistenceAdapterFactory() - { - if (modelPackage == null) - { - modelPackage = PersistencePackage.eINSTANCE; - } - } - - /** - * Returns whether this factory is applicable for the type of the object. - * <!-- begin-user-doc --> - * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model. - * <!-- end-user-doc --> - * @return whether this factory is applicable for the type of the object. - * @generated - */ - @Override - public boolean isFactoryForType(Object object) - { - if (object == modelPackage) - { - return true; - } - if (object instanceof EObject) - { - return ((EObject)object).eClass().getEPackage() == modelPackage; - } - return false; - } - - /** - * The switch that delegates to the <code>createXXX</code> methods. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected PersistenceSwitch<Adapter> modelSwitch = - new PersistenceSwitch<Adapter>() - { - @Override - public Adapter caseXmlPersistence(XmlPersistence object) - { - return createXmlPersistenceAdapter(); - } - @Override - public Adapter caseXmlPersistenceUnit(XmlPersistenceUnit object) - { - return createXmlPersistenceUnitAdapter(); - } - @Override - public Adapter caseXmlMappingFileRef(XmlMappingFileRef object) - { - return createXmlMappingFileRefAdapter(); - } - @Override - public Adapter caseXmlJavaClassRef(XmlJavaClassRef object) - { - return createXmlJavaClassRefAdapter(); - } - @Override - public Adapter caseXmlProperties(XmlProperties object) - { - return createXmlPropertiesAdapter(); - } - @Override - public Adapter caseXmlProperty(XmlProperty object) - { - return createXmlPropertyAdapter(); - } - @Override - public Adapter defaultCase(EObject object) - { - return createEObjectAdapter(); - } - }; - - /** - * Creates an adapter for the <code>target</code>. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @param target the object to adapt. - * @return the adapter for the <code>target</code>. - * @generated - */ - @Override - public Adapter createAdapter(Notifier target) - { - return modelSwitch.doSwitch((EObject)target); - } - - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence - * @generated - */ - public Adapter createXmlPersistenceAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit - * @generated - */ - public Adapter createXmlPersistenceUnitAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef - * @generated - */ - public Adapter createXmlMappingFileRefAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef - * @generated - */ - public Adapter createXmlJavaClassRefAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties <em>Xml Properties</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperties - * @generated - */ - public Adapter createXmlPropertiesAdapter() - { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty <em>Xml Property</em>}'. - * <!-- begin-user-doc --> - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * <!-- end-user-doc --> - * @return the new adapter. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty - * @generated - */ - public Adapter createXmlPropertyAdapter() - { - return null; - } - - /** - * Creates a new adapter for the default case. - * <!-- begin-user-doc --> - * This default implementation returns null. - * <!-- end-user-doc --> - * @return the new adapter. - * @generated - */ - public Adapter createEObjectAdapter() - { - return null; - } - -} //PersistenceAdapterFactory diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceSwitch.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceSwitch.java deleted file mode 100644 index 5baf8f47a3..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/util/PersistenceSwitch.java +++ /dev/null @@ -1,266 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.core.internal.resource.persistence.util; - -import java.util.List; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperties; -import org.eclipse.jpt.core.internal.resource.persistence.XmlProperty; - -/** - * <!-- begin-user-doc --> - * The <b>Switch</b> for the model's inheritance hierarchy. - * It supports the call {@link #doSwitch(EObject) doSwitch(object)} - * to invoke the <code>caseXXX</code> method for each class of the model, - * starting with the actual class of the object - * and proceeding up the inheritance hierarchy - * until a non-null result is returned, - * which is the result of the switch. - * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage - * @generated - */ -public class PersistenceSwitch<T> -{ - /** - * The cached model package - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - protected static PersistencePackage modelPackage; - - /** - * Creates an instance of the switch. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - public PersistenceSwitch() - { - if (modelPackage == null) - { - modelPackage = PersistencePackage.eINSTANCE; - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - public T doSwitch(EObject theEObject) - { - return doSwitch(theEObject.eClass(), theEObject); - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected T doSwitch(EClass theEClass, EObject theEObject) - { - if (theEClass.eContainer() == modelPackage) - { - return doSwitch(theEClass.getClassifierID(), theEObject); - } - else - { - List<EClass> eSuperTypes = theEClass.getESuperTypes(); - return - eSuperTypes.isEmpty() ? - defaultCase(theEObject) : - doSwitch(eSuperTypes.get(0), theEObject); - } - } - - /** - * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @return the first non-null result returned by a <code>caseXXX</code> call. - * @generated - */ - protected T doSwitch(int classifierID, EObject theEObject) - { - switch (classifierID) - { - case PersistencePackage.XML_PERSISTENCE: - { - XmlPersistence xmlPersistence = (XmlPersistence)theEObject; - T result = caseXmlPersistence(xmlPersistence); - if (result == null) result = defaultCase(theEObject); - return result; - } - case PersistencePackage.XML_PERSISTENCE_UNIT: - { - XmlPersistenceUnit xmlPersistenceUnit = (XmlPersistenceUnit)theEObject; - T result = caseXmlPersistenceUnit(xmlPersistenceUnit); - if (result == null) result = defaultCase(theEObject); - return result; - } - case PersistencePackage.XML_MAPPING_FILE_REF: - { - XmlMappingFileRef xmlMappingFileRef = (XmlMappingFileRef)theEObject; - T result = caseXmlMappingFileRef(xmlMappingFileRef); - if (result == null) result = defaultCase(theEObject); - return result; - } - case PersistencePackage.XML_JAVA_CLASS_REF: - { - XmlJavaClassRef xmlJavaClassRef = (XmlJavaClassRef)theEObject; - T result = caseXmlJavaClassRef(xmlJavaClassRef); - if (result == null) result = defaultCase(theEObject); - return result; - } - case PersistencePackage.XML_PROPERTIES: - { - XmlProperties xmlProperties = (XmlProperties)theEObject; - T result = caseXmlProperties(xmlProperties); - if (result == null) result = defaultCase(theEObject); - return result; - } - case PersistencePackage.XML_PROPERTY: - { - XmlProperty xmlProperty = (XmlProperty)theEObject; - T result = caseXmlProperty(xmlProperty); - if (result == null) result = defaultCase(theEObject); - return result; - } - default: return defaultCase(theEObject); - } - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Persistence</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Persistence</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlPersistence(XmlPersistence object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Persistence Unit</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Persistence Unit</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlPersistenceUnit(XmlPersistenceUnit object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Mapping File Ref</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Mapping File Ref</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlMappingFileRef(XmlMappingFileRef object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Java Class Ref</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Java Class Ref</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlJavaClassRef(XmlJavaClassRef object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Properties</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Properties</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlProperties(XmlProperties object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>Xml Property</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>Xml Property</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseXmlProperty(XmlProperty object) - { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. - * <!-- begin-user-doc --> - * This implementation returns null; - * returning a non-null result will terminate the switch, but this is the last case anyway. - * <!-- end-user-doc --> - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of '<em>EObject</em>'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) - * @generated - */ - public T defaultCase(EObject object) - { - return null; - } - -} //PersistenceSwitch diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java index d34388967a..11b2a0ddc4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/synch/SynchronizeClassesJob.java @@ -17,16 +17,16 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.JptCoreMessages; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResource; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; -import org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence; -import org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit; +import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; +import org.eclipse.jpt.core.resource.persistence.PersistenceResource; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef; +import org.eclipse.jpt.core.resource.persistence.XmlPersistence; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; /** * Synchronizes the lists of persistent classes in a persistence unit and a @@ -50,7 +50,7 @@ public class SynchronizeClassesJob extends Job return Status.CANCEL_STATUS; } - IJpaFile jpaFile = JptCorePlugin.jpaFile(this.persistenceXmlFile); + JpaFile jpaFile = JptCorePlugin.jpaFile(this.persistenceXmlFile); PersistenceResourceModel persistenceResourceModel = (PersistenceResourceModel) jpaFile.getResourceModel(); PersistenceResource persistenceResource; try { @@ -79,7 +79,7 @@ public class SynchronizeClassesJob extends Job } persistenceUnitResource.getClasses().clear(); - IJpaProject jpaProject = jpaFile.jpaProject(); + JpaProject jpaProject = jpaFile.jpaProject(); //TODO njh - should be checking to see if the reference is necessary // ref is not necessary if defined in the XML, see commented code below diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java new file mode 100644 index 0000000000..52481b0785 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/DefaultJpaValidationMessages.java @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2005, 2007 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.core.internal.validation; + +import org.eclipse.jpt.core.TextRange; +import org.eclipse.wst.validation.internal.core.Message; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; + +public class DefaultJpaValidationMessages + implements JpaValidationMessages +{ + private static String[] DEFAULT_PARMS = new String[0]; + + private static TextRange DEFAULT_TEXT_RANGE = TextRange.Empty.instance(); + + public static IMessage buildMessage( + int severity, String messageId, Object targetObject) { + return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject); + } + + public static IMessage buildMessage( + int severity, String messageId, String[] parms, Object targetObject) { + return buildMessage(severity, messageId, parms, targetObject, DEFAULT_TEXT_RANGE); + } + + public static IMessage buildMessage( + int severity, String messageId, Object targetObject, TextRange textRange) { + return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject, textRange); + } + + public static IMessage buildMessage( + int severity, String messageId, String[] parms, Object targetObject, TextRange textRange) { + IMessage message = new Message(BUNDLE, severity, messageId, parms, targetObject); + message.setLineNo(textRange.getLineNumber()); + message.setOffset(textRange.getOffset()); + message.setLength(textRange.getLength()); + return message; + } + + + private DefaultJpaValidationMessages() { + super(); + throw new UnsupportedOperationException(); + } + +} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/IJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/IJpaValidationMessages.java deleted file mode 100644 index b6fa20698c..0000000000 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/IJpaValidationMessages.java +++ /dev/null @@ -1,127 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005, 2007 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.core.internal.validation; - -public interface IJpaValidationMessages -{ - public static final String BUNDLE = "jpa_validation"; - - - public static final String PROJECT_NO_CONNECTION = "PROJECT_NO_CONNECTION"; - - public static final String PROJECT_INACTIVE_CONNECTION = "PROJECT_INACTIVE_CONNECTION"; - - public static final String PROJECT_NO_PERSISTENCE_XML = "PROJECT_NO_PERSISTENCE_XML"; - - public static final String PROJECT_MULTIPLE_PERSISTENCE_XML = "PROJECT_MULTIPLE_PERSISTENCE_XML"; - - public static final String PERSISTENCE_XML_INVALID_CONTENT = "PERSISTENCE_XML_INVALID_CONTENT"; - - public static final String PERSISTENCE_NO_PERSISTENCE_UNIT = "PERSISTENCE_NO_PERSISTENCE_UNIT"; - - public static final String PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS = "PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS"; - - public static final String PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE = "PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE"; - - public static final String PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE = "PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE"; - - public static final String PERSISTENCE_UNIT_INVALID_MAPPING_FILE = "PERSISTENCE_UNIT_INVALID_MAPPING_FILE"; - - public static final String PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE = "PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE"; - - public static final String PERSISTENCE_UNIT_UNSPECIFIED_CLASS = "PERSISTENCE_UNIT_UNSPECIFIED_CLASS"; - - public static final String PERSISTENCE_UNIT_NONEXISTENT_CLASS = "PERSISTENCE_UNIT_NONEXISTENT_CLASS"; - - public static final String PERSISTENCE_UNIT_INVALID_CLASS = "PERSISTENCE_UNIT_INVALID_CLASS"; - - public static final String PERSISTENCE_UNIT_DUPLICATE_CLASS = "PERSISTENCE_UNIT_DUPLICATE_CLASS"; - - public static final String ENTITY_MAPPINGS_MULTIPLE_METADATA = "ENTITY_MAPPINGS_MULTIPLE_METADATA"; - - public static final String PERSISTENT_TYPE_UNSPECIFIED_CONTEXT = "PERSISTENT_TYPE_UNSPECIFIED_CONTEXT"; - - public static final String PERSISTENT_TYPE_UNSPECIFIED_CLASS = "PERSISTENT_TYPE_UNSPECIFIED_CLASS"; - - public static final String PERSISTENT_TYPE_UNRESOLVED_CLASS = "PERSISTENT_TYPE_UNRESOLVED_CLASS"; - - public static final String ENTITY_NO_ID = "ENTITY_NO_ID"; - - public static final String PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME = "PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME"; - - public static final String PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME = "PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME"; - - public static final String PERSISTENT_ATTRIBUTE_FINAL_FIELD = "PERSISTENT_ATTRIBUTE_FINAL_FIELD"; - - public static final String PERSISTENT_ATTRIBUTE_PUBLIC_FIELD = "PERSISTENT_ATTRIBUTE_PUBLIC_FIELD"; - - public static final String PERSISTENT_ATTRIBUTE_INVALID_MAPPING = "PERSISTENT_ATTRIBUTE_INVALID_MAPPING"; - - public static final String MAPPING_UNRESOLVED_MAPPED_BY = "MAPPING_UNRESOLVED_MAPPED_BY"; - - public static final String MAPPING_INVALID_MAPPED_BY = "MAPPING_INVALID_MAPPED_BY"; - - public static final String MAPPING_MAPPED_BY_WITH_JOIN_TABLE = "MAPPING_MAPPED_BY_WITH_JOIN_TABLE"; - - public static final String MAPPING_MAPPED_BY_ON_BOTH_SIDES = "MAPPING_MAPPED_BY_ON_BOTH_SIDES"; - - public static final String TABLE_UNRESOLVED_SCHEMA = "TABLE_UNRESOLVED_SCHEMA"; - - public static final String TABLE_UNRESOLVED_NAME = "TABLE_UNRESOLVED_NAME"; - - public static final String SECONDARY_TABLE_UNRESOLVED_SCHEMA = "SECONDARY_TABLE_UNRESOLVED_SCHEMA"; - - public static final String SECONDARY_TABLE_UNRESOLVED_NAME = "SECONDARY_TABLE_UNRESOLVED_NAME"; - - public static final String JOIN_TABLE_UNRESOLVED_SCHEMA = "JOIN_TABLE_UNRESOLVED_SCHEMA"; - - public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA"; - - public static final String JOIN_TABLE_UNRESOLVED_NAME = "JOIN_TABLE_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME"; - - public static final String COLUMN_UNRESOLVED_TABLE = "COLUMN_UNRESOLVED_TABLE"; - - public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE"; - - public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE"; - - public static final String COLUMN_UNRESOLVED_NAME = "COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME"; - - public static final String JOIN_COLUMN_UNRESOLVED_TABLE = "JOIN_COLUMN_UNRESOLVED_TABLE"; - - public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE"; - - public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE"; - - public static final String JOIN_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME"; - - public static final String JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; - - public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; - - public static final String GENERATED_VALUE_UNRESOLVED_GENERATOR = "GENERATED_VALUE_UNRESOLVED_GENERATOR"; - - public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME"; - - public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME"; - -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java index bd2e9251da..2544e99abf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java @@ -10,13 +10,13 @@ package org.eclipse.jpt.core.internal.validation; import org.eclipse.core.resources.IResource; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; public class JpaHelper extends org.eclipse.wst.validation.internal.operations.WorkbenchContext { @Override public IResource getResource(Object obj) { - return ((IJpaNode) obj).resource(); + return ((JpaNode) obj).resource(); } /* diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java index f9a16ae423..4a62747165 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidationMessages.java @@ -1,53 +1,127 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 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 - ******************************************************************************/ + * Copyright (c) 2005, 2007 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.core.internal.validation; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.wst.validation.internal.core.Message; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; +public interface JpaValidationMessages +{ + public static final String BUNDLE = "jpa_validation"; + + + public static final String PROJECT_NO_CONNECTION = "PROJECT_NO_CONNECTION"; + + public static final String PROJECT_INACTIVE_CONNECTION = "PROJECT_INACTIVE_CONNECTION"; + + public static final String PROJECT_NO_PERSISTENCE_XML = "PROJECT_NO_PERSISTENCE_XML"; + + public static final String PROJECT_MULTIPLE_PERSISTENCE_XML = "PROJECT_MULTIPLE_PERSISTENCE_XML"; + + public static final String PERSISTENCE_XML_INVALID_CONTENT = "PERSISTENCE_XML_INVALID_CONTENT"; + + public static final String PERSISTENCE_NO_PERSISTENCE_UNIT = "PERSISTENCE_NO_PERSISTENCE_UNIT"; -public class JpaValidationMessages - implements IJpaValidationMessages -{ - private static String[] DEFAULT_PARMS = new String[0]; - - private static ITextRange DEFAULT_TEXT_RANGE = ITextRange.Empty.instance(); - - public static IMessage buildMessage( - int severity, String messageId, Object targetObject) { - return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject); - } - - public static IMessage buildMessage( - int severity, String messageId, String[] parms, Object targetObject) { - return buildMessage(severity, messageId, parms, targetObject, DEFAULT_TEXT_RANGE); - } - - public static IMessage buildMessage( - int severity, String messageId, Object targetObject, ITextRange textRange) { - return buildMessage(severity, messageId, DEFAULT_PARMS, targetObject, textRange); - } - - public static IMessage buildMessage( - int severity, String messageId, String[] parms, Object targetObject, ITextRange textRange) { - IMessage message = new Message(BUNDLE, severity, messageId, parms, targetObject); - message.setLineNo(textRange.getLineNumber()); - message.setOffset(textRange.getOffset()); - message.setLength(textRange.getLength()); - return message; - } - - - private JpaValidationMessages() { - super(); - throw new UnsupportedOperationException(); - } + public static final String PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS = "PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS"; -} + public static final String PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE = "PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE"; + + public static final String PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE = "PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE"; + + public static final String PERSISTENCE_UNIT_INVALID_MAPPING_FILE = "PERSISTENCE_UNIT_INVALID_MAPPING_FILE"; + + public static final String PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE = "PERSISTENCE_UNIT_DUPLICATE_MAPPING_FILE"; + + public static final String PERSISTENCE_UNIT_UNSPECIFIED_CLASS = "PERSISTENCE_UNIT_UNSPECIFIED_CLASS"; + + public static final String PERSISTENCE_UNIT_NONEXISTENT_CLASS = "PERSISTENCE_UNIT_NONEXISTENT_CLASS"; + + public static final String PERSISTENCE_UNIT_INVALID_CLASS = "PERSISTENCE_UNIT_INVALID_CLASS"; + + public static final String PERSISTENCE_UNIT_DUPLICATE_CLASS = "PERSISTENCE_UNIT_DUPLICATE_CLASS"; + + public static final String ENTITY_MAPPINGS_MULTIPLE_METADATA = "ENTITY_MAPPINGS_MULTIPLE_METADATA"; + + public static final String PERSISTENT_TYPE_UNSPECIFIED_CONTEXT = "PERSISTENT_TYPE_UNSPECIFIED_CONTEXT"; + + public static final String PERSISTENT_TYPE_UNSPECIFIED_CLASS = "PERSISTENT_TYPE_UNSPECIFIED_CLASS"; + + public static final String PERSISTENT_TYPE_UNRESOLVED_CLASS = "PERSISTENT_TYPE_UNRESOLVED_CLASS"; + + public static final String ENTITY_NO_ID = "ENTITY_NO_ID"; + + public static final String PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME = "PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME"; + + public static final String PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME = "PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME"; + + public static final String PERSISTENT_ATTRIBUTE_FINAL_FIELD = "PERSISTENT_ATTRIBUTE_FINAL_FIELD"; + + public static final String PERSISTENT_ATTRIBUTE_PUBLIC_FIELD = "PERSISTENT_ATTRIBUTE_PUBLIC_FIELD"; + + public static final String PERSISTENT_ATTRIBUTE_INVALID_MAPPING = "PERSISTENT_ATTRIBUTE_INVALID_MAPPING"; + + public static final String MAPPING_UNRESOLVED_MAPPED_BY = "MAPPING_UNRESOLVED_MAPPED_BY"; + + public static final String MAPPING_INVALID_MAPPED_BY = "MAPPING_INVALID_MAPPED_BY"; + + public static final String MAPPING_MAPPED_BY_WITH_JOIN_TABLE = "MAPPING_MAPPED_BY_WITH_JOIN_TABLE"; + + public static final String MAPPING_MAPPED_BY_ON_BOTH_SIDES = "MAPPING_MAPPED_BY_ON_BOTH_SIDES"; + + public static final String TABLE_UNRESOLVED_SCHEMA = "TABLE_UNRESOLVED_SCHEMA"; + + public static final String TABLE_UNRESOLVED_NAME = "TABLE_UNRESOLVED_NAME"; + + public static final String SECONDARY_TABLE_UNRESOLVED_SCHEMA = "SECONDARY_TABLE_UNRESOLVED_SCHEMA"; + + public static final String SECONDARY_TABLE_UNRESOLVED_NAME = "SECONDARY_TABLE_UNRESOLVED_NAME"; + + public static final String JOIN_TABLE_UNRESOLVED_SCHEMA = "JOIN_TABLE_UNRESOLVED_SCHEMA"; + + public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA"; + + public static final String JOIN_TABLE_UNRESOLVED_NAME = "JOIN_TABLE_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME"; + + public static final String COLUMN_UNRESOLVED_TABLE = "COLUMN_UNRESOLVED_TABLE"; + + public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE"; + + public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE"; + + public static final String COLUMN_UNRESOLVED_NAME = "COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME"; + + public static final String JOIN_COLUMN_UNRESOLVED_TABLE = "JOIN_COLUMN_UNRESOLVED_TABLE"; + + public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE"; + + public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE"; + + public static final String JOIN_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME"; + + public static final String JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; + + public static final String VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME = "VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME"; + + public static final String GENERATED_VALUE_UNRESOLVED_GENERATOR = "GENERATED_VALUE_UNRESOLVED_GENERATOR"; + + public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_NAME"; + + public static final String PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME = "PRIMARY_KEY_JOIN_COLUMN_UNRESOLVED_REFERENCED_COLUMN_NAME"; + +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java index c885758522..3431672296 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java @@ -20,9 +20,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jpt.core.internal.IJpaModel; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaModel; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.utility.internal.model.event.CollectionChangeEvent; import org.eclipse.jpt.utility.internal.model.listener.CollectionChangeListener; import org.eclipse.wst.validation.internal.core.ValidationException; @@ -84,7 +84,7 @@ public class JpaValidator implements IValidatorJob { private static final CollectionChangeListener JPA_MODEL_LISTENER = new LocalCollectionChangeListener(); static { - JptCorePlugin.jpaModel().addCollectionChangeListener(IJpaModel.JPA_PROJECTS_COLLECTION, JPA_MODEL_LISTENER); + JptCorePlugin.jpaModel().addCollectionChangeListener(JpaModel.JPA_PROJECTS_COLLECTION, JPA_MODEL_LISTENER); } /** @@ -106,7 +106,7 @@ public class JpaValidator implements IValidatorJob { */ public void itemsRemoved(CollectionChangeEvent event) { @SuppressWarnings("unchecked") - Iterator<IJpaProject> items = (Iterator<IJpaProject>) event.items(); + Iterator<JpaProject> items = (Iterator<JpaProject>) event.items(); Job j = new DeleteMarkersJob(items.next()); j.schedule(); if (items.hasNext()) { @@ -128,9 +128,9 @@ public class JpaValidator implements IValidatorJob { * Delete all the markers associated with the specified JPA project. */ private static class DeleteMarkersJob extends Job { - private final IJpaProject jpaProject; + private final JpaProject jpaProject; - DeleteMarkersJob(IJpaProject jpaProject) { + DeleteMarkersJob(JpaProject jpaProject) { super("Delete Markers"); this.jpaProject = jpaProject; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaEObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/AbstractJpaEObject.java index d78ef56e36..d45db897fb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaEObject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/AbstractJpaEObject.java @@ -8,7 +8,7 @@ * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.common; +package org.eclipse.jpt.core.resource.common; import java.util.HashSet; import java.util.Hashtable; @@ -21,7 +21,7 @@ import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.wst.common.internal.emf.resource.EMF2DOMAdapter; @@ -35,11 +35,11 @@ import org.w3c.dom.Node; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.common.CommonPackage#getXmlEObject() + * @see org.eclipse.jpt.core.resource.common.CommonPackage#getXmlEObject() * @model kind="class" abstract="true" * @generated */ -public abstract class JpaEObject extends EObjectImpl implements IJpaEObject +public abstract class AbstractJpaEObject extends EObjectImpl implements JpaEObject { protected IDOMNode node; @@ -54,7 +54,7 @@ public abstract class JpaEObject extends EObjectImpl implements IJpaEObject * <!-- end-user-doc --> * @generated */ - protected JpaEObject() { + protected AbstractJpaEObject() { super(); } @@ -72,8 +72,8 @@ public abstract class JpaEObject extends EObjectImpl implements IJpaEObject /* * Must be overridden by actual root object to return itself */ - public IJpaEObject root() { - return ((IJpaEObject) eContainer()).root(); + public JpaEObject root() { + return ((JpaEObject) eContainer()).root(); } @@ -187,25 +187,25 @@ public abstract class JpaEObject extends EObjectImpl implements IJpaEObject @Override protected void didRemove(int index, E oldObject) { super.didRemove(index, oldObject); - if ((oldObject instanceof EMF2DOMAdapter) && (((EMF2DOMAdapter) oldObject).getNode() == JpaEObject.this.node)) { - JpaEObject.this.node = null; + if ((oldObject instanceof EMF2DOMAdapter) && (((EMF2DOMAdapter) oldObject).getNode() == AbstractJpaEObject.this.node)) { + AbstractJpaEObject.this.node = null; } } } - public ITextRange validationTextRange() { + public TextRange validationTextRange() { return fullTextRange(); } - public ITextRange selectionTextRange() { + public TextRange selectionTextRange() { return fullTextRange(); } - public ITextRange fullTextRange() { + public TextRange fullTextRange() { return buildTextRange(this.node); } - protected ITextRange buildTextRange(IDOMNode domNode) { + protected TextRange buildTextRange(IDOMNode domNode) { if (domNode == null) { return null; } @@ -222,7 +222,7 @@ public abstract class JpaEObject extends EObjectImpl implements IJpaEObject /** * Implementation of ITextRange that adapts a IDOMNode. */ - private static class DOMNodeTextRange implements ITextRange + private static class DOMNodeTextRange implements TextRange { private final IDOMNode node; @@ -267,10 +267,10 @@ public abstract class JpaEObject extends EObjectImpl implements IJpaEObject if (o == this) { return true; } - if (!(o instanceof ITextRange)) { + if (!(o instanceof TextRange)) { return false; } - ITextRange r = (ITextRange) o; + TextRange r = (TextRange) o; return (r.getOffset() == this.getOffset()) && (r.getLength() == this.getLength()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaArtifactEdit.java index 56bc770b7c..04e7506c90 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaArtifactEdit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaArtifactEdit.java @@ -8,7 +8,7 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.common; +package org.eclipse.jpt.core.resource.common; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/IJpaEObject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaEObject.java index 4799faea43..493932d319 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/IJpaEObject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaEObject.java @@ -9,13 +9,13 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.common; +package org.eclipse.jpt.core.resource.common; import org.eclipse.core.resources.IResource; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface IJpaEObject extends EObject +public interface JpaEObject extends EObject { /** * Return the resource that most directly contains this object @@ -30,7 +30,7 @@ public interface IJpaEObject extends EObject /** * Return the root object of the model */ - IJpaEObject root(); + JpaEObject root(); /** * Return true if this object's text representation contains the text offset @@ -41,13 +41,13 @@ public interface IJpaEObject extends EObject * Return the text range to be used for validation. This is the source * range that will be highlighted for a validation error. */ - ITextRange validationTextRange(); + TextRange validationTextRange(); /** * Return the text range to be used for selection. This is the source * range that will be highlighted when selecting in the structure view. */ - ITextRange selectionTextRange(); + TextRange selectionTextRange(); boolean isAllFeaturesUnset(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaXmlResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java index 17b30ab8e6..bc2d5f1c6d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaXmlResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResource.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.common; +package org.eclipse.jpt.core.resource.common; import java.util.ArrayList; import java.util.Collection; @@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.jdt.core.ElementChangedEvent; import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase; import org.eclipse.jem.util.plugin.JEMUtilPlugin; -import org.eclipse.jpt.core.internal.IResourceModelListener; +import org.eclipse.jpt.core.ResourceModelListener; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.TranslatorResource; import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl; @@ -29,17 +29,17 @@ public abstract class JpaXmlResource extends TranslatorResourceImpl { protected JpaXmlResourceModel resourceModel; - protected final Collection<IResourceModelListener> resourceModelListeners; + protected final Collection<ResourceModelListener> resourceModelListeners; protected JpaXmlResource(Renderer aRenderer) { super(aRenderer); - this.resourceModelListeners = new ArrayList<IResourceModelListener>(); + this.resourceModelListeners = new ArrayList<ResourceModelListener>(); } protected JpaXmlResource(URI uri, Renderer aRenderer) { super(uri, aRenderer); - this.resourceModelListeners = new ArrayList<IResourceModelListener>(); + this.resourceModelListeners = new ArrayList<ResourceModelListener>(); } /** @@ -129,19 +129,19 @@ public abstract class JpaXmlResource extends TranslatorResourceImpl } public void resourceChanged() { - for (IResourceModelListener listener : this.resourceModelListeners) { + for (ResourceModelListener listener : this.resourceModelListeners) { listener.resourceModelChanged(); } } - public void addResourceModelChangeListener(IResourceModelListener listener) { + public void addResourceModelChangeListener(ResourceModelListener listener) { if (listener == null) { throw new IllegalArgumentException("Listener cannot be null"); } this.resourceModelListeners.add(listener); } - public void removeResourceModelChangeListener(IResourceModelListener listener) { + public void removeResourceModelChangeListener(ResourceModelListener listener) { if (!this.resourceModelListeners.contains(listener)) { throw new IllegalArgumentException("Listener " + listener + " was never added"); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaXmlResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java index 2b6ee5e183..547d3b9d5f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/common/JpaXmlResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.common; +package org.eclipse.jpt.core.resource.common; import java.io.IOException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.ElementChangedEvent; +import org.eclipse.jpt.core.ResourceModelListener; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.AbstractResourceModel; -import org.eclipse.jpt.core.internal.IResourceModelListener; -import org.eclipse.jpt.core.internal.JptCorePlugin; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener; @@ -50,11 +50,11 @@ public abstract class JpaXmlResourceModel extends AbstractResourceModel resource().javaElementChanged(event); } - public void addResourceModelChangeListener(IResourceModelListener listener) { + public void addResourceModelChangeListener(ResourceModelListener listener) { resource().addResourceModelChangeListener(listener); } - public void removeResourceModelChangeListener(IResourceModelListener listener) { + public void removeResourceModelChangeListener(ResourceModelListener listener) { resource().removeResourceModelChangeListener(listener); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AbstractColumnAnnotation.java index 11770dfe3c..2af222b5bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AbstractColumnAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface AbstractColumn extends NamedColumn +public interface AbstractColumnAnnotation extends NamedColumnAnnotation { /** @@ -86,31 +86,31 @@ public interface AbstractColumn extends NamedColumn * Return the ITextRange for the unique element. If the unique element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange uniqueTextRange(CompilationUnit astRoot); + TextRange uniqueTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the nullable element. If the nullable element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange nullableTextRange(CompilationUnit astRoot); + TextRange nullableTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the insertable element. If the insertable element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange insertableTextRange(CompilationUnit astRoot); + TextRange insertableTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the updatable element. If the updatable element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange updatableTextRange(CompilationUnit astRoot); + TextRange updatableTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the table element. If the table element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange tableTextRange(CompilationUnit astRoot); + TextRange tableTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the table element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AccessType.java index 0ce01c1820..56ed5efeff 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AccessType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AccessType.java @@ -8,7 +8,7 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum AccessType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Annotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Annotation.java index 627404890f..28df3ee35f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Annotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Annotation.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -public interface Annotation extends JavaResource +public interface Annotation extends JavaResourceNode { /** * Return the fully qualified annotation name. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AnnotationDefinition.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AnnotationDefinition.java index 37fbc7c1f8..f99280e47f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AnnotationDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AnnotationDefinition.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jpt.core.internal.jdtutility.Member; import org.eclipse.jpt.core.internal.platform.base.BaseJpaPlatform; @@ -31,7 +31,7 @@ public interface AnnotationDefinition /** * Build and return an Annotation given the Member */ - Annotation buildAnnotation(JavaPersistentResource parent, Member member); + Annotation buildAnnotation(JavaResourcePersistentMember parent, Member member); - Annotation buildNullAnnotation(JavaPersistentResource parent, Member member); + Annotation buildNullAnnotation(JavaResourcePersistentMember parent, Member member); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrideAnnotation.java index 0bb5487ecb..26da8a6a10 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrideAnnotation.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; /** * Corresponds to the javax.persistence.AssociationOverride annotation */ -public interface AssociationOverride extends OverrideResource +public interface AssociationOverrideAnnotation extends OverrideAnnotation { String ANNOTATION_NAME = JPA.ASSOCIATION_OVERRIDE; @@ -23,15 +23,15 @@ public interface AssociationOverride extends OverrideResource * Corresponds to the joinColumns element of the AssociationOverride annotation. * Returns an empty iterator if the joinColumns element does not exist in java. */ - ListIterator<JoinColumn> joinColumns(); + ListIterator<JoinColumnAnnotation> joinColumns(); - JoinColumn joinColumnAt(int index); + JoinColumnAnnotation joinColumnAt(int index); - int indexOfJoinColumn(JoinColumn joinColumn); + int indexOfJoinColumn(JoinColumnAnnotation joinColumn); int joinColumnsSize(); - JoinColumn addJoinColumn(int index); + JoinColumnAnnotation addJoinColumn(int index); void removeJoinColumn(int index); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrides.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrides.java index 117958ddf5..f3074f7c3f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AssociationOverrides.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AssociationOverrides.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface AssociationOverrides extends ContainerAnnotation<NestableAssociationOverride> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrideAnnotation.java index 87075273ec..4d1f02cd4b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrideAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.AttributeOverride annotation */ -public interface AttributeOverride extends OverrideResource +public interface AttributeOverrideAnnotation extends OverrideAnnotation { String ANNOTATION_NAME = JPA.ATTRIBUTE_OVERRIDE; @@ -21,19 +21,19 @@ public interface AttributeOverride extends OverrideResource * Corresponds to the column element of the AttributeOverride annotation. * Returns null if the column element does not exist in java. */ - Column getColumn(); + ColumnAnnotation getColumn(); /** * Add the column element to the AttributeOverride annotation. */ - Column addColumn(); + ColumnAnnotation addColumn(); /** * Remove the column element from the AttributeOverride annotation. */ void removeColumn(); - Column getNonNullColumn(); + ColumnAnnotation getNonNullColumn(); String COLUMN_PROPERTY = "columnProperty"; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrides.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrides.java index d39825b3e7..f6dfaa5954 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AttributeOverrides.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/AttributeOverrides.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface AttributeOverrides extends ContainerAnnotation<NestableAttributeOverride> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Basic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Basic.java index 7ca3722186..0a16879f10 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Basic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Basic.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface Basic extends JavaResource +public interface Basic extends JavaResourceNode { String ANNOTATION_NAME = JPA.BASIC; @@ -48,12 +48,12 @@ public interface Basic extends JavaResource * Return the ITextRange for the fetch element. If the fetch element * does not exist return the ITextRange for the Basic annotation. */ - ITextRange fetchTextRange(CompilationUnit astRoot); + TextRange fetchTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the optional element. If the optional element * does not exist return the ITextRange for the Basic annotation. */ - ITextRange optionalTextRange(CompilationUnit astRoot); + TextRange optionalTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/CascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/CascadeType.java index ce100d7cc9..1fb84a16c7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/CascadeType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/CascadeType.java @@ -7,7 +7,8 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; + public enum CascadeType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Column.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java index 0885748875..610a55372a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Column.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ColumnAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface Column extends AbstractColumn +public interface ColumnAnnotation extends AbstractColumnAnnotation { String ANNOTATION_NAME = JPA.COLUMN; @@ -60,18 +60,18 @@ public interface Column extends AbstractColumn * Return the ITextRange for the length element. If length element * does not exist return the ITextRange for the Column annotation. */ - ITextRange lengthTextRange(CompilationUnit astRoot); + TextRange lengthTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the precision element. If precision element * does not exist return the ITextRange for the Column annotation. */ - ITextRange precisionTextRange(CompilationUnit astRoot); + TextRange precisionTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the scale element. If scale element * does not exist return the ITextRange for the Column annotation. */ - ITextRange scaleTextRange(CompilationUnit astRoot); + TextRange scaleTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ContainerAnnotation.java index 0a6aad284f..eeb125ff78 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ContainerAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ContainerAnnotation.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorColumnAnnotation.java index 493a2472b0..311a7a63ef 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorColumnAnnotation.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.DiscriminatorColumn annotation */ -public interface DiscriminatorColumn extends NamedColumn +public interface DiscriminatorColumnAnnotation extends NamedColumnAnnotation { String ANNOTATION_NAME = JPA.DISCRIMINATOR_COLUMN; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorType.java index a59d492490..b4322f1576 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum DiscriminatorType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorValue.java index 2e82140dfe..cc84c72234 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/DiscriminatorValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/DiscriminatorValue.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.OrderBy annotation */ -public interface DiscriminatorValue extends JavaResource +public interface DiscriminatorValue extends JavaResourceNode { String ANNOTATION_NAME = JPA.DISCRIMINATOR_VALUE; @@ -36,6 +36,6 @@ public interface DiscriminatorValue extends JavaResource * Return the ITextRange for the value element. If value element * does not exist return the ITextRange for the DisriminatorValue annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Embeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddableAnnotation.java index b78326bda5..df38e20150 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Embeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddableAnnotation.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.Embeddable annotation */ -public interface Embeddable extends JavaResource +public interface EmbeddableAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.EMBEDDABLE; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Embedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Embedded.java index d2dd8fd9a6..9c729baae6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Embedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Embedded.java @@ -7,10 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface Embedded extends JavaResource +public interface Embedded extends JavaResourceNode { String ANNOTATION_NAME = JPA.EMBEDDED; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedId.java index b97543553c..65320da02c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EmbeddedId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EmbeddedId.java @@ -7,10 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface EmbeddedId extends JavaResource +public interface EmbeddedId extends JavaResourceNode { String ANNOTATION_NAME = JPA.EMBEDDED_ID; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Entity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EntityAnnotation.java index 3d2420014f..11e1f6f0ec 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Entity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EntityAnnotation.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.Entity annotation */ -public interface Entity extends JavaResource +public interface EntityAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.ENTITY; @@ -37,6 +37,6 @@ public interface Entity extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the Entity annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumType.java index 6670795056..c065f80a55 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/EnumType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/EnumType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum EnumType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Enumerated.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Enumerated.java index 010c7bd3c2..0f5ca116dc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Enumerated.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Enumerated.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.Enumerated annotation */ -public interface Enumerated extends JavaResource +public interface Enumerated extends JavaResourceNode { String ANNOTATION_NAME = JPA.ENUMERATED; @@ -36,6 +36,6 @@ public interface Enumerated extends JavaResource * Return the ITextRange for the value element. If the value element * does not exist return the ITextRange for the Enumerated annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/FetchType.java index 4768e64a88..d53948b39f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/FetchType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/FetchType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum FetchType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratedValueAnnotation.java index 57e0cb2752..cf67e9a9ea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratedValueAnnotation.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.GeneratedValue annotation */ -public interface GeneratedValue extends JavaResource +public interface GeneratedValueAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.GENERATED_VALUE; @@ -50,12 +50,12 @@ public interface GeneratedValue extends JavaResource * Return the ITextRange for the generator element. If the generator element * does not exist return the ITextRange for the Enumerated annotation. */ - ITextRange generatorTextRange(CompilationUnit astRoot); + TextRange generatorTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the strategy element. If the strategy element * does not exist return the ITextRange for the Enumerated annotation. */ - ITextRange strategyTextRange(CompilationUnit astRoot); + TextRange strategyTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GenerationType.java index 6e5d7b7244..a4a7656db2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/GenerationType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GenerationType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum GenerationType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Generator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratorAnnotation.java index 1da98e781d..5a33e529d2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Generator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/GeneratorAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface Generator extends JavaResource +public interface GeneratorAnnotation extends JavaResourceNode { /** * Corresponds to the name element of the TableGenerator or SequenceGenerator annotation. @@ -64,19 +64,19 @@ public interface Generator extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the *Generator annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the initialValue element. If the initialValue element * does not exist return the ITextRange for the *Generator annotation. */ - ITextRange initialValueTextRange(CompilationUnit astRoot); + TextRange initialValueTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the allocationSize element. If the allocationSize element * does not exist return the ITextRange for the *Generator annotation. */ - ITextRange allocationSizeTextRange(CompilationUnit astRoot); + TextRange allocationSizeTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Id.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Id.java index af2fe66442..97c600fc1f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Id.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Id.java @@ -7,10 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface Id extends JavaResource +public interface Id extends JavaResourceNode { String ANNOTATION_NAME = JPA.ID; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdClass.java index 58b4eeafda..63aa92186e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/IdClass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/IdClass.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * This interface corresponds to the javax.persistence.IdClass annotation */ -public interface IdClass extends JavaResource +public interface IdClass extends JavaResourceNode { final String ANNOTATION_NAME = JPA.ID_CLASS; @@ -53,6 +53,6 @@ public interface IdClass extends JavaResource * Return the ITextRange for the value element. If the value element * does not exist return the ITextRange for the IdClass annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Inheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Inheritance.java index cc04587a4c..19f599bee0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Inheritance.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Inheritance.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.Inheritance annotation */ -public interface Inheritance extends JavaResource +public interface Inheritance extends JavaResourceNode { String ANNOTATION_NAME = JPA.INHERITANCE; @@ -28,6 +28,6 @@ public interface Inheritance extends JavaResource * Return the ITextRange for the strategy element. If the strategy element * does not exist return the ITextRange for the Inheritance annotation. */ - ITextRange strategyTextRange(CompilationUnit astRoot); + TextRange strategyTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceType.java index 65cada71e9..90e1fdd3c2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/InheritanceType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/InheritanceType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum InheritanceType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JPA.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JPA.java index 810960b68b..84d9531d4b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JPA.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JPA.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceNode.java index 1293852736..09c674a984 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourceNode.java @@ -7,15 +7,17 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.IJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.JpaAnnotationProvider; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; +import org.eclipse.jpt.core.internal.resource.java.JpaCompilationUnitResource; import org.eclipse.jpt.utility.internal.CommandExecutorProvider; import org.eclipse.jpt.utility.internal.node.Node; -public interface JavaResource extends Node +public interface JavaResourceNode extends Node { void initialize(CompilationUnit astRoot); @@ -23,7 +25,7 @@ public interface JavaResource extends Node JpaCompilationUnitResource root(); - IJpaAnnotationProvider annotationProvider(); + JpaAnnotationProvider annotationProvider(); CommandExecutorProvider modifySharedDocumentCommandExecutorProvider(); @@ -37,5 +39,5 @@ public interface JavaResource extends Node /** * Return the ITextRange */ - ITextRange textRange(CompilationUnit astRoot); + TextRange textRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentAttribute.java index e26c71f2ad..ef306a6313 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentAttributeResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentAttribute.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jpt.core.internal.jdtutility.Member; @@ -16,7 +16,7 @@ import org.eclipse.jpt.core.internal.jdtutility.Member; // @Basic // private String foo, bar; -public interface JavaPersistentAttributeResource extends JavaPersistentResource +public interface JavaResourcePersistentAttribute extends JavaResourcePersistentMember { String getName(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentMember.java index 75a9476141..e1111b2a46 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentMember.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; import org.eclipse.jpt.core.internal.platform.base.BaseJpaPlatform; -public interface JavaPersistentResource extends JavaResource +public interface JavaResourcePersistentMember extends JavaResourceNode { /** @@ -25,7 +25,7 @@ public interface JavaPersistentResource extends JavaResource * Entity, MappedSuperclass, Embeddable. * <p>Does not return duplicate annotations as this error is handled by the java compiler. */ - <T extends JavaResource> Iterator<T> mappingAnnotations(); + <T extends JavaResourceNode> Iterator<T> mappingAnnotations(); String MAPPING_ANNOTATIONS_COLLECTION = "mappingAnnotationsCollection"; @@ -37,7 +37,7 @@ public interface JavaPersistentResource extends JavaResource * {@link BaseJpaPlatform#attributeMappingAnnotationDefinitions()} * @return */ - JavaResource mappingAnnotation(); + JavaResourceNode mappingAnnotation(); /** * Returns the <code>JavaResource</code> with this fully qualifed annotation name. @@ -48,7 +48,7 @@ public interface JavaPersistentResource extends JavaResource * @return */ //TODO not sure we need this API, first 2 seem sufficient - JavaResource mappingAnnotation(String annotationName); + JavaResourceNode mappingAnnotation(String annotationName); /** * Use this to change the type mapping annotation. This will only remove @@ -64,7 +64,7 @@ public interface JavaPersistentResource extends JavaResource * No <code>MappingAnnotation</code>s should be included. * @see #mappingAnnotations() */ - <T extends JavaResource> Iterator<T> annotations(); + <T extends JavaResourceNode> Iterator<T> annotations(); String ANNOTATIONS_COLLECTION = "annotationsCollection"; @@ -78,7 +78,7 @@ public interface JavaPersistentResource extends JavaResource * return the nestable annotations specified within the container annotation. This is * only going to return JavaResources that match the nestableAnnotationName */ - <T extends JavaResource> ListIterator<T> annotations(String nestableAnnotationName, String containerAnnotationName); + <T extends JavaResourceNode> ListIterator<T> annotations(String nestableAnnotationName, String containerAnnotationName); /** @@ -87,7 +87,7 @@ public interface JavaPersistentResource extends JavaResource * @param annotationName * @return */ - JavaResource annotation(String annotationName); + JavaResourceNode annotation(String annotationName); /** * Returns the <code>JavaResource</code> with this fully qualifed annotation name. @@ -96,7 +96,7 @@ public interface JavaPersistentResource extends JavaResource * @param annotationName * @return */ - JavaResource nonNullAnnotation(String annotationName); + JavaResourceNode nonNullAnnotation(String annotationName); /** * Returns the <code>JavaResource</code> with this fully qualifed annotation name. @@ -105,12 +105,12 @@ public interface JavaPersistentResource extends JavaResource * @param annotationName * @return */ - JavaResource nonNullMappingAnnotation(String annotationName); + JavaResourceNode nonNullMappingAnnotation(String annotationName); /** * Add an annotation for the given fully qualified annotation name */ - JavaResource addAnnotation(String annotationName); + JavaResourceNode addAnnotation(String annotationName); void removeAnnotation(String annotationName); @@ -122,7 +122,7 @@ public interface JavaPersistentResource extends JavaResource * also adding the new one. If neither exists, create a new nestable annotation. * @return the new JavaResource with the name nestableAnnotationName */ - JavaResource addAnnotation(int index, String nestableAnnotationName, String containerAnnotationName); + JavaResourceNode addAnnotation(int index, String nestableAnnotationName, String containerAnnotationName); void removeAnnotation(int index, String nestableAnnotationName, String containerAnnotationName); @@ -156,6 +156,6 @@ public interface JavaPersistentResource extends JavaResource /** * return the text range for the name of the persistent resource */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentType.java index f9ab8d317c..7a350bbce2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaPersistentTypeResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JavaResourcePersistentType.java @@ -7,46 +7,46 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.Iterator; import org.eclipse.jpt.core.internal.jdtutility.Member; -public interface JavaPersistentTypeResource extends JavaPersistentResource +public interface JavaResourcePersistentType extends JavaResourcePersistentMember { /** * Return only the persistable nestedTypes */ - Iterator<JavaPersistentTypeResource> nestedTypes(); + Iterator<JavaResourcePersistentType> nestedTypes(); String NESTED_TYPES_COLLECTION = "nestedTypesCollection"; /** * Return only the persistable attributes, those that respond true to - * {@link JavaPersistentAttributeResource#isPersistable()} + * {@link JavaResourcePersistentAttribute#isPersistable()} * This returns fields and properties * @return */ - Iterator<JavaPersistentAttributeResource> attributes(); + Iterator<JavaResourcePersistentAttribute> attributes(); String ATTRIBUTES_COLLECTION = "attributesCollection"; /** * Return only the persistable fields, those that respond true to - * {@link JavaPersistentAttributeResource#isPersistable()} + * {@link JavaResourcePersistentAttribute#isPersistable()} * This returns filters out all properties and only returns fields * @return */ - Iterator<JavaPersistentAttributeResource> fields(); + Iterator<JavaResourcePersistentAttribute> fields(); /** * Return only the persistable fields, those that respond true to - * {@link JavaPersistentAttributeResource#isPersistable()} + * {@link JavaResourcePersistentAttribute#isPersistable()} * This returns filters out all fields and only returns properties * @return */ - Iterator<JavaPersistentAttributeResource> properties(); + Iterator<JavaResourcePersistentAttribute> properties(); - JavaPersistentTypeResource javaPersistentTypeResource(String fullyQualifiedTypeName); + JavaResourcePersistentType javaPersistentTypeResource(String fullyQualifiedTypeName); /** * Return the fully qualified type name diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java index 64ba213410..7ce5049517 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumnAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface JoinColumn extends AbstractColumn +public interface JoinColumnAnnotation extends AbstractColumnAnnotation { String ANNOTATION_NAME = JPA.JOIN_COLUMN; @@ -35,7 +35,7 @@ public interface JoinColumn extends AbstractColumn * referencedColumnName element does not exist return the ITextRange * for the JoinColumn annotation. */ - ITextRange referencedColumnNameTextRange(CompilationUnit astRoot); + TextRange referencedColumnNameTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the referencedColumnName element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumns.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumns.java index fe16741052..7ad833fc8b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinColumns.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinColumns.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface JoinColumns extends ContainerAnnotation<NestableJoinColumn> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinTableAnnotation.java index 2b0e2eecb2..06aaca3f82 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/JoinTableAnnotation.java @@ -7,38 +7,38 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; -public interface JoinTable extends Table +public interface JoinTableAnnotation extends TableAnnotation { String ANNOTATION_NAME = JPA.JOIN_TABLE; - ListIterator<JoinColumn> joinColumns(); + ListIterator<JoinColumnAnnotation> joinColumns(); - JoinColumn joinColumnAt(int index); + JoinColumnAnnotation joinColumnAt(int index); - int indexOfJoinColumn(JoinColumn joinColumn); + int indexOfJoinColumn(JoinColumnAnnotation joinColumn); int joinColumnsSize(); - JoinColumn addJoinColumn(int index); + JoinColumnAnnotation addJoinColumn(int index); void removeJoinColumn(int index); void moveJoinColumn(int targetIndex, int sourceIndex); String JOIN_COLUMNS_LIST = "joinColumnsList"; - ListIterator<JoinColumn> inverseJoinColumns(); + ListIterator<JoinColumnAnnotation> inverseJoinColumns(); - JoinColumn inverseJoinColumnAt(int index); + JoinColumnAnnotation inverseJoinColumnAt(int index); - int indexOfInverseJoinColumn(JoinColumn joinColumn); + int indexOfInverseJoinColumn(JoinColumnAnnotation joinColumn); int inverseJoinColumnsSize(); - JoinColumn addInverseJoinColumn(int index); + JoinColumnAnnotation addInverseJoinColumn(int index); void removeInverseJoinColumn(int index); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Lob.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Lob.java index 8000242ad4..39c7cf6131 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Lob.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Lob.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.Lob annotation */ -public interface Lob extends JavaResource +public interface Lob extends JavaResourceNode { String ANNOTATION_NAME = JPA.LOB; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToMany.java index db1281ce13..70313bd26d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToMany.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface ManyToMany extends RelationshipMapping +public interface ManyToMany extends RelationshipMappingAnnotation { String ANNOTATION_NAME = JPA.MANY_TO_MANY; @@ -34,7 +34,7 @@ public interface ManyToMany extends RelationshipMapping * Return the ITextRange for the mappedBy element. If the mappedBy element * does not exist return the ITextRange for the ManyToMany annotation. */ - ITextRange mappedByTextRange(CompilationUnit astRoot); + TextRange mappedByTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the mappedBy element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToOne.java index 8da89e934b..b4367a0170 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/ManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/ManyToOne.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface ManyToOne extends RelationshipMapping +public interface ManyToOne extends RelationshipMappingAnnotation { String ANNOTATION_NAME = JPA.MANY_TO_ONE; @@ -34,6 +34,6 @@ public interface ManyToOne extends RelationshipMapping * Return the ITextRange for the optional element. If the optional element * does not exist return the ITextRange for the ManyToOne annotation. */ - ITextRange optionalTextRange(CompilationUnit astRoot); + TextRange optionalTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKey.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MapKey.java index 6b3ef7cfb7..c71f168861 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MapKey.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MapKey.java @@ -1,12 +1,12 @@ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.MapKey annotation */ -public interface MapKey extends JavaResource +public interface MapKey extends JavaResourceNode { String ANNOTATION_NAME = JPA.MAP_KEY; @@ -18,7 +18,7 @@ public interface MapKey extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the MapKey annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the name element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MappedSuperclassAnnotation.java index c2176c5141..2cc4224d32 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/MappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/MappedSuperclassAnnotation.java @@ -7,10 +7,10 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface MappedSuperclass extends JavaResource +public interface MappedSuperclassAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.MAPPED_SUPERCLASS; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java index 2b74348f53..a3cde83ef9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedColumnAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface NamedColumn extends JavaResource +public interface NamedColumnAnnotation extends JavaResourceNode { /** * Corresponds to the name element of the *Column annotation. @@ -45,13 +45,13 @@ public interface NamedColumn extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the *Column annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the columnDefinition element. If the columnDefinition * element does not exist return the ITextRange for the *Column annotation. */ - ITextRange columnDefinitionTextRange(CompilationUnit astRoot); + TextRange columnDefinitionTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the name element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueries.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueries.java index 6c5411798d..9f09ef39c2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQueries.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueries.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface NamedNativeQueries extends ContainerAnnotation<NestableNamedNativeQuery> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueryAnnotation.java index 031805f3b1..64db61f1b0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedNativeQueryAnnotation.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.NamedNativeQuery annotation */ -public interface NamedNativeQuery extends Query +public interface NamedNativeQueryAnnotation extends QueryAnnotation { String ANNOTATION_NAME = JPA.NAMED_NATIVE_QUERY; @@ -53,13 +53,13 @@ public interface NamedNativeQuery extends Query * Return the ITextRange for the resultClass element. If resultClass element * does not exist return the ITextRange for the NamedNativeQuery annotation. */ - ITextRange resultClassTextRange(CompilationUnit astRoot); + TextRange resultClassTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the resultSetMapping element. If resultSetMapping element * does not exist return the ITextRange for the NamedNativeQuery annotation. */ - ITextRange resultSetMappingTextRange(CompilationUnit astRoot); + TextRange resultSetMappingTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueries.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueries.java index aa4d867556..9208e57707 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQueries.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueries.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface NamedQueries extends ContainerAnnotation<NestableNamedQuery> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueryAnnotation.java index 65ed8460bb..91400693e1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NamedQueryAnnotation.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.NamedQuery annotation */ -public interface NamedQuery extends Query +public interface NamedQueryAnnotation extends QueryAnnotation { String ANNOTATION_NAME = JPA.NAMED_QUERY; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAnnotation.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAnnotation.java index 36229ce0d3..a86e51924d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAnnotation.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface NestableAnnotation extends Annotation diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.java new file mode 100644 index 0000000000..b1a9e0f2d2 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAssociationOverride.java @@ -0,0 +1,5 @@ +package org.eclipse.jpt.core.resource.java; + +public interface NestableAssociationOverride + extends AssociationOverrideAnnotation, NestableAnnotation +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.java new file mode 100644 index 0000000000..a5982a796b --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableAttributeOverride.java @@ -0,0 +1,5 @@ +package org.eclipse.jpt.core.resource.java; + +public interface NestableAttributeOverride + extends AttributeOverrideAnnotation, NestableAnnotation +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java new file mode 100644 index 0000000000..d0296c80fb --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableJoinColumn.java @@ -0,0 +1,4 @@ +package org.eclipse.jpt.core.resource.java; + +public interface NestableJoinColumn extends JoinColumnAnnotation, NestableAnnotation +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedNativeQuery.java index 05ee12d7fa..e44ff0096a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableNamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedNativeQuery.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface NestableNamedNativeQuery extends NamedNativeQuery, NestableAnnotation +public interface NestableNamedNativeQuery extends NamedNativeQueryAnnotation, NestableAnnotation {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableNamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedQuery.java index 85d0cb8ed5..66ed5e3668 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableNamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableNamedQuery.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface NestableNamedQuery extends NamedQuery, NestableAnnotation +public interface NestableNamedQuery extends NamedQueryAnnotation, NestableAnnotation {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestablePrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestablePrimaryKeyJoinColumn.java index 1a7f8741ac..2ae4989324 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestablePrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestablePrimaryKeyJoinColumn.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -interface NestablePrimaryKeyJoinColumn extends PrimaryKeyJoinColumn, NestableAnnotation +public interface NestablePrimaryKeyJoinColumn extends PrimaryKeyJoinColumnAnnotation, NestableAnnotation {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableQueryHint.java index b64e966b60..5ccc0aefce 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableQueryHint.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; -public interface NestableQueryHint extends QueryHint, NestableAnnotation +public interface NestableQueryHint extends QueryHintAnnotation, NestableAnnotation {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.java new file mode 100644 index 0000000000..31ea418d25 --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableSecondaryTable.java @@ -0,0 +1,4 @@ +package org.eclipse.jpt.core.resource.java; + +public interface NestableSecondaryTable extends SecondaryTableAnnotation, NestableAnnotation +{} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableUniqueConstraint.java index 366206bbcb..7ccb08d578 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NestableUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/NestableUniqueConstraint.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface NestableUniqueConstraint extends UniqueConstraint, NestableAnnotation {} diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToMany.java index d243d76c19..5698d2633e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToMany.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface OneToMany extends RelationshipMapping +public interface OneToMany extends RelationshipMappingAnnotation { String ANNOTATION_NAME = JPA.ONE_TO_MANY; @@ -34,7 +34,7 @@ public interface OneToMany extends RelationshipMapping * Return the ITextRange for the mappedBy element. If the mappedBy element * does not exist return the ITextRange for the OneToMany annotation. */ - ITextRange mappedByTextRange(CompilationUnit astRoot); + TextRange mappedByTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the mappedBy element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToOne.java index bc7524d5bd..66265b4f3d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OneToOne.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface OneToOne extends RelationshipMapping +public interface OneToOne extends RelationshipMappingAnnotation { String ANNOTATION_NAME = JPA.ONE_TO_ONE; @@ -47,13 +47,13 @@ public interface OneToOne extends RelationshipMapping * Return the ITextRange for the mappedBy element. If the mappedBy element * does not exist return the ITextRange for the OneToOne annotation. */ - ITextRange mappedByTextRange(CompilationUnit astRoot); + TextRange mappedByTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the optional element. If the optional element * does not exist return the ITextRange for the OneToOne annotation. */ - ITextRange optionalTextRange(CompilationUnit astRoot); + TextRange optionalTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the mappedBy element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderBy.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OrderBy.java index 840bda9f89..556cf50fcc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OrderBy.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OrderBy.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.OrderBy annotation */ -public interface OrderBy extends JavaResource +public interface OrderBy extends JavaResourceNode { String ANNOTATION_NAME = JPA.ORDER_BY; @@ -36,6 +36,6 @@ public interface OrderBy extends JavaResource * Return the ITextRange for the value element. If the value element * does not exist return the ITextRange for the OrderBy annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OverrideAnnotation.java index a2bcce1a13..c1f3b5da99 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/OverrideResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/OverrideAnnotation.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.AttributeOverride annotation */ -public interface OverrideResource extends JavaResource +public interface OverrideAnnotation extends JavaResourceNode { /** @@ -35,7 +35,7 @@ public interface OverrideResource extends JavaResource * Return the ITextRange for the name element. If name element * does not exist return the ITextRange for the AttributeOverride annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the table element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumnAnnotation.java index 9beeb4d454..b27410dfed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumnAnnotation.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface PrimaryKeyJoinColumn extends NamedColumn +public interface PrimaryKeyJoinColumnAnnotation extends NamedColumnAnnotation { String ANNOTATION_NAME = JPA.PRIMARY_KEY_JOIN_COLUMN; @@ -31,6 +31,6 @@ public interface PrimaryKeyJoinColumn extends NamedColumn * Return the ITextRange for the referencedColumnName element. If the referencedColumnName * element does not exist return the ITextRange for the PrimaryKeyJoinColumn annotation. */ - ITextRange referencedColumnNameTextRange(CompilationUnit astRoot); + TextRange referencedColumnNameTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumns.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumns.java index aa138896f6..b80e53f70f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/PrimaryKeyJoinColumns.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/PrimaryKeyJoinColumns.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface PrimaryKeyJoinColumns extends ContainerAnnotation<NestablePrimaryKeyJoinColumn> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Query.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryAnnotation.java index 2b773ab540..952d1ae416 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Query.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface Query extends JavaResource +public interface QueryAnnotation extends JavaResourceNode { String getName(); void setName(String name); @@ -23,15 +23,15 @@ public interface Query extends JavaResource void setQuery(String query); String QUERY_PROPERTY = "queryProperty"; - ListIterator<QueryHint> hints(); + ListIterator<QueryHintAnnotation> hints(); - QueryHint hintAt(int index); + QueryHintAnnotation hintAt(int index); - int indexOfHint(QueryHint hint); + int indexOfHint(QueryHintAnnotation hint); int hintsSize(); - QueryHint addHint(int index); + QueryHintAnnotation addHint(int index); void removeHint(int index); @@ -42,12 +42,12 @@ public interface Query extends JavaResource * Return the ITextRange for the name element. If name element * does not exist return the ITextRange for the *Query annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the query element. If query element * does not exist return the ITextRange for the *Query annotation. */ - ITextRange queryTextRange(CompilationUnit astRoot); + TextRange queryTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryHintAnnotation.java index ae34487564..209672d0e8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/QueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/QueryHintAnnotation.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.QueryHint annotation */ -public interface QueryHint extends JavaResource +public interface QueryHintAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.QUERY_HINT; @@ -49,12 +49,12 @@ public interface QueryHint extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the QueryHint annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the value element. If the value element * does not exist return the ITextRange for the QueryHint annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/RelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/RelationshipMappingAnnotation.java index 86f713160e..fd73953917 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/RelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/RelationshipMappingAnnotation.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface RelationshipMapping extends JavaResource +public interface RelationshipMappingAnnotation extends JavaResourceNode { /** * Corresponds to the targetEntity element of the relationship @@ -87,18 +87,18 @@ public interface RelationshipMapping extends JavaResource * Return the ITextRange for the targetEntity element. If the targetEntity element * does not exist return the ITextRange for the mapping annotation. */ - ITextRange targetEntityTextRange(CompilationUnit astRoot); + TextRange targetEntityTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the fetch element. If the fetch element * does not exist return the ITextRange for the mapping annotation. */ - ITextRange fetchTextRange(CompilationUnit astRoot); + TextRange fetchTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the cascade element. If the cascade element * does not exist return the ITextRange for the mapping annotation. */ - ITextRange cascadeTextRange(CompilationUnit astRoot); + TextRange cascadeTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTableAnnotation.java index 5873e8b101..3a6690f9d5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTableAnnotation.java @@ -7,24 +7,24 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; -public interface SecondaryTable extends Table +public interface SecondaryTableAnnotation extends TableAnnotation { String ANNOTATION_NAME = JPA.SECONDARY_TABLE; - ListIterator<PrimaryKeyJoinColumn> pkJoinColumns(); + ListIterator<PrimaryKeyJoinColumnAnnotation> pkJoinColumns(); - PrimaryKeyJoinColumn pkJoinColumnAt(int index); + PrimaryKeyJoinColumnAnnotation pkJoinColumnAt(int index); - int indexOfPkJoinColumn(PrimaryKeyJoinColumn pkJoinColumn); + int indexOfPkJoinColumn(PrimaryKeyJoinColumnAnnotation pkJoinColumn); int pkJoinColumnsSize(); - PrimaryKeyJoinColumn addPkJoinColumn(int index); + PrimaryKeyJoinColumnAnnotation addPkJoinColumn(int index); void removePkJoinColumn(int index); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTables.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTables.java index df10a3cabc..db7bd6a248 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SecondaryTables.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SecondaryTables.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public interface SecondaryTables extends ContainerAnnotation<NestableSecondaryTable> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SequenceGeneratorAnnotation.java index 5d7510ea56..fea527ee9f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/SequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/SequenceGeneratorAnnotation.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.SequenceGenerator annotation */ -public interface SequenceGenerator extends Generator +public interface SequenceGeneratorAnnotation extends GeneratorAnnotation { String ANNOTATION_NAME = JPA.SEQUENCE_GENERATOR; @@ -39,7 +39,7 @@ public interface SequenceGenerator extends Generator * Return the ITextRange for the sequenceName element. If the sequenceName element * does not exist return the ITextRange for the SequenceGenerator annotation. */ - ITextRange sequenceNameTextRange(CompilationUnit astRoot); + TextRange sequenceNameTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Table.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableAnnotation.java index 9c3db55e29..7414570de1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Table.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableAnnotation.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; -public interface Table extends JavaResource +public interface TableAnnotation extends JavaResourceNode { String ANNOTATION_NAME = JPA.TABLE; @@ -48,19 +48,19 @@ public interface Table extends JavaResource * Return the ITextRange for the name element. If the name element * does not exist return the ITextRange for the *Table annotation. */ - ITextRange nameTextRange(CompilationUnit astRoot); + TextRange nameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the catalog element. If the catalog element * does not exist return the ITextRange for the *Table annotation. */ - ITextRange catalogTextRange(CompilationUnit astRoot); + TextRange catalogTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the schema element. If the schema element * does not exist return the ITextRange for the *Table annotation. */ - ITextRange schemaTextRange(CompilationUnit astRoot); + TextRange schemaTextRange(CompilationUnit astRoot); /** * Return whether the specified postition touches the name element. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableGeneratorAnnotation.java index 87b6897a0b..71a2b38bbb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TableGeneratorAnnotation.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.TableGenerator annotation */ -public interface TableGenerator extends Generator +public interface TableGeneratorAnnotation extends GeneratorAnnotation { String ANNOTATION_NAME = JPA.TABLE_GENERATOR; @@ -130,36 +130,36 @@ public interface TableGenerator extends Generator * Return the ITextRange for the table element. If the table element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange tableTextRange(CompilationUnit astRoot); + TextRange tableTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the catalog element. If the catalog element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange catalogTextRange(CompilationUnit astRoot); + TextRange catalogTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the schema element. If the schema element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange schemaTextRange(CompilationUnit astRoot); + TextRange schemaTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the pkColumnName element. If the pkColumnName element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange pkColumnNameTextRange(CompilationUnit astRoot); + TextRange pkColumnNameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the valueColumnName element. If the valueColumnName element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange valueColumnNameTextRange(CompilationUnit astRoot); + TextRange valueColumnNameTextRange(CompilationUnit astRoot); /** * Return the ITextRange for the pkColumnValue element. If the pkColumnValue element * does not exist return the ITextRange for the TableGenerator annotation. */ - ITextRange pkColumnValueTextRange(CompilationUnit astRoot); + TextRange pkColumnValueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Temporal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Temporal.java index 2e7a1a8eb0..a4418d5851 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Temporal.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Temporal.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.internal.ITextRange; +import org.eclipse.jpt.core.TextRange; /** * Corresponds to the javax.persistence.Temporal annotation */ -public interface Temporal extends JavaResource +public interface Temporal extends JavaResourceNode { String ANNOTATION_NAME = JPA.TEMPORAL; @@ -36,6 +36,6 @@ public interface Temporal extends JavaResource * Return the ITextRange for the value element. If the value element * does not exist return the ITextRange for the Temporal annotation. */ - ITextRange valueTextRange(CompilationUnit astRoot); + TextRange valueTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalType.java index add5a13e9a..d1fa0a9c53 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/TemporalType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/TemporalType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; public enum TemporalType { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Transient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Transient.java index 4d86d7451e..186e9015e7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Transient.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Transient.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.Transient annotation */ -public interface Transient extends JavaResource +public interface Transient extends JavaResourceNode { String ANNOTATION_NAME = JPA.TRANSIENT; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraint.java index e0913f94ec..6b6c796646 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/UniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/UniqueConstraint.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; @@ -15,7 +15,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; /** * Corresponds to the javax.persistence.UniqueConstraint annotation */ -public interface UniqueConstraint extends JavaResource +public interface UniqueConstraint extends JavaResourceNode { String ANNOTATION_NAME = JPA.UNIQUE_CONSTRAINT; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Version.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Version.java index 29172ed4bb..b5a1e88bef 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/Version.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/java/Version.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.java; +package org.eclipse.jpt.core.resource.java; /** * Corresponds to the javax.persistence.Version annotation */ -public interface Version extends JavaResource +public interface Version extends JavaResourceNode { String ANNOTATION_NAME = JPA.VERSION; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractTypeMapping.java index 97b9df136e..7ce309e427 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractTypeMapping.java @@ -6,15 +6,15 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -24,20 +24,20 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getClassName <em>Class Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAccess <em>Access</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getMetadataComplete <em>Metadata Complete</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAttributes <em>Attributes</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getClassName <em>Class Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAccess <em>Access</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getMetadataComplete <em>Metadata Complete</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAttributes <em>Attributes</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping() * @model kind="class" abstract="true" * @extends IJpaEObject * @generated */ -public abstract class TypeMapping extends JpaEObject implements IJpaEObject +public abstract class AbstractTypeMapping extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. @@ -130,7 +130,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @generated */ - protected TypeMapping() + protected AbstractTypeMapping() { super(); } @@ -156,7 +156,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Class Name</em>' attribute. * @see #setClassName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping_ClassName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping_ClassName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -166,7 +166,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getClassName <em>Class Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getClassName <em>Class Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Class Name</em>' attribute. @@ -184,7 +184,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Access</b></em>' attribute. * The default value is <code>"PROPERTY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.AccessType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Access</em>' attribute isn't clear, @@ -192,9 +192,9 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #setAccess(AccessType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping_Access() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping_Access() * @model default="PROPERTY" * @generated */ @@ -204,11 +204,11 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAccess <em>Access</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAccess <em>Access</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #getAccess() * @generated */ @@ -230,7 +230,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Metadata Complete</em>' attribute. * @see #setMetadataComplete(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping_MetadataComplete() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping_MetadataComplete() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -240,7 +240,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getMetadataComplete <em>Metadata Complete</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getMetadataComplete <em>Metadata Complete</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Metadata Complete</em>' attribute. @@ -265,7 +265,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping_Description() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping_Description() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -275,7 +275,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getDescription <em>Description</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getDescription <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Description</em>' attribute. @@ -300,7 +300,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Attributes</em>' containment reference. * @see #setAttributes(Attributes) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping_Attributes() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping_Attributes() * @model containment="true" * @generated */ @@ -327,7 +327,7 @@ public abstract class TypeMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAttributes <em>Attributes</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAttributes <em>Attributes</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Attributes</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AccessType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AccessType.java index b89bae74d3..d731ef4cd3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AccessType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AccessType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Access Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAccessType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeOverrideImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AttributeOverrideImpl.java index b810efc97b..44660b8519 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeOverrideImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AttributeOverrideImpl.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,11 +22,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverrideImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverrideImpl() * @model kind="class" * @generated */ -public class AttributeOverrideImpl extends JpaEObject implements AttributeOverride +public class AttributeOverrideImpl extends AbstractJpaEObject implements XmlAttributeOverride { /** * The cached value of the '{@link #getColumn() <em>Column</em>}' containment reference. @@ -36,7 +36,7 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri * @generated * @ordered */ - protected Column column; + protected XmlColumn column; /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -88,12 +88,12 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride_Column() * @model containment="true" required="true" * @generated */ - public Column getColumn() + public XmlColumn getColumn() { return column; } @@ -103,9 +103,9 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetColumn(Column newColumn, NotificationChain msgs) + public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs) { - Column oldColumn = column; + XmlColumn oldColumn = column; column = newColumn; if (eNotificationRequired()) { @@ -116,14 +116,14 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - public void setColumn(Column newColumn) + public void setColumn(XmlColumn newColumn) { if (newColumn != column) { @@ -149,7 +149,7 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -159,7 +159,7 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -219,7 +219,7 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri switch (featureID) { case OrmPackage.ATTRIBUTE_OVERRIDE_IMPL__COLUMN: - setColumn((Column)newValue); + setColumn((XmlColumn)newValue); return; case OrmPackage.ATTRIBUTE_OVERRIDE_IMPL__NAME: setName((String)newValue); @@ -239,7 +239,7 @@ public class AttributeOverrideImpl extends JpaEObject implements AttributeOverri switch (featureID) { case OrmPackage.ATTRIBUTE_OVERRIDE_IMPL__COLUMN: - setColumn((Column)null); + setColumn((XmlColumn)null); return; case OrmPackage.ATTRIBUTE_OVERRIDE_IMPL__NAME: setName(NAME_EDEFAULT); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Attributes.java index 5db8f1b3cb..9906f44cc8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Attributes.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Attributes.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -16,8 +16,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -27,25 +27,25 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getIds <em>Ids</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getBasics <em>Basics</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getVersions <em>Versions</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getTransients <em>Transients</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getIds <em>Ids</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getBasics <em>Basics</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getVersions <em>Versions</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Attributes#getTransients <em>Transients</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes() * @model kind="class" * @extends IJpaEObject * @generated */ -public class Attributes extends JpaEObject implements IJpaEObject +public class Attributes extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getIds() <em>Ids</em>}' containment reference list. @@ -55,7 +55,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Id> ids; + protected EList<XmlId> ids; /** * The cached value of the '{@link #getEmbeddedIds() <em>Embedded Ids</em>}' containment reference list. @@ -65,7 +65,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<EmbeddedId> embeddedIds; + protected EList<XmlEmbeddedId> embeddedIds; /** * The cached value of the '{@link #getBasics() <em>Basics</em>}' containment reference list. @@ -75,7 +75,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Basic> basics; + protected EList<XmlBasic> basics; /** * The cached value of the '{@link #getVersions() <em>Versions</em>}' containment reference list. @@ -85,7 +85,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Version> versions; + protected EList<XmlVersion> versions; /** * The cached value of the '{@link #getManyToOnes() <em>Many To Ones</em>}' containment reference list. @@ -95,7 +95,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<ManyToOne> manyToOnes; + protected EList<XmlManyToOne> manyToOnes; /** * The cached value of the '{@link #getOneToManys() <em>One To Manys</em>}' containment reference list. @@ -105,7 +105,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<OneToMany> oneToManys; + protected EList<XmlOneToMany> oneToManys; /** * The cached value of the '{@link #getOneToOnes() <em>One To Ones</em>}' containment reference list. @@ -115,7 +115,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<OneToOne> oneToOnes; + protected EList<XmlOneToOne> oneToOnes; /** * The cached value of the '{@link #getManyToManys() <em>Many To Manys</em>}' containment reference list. @@ -125,7 +125,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<ManyToMany> manyToManys; + protected EList<XmlManyToMany> manyToManys; /** * The cached value of the '{@link #getEmbeddeds() <em>Embeddeds</em>}' containment reference list. @@ -135,7 +135,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Embedded> embeddeds; + protected EList<XmlEmbedded> embeddeds; /** * The cached value of the '{@link #getTransients() <em>Transients</em>}' containment reference list. @@ -145,7 +145,7 @@ public class Attributes extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Transient> transients; + protected EList<XmlTransient> transients; /** * <!-- begin-user-doc --> @@ -170,7 +170,7 @@ public class Attributes extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Ids</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Id}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlId}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Ids</em>' containment reference list isn't clear, @@ -178,22 +178,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Ids</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_Ids() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Ids() * @model containment="true" * @generated */ - public EList<Id> getIds() + public EList<XmlId> getIds() { if (ids == null) { - ids = new EObjectContainmentEList<Id>(Id.class, this, OrmPackage.ATTRIBUTES__IDS); + ids = new EObjectContainmentEList<XmlId>(XmlId.class, this, OrmPackage.ATTRIBUTES__IDS); } return ids; } /** * Returns the value of the '<em><b>Embedded Ids</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Embedded Ids</em>' containment reference list isn't clear, @@ -201,22 +201,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Embedded Ids</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_EmbeddedIds() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_EmbeddedIds() * @model containment="true" * @generated */ - public EList<EmbeddedId> getEmbeddedIds() + public EList<XmlEmbeddedId> getEmbeddedIds() { if (embeddedIds == null) { - embeddedIds = new EObjectContainmentEList<EmbeddedId>(EmbeddedId.class, this, OrmPackage.ATTRIBUTES__EMBEDDED_IDS); + embeddedIds = new EObjectContainmentEList<XmlEmbeddedId>(XmlEmbeddedId.class, this, OrmPackage.ATTRIBUTES__EMBEDDED_IDS); } return embeddedIds; } /** * Returns the value of the '<em><b>Basics</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Basic}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlBasic}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Basics</em>' containment reference list isn't clear, @@ -224,22 +224,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Basics</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_Basics() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Basics() * @model containment="true" * @generated */ - public EList<Basic> getBasics() + public EList<XmlBasic> getBasics() { if (basics == null) { - basics = new EObjectContainmentEList<Basic>(Basic.class, this, OrmPackage.ATTRIBUTES__BASICS); + basics = new EObjectContainmentEList<XmlBasic>(XmlBasic.class, this, OrmPackage.ATTRIBUTES__BASICS); } return basics; } /** * Returns the value of the '<em><b>Versions</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Version}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlVersion}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Versions</em>' containment reference list isn't clear, @@ -247,22 +247,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Versions</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_Versions() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Versions() * @model containment="true" * @generated */ - public EList<Version> getVersions() + public EList<XmlVersion> getVersions() { if (versions == null) { - versions = new EObjectContainmentEList<Version>(Version.class, this, OrmPackage.ATTRIBUTES__VERSIONS); + versions = new EObjectContainmentEList<XmlVersion>(XmlVersion.class, this, OrmPackage.ATTRIBUTES__VERSIONS); } return versions; } /** * Returns the value of the '<em><b>Many To Ones</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.ManyToOne}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlManyToOne}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Many To Ones</em>' containment reference list isn't clear, @@ -270,22 +270,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Many To Ones</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_ManyToOnes() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_ManyToOnes() * @model containment="true" * @generated */ - public EList<ManyToOne> getManyToOnes() + public EList<XmlManyToOne> getManyToOnes() { if (manyToOnes == null) { - manyToOnes = new EObjectContainmentEList<ManyToOne>(ManyToOne.class, this, OrmPackage.ATTRIBUTES__MANY_TO_ONES); + manyToOnes = new EObjectContainmentEList<XmlManyToOne>(XmlManyToOne.class, this, OrmPackage.ATTRIBUTES__MANY_TO_ONES); } return manyToOnes; } /** * Returns the value of the '<em><b>One To Manys</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.OneToMany}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlOneToMany}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>One To Manys</em>' containment reference list isn't clear, @@ -293,22 +293,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>One To Manys</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_OneToManys() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_OneToManys() * @model containment="true" * @generated */ - public EList<OneToMany> getOneToManys() + public EList<XmlOneToMany> getOneToManys() { if (oneToManys == null) { - oneToManys = new EObjectContainmentEList<OneToMany>(OneToMany.class, this, OrmPackage.ATTRIBUTES__ONE_TO_MANYS); + oneToManys = new EObjectContainmentEList<XmlOneToMany>(XmlOneToMany.class, this, OrmPackage.ATTRIBUTES__ONE_TO_MANYS); } return oneToManys; } /** * Returns the value of the '<em><b>One To Ones</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.OneToOne}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlOneToOne}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>One To Ones</em>' containment reference list isn't clear, @@ -316,22 +316,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>One To Ones</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_OneToOnes() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_OneToOnes() * @model containment="true" * @generated */ - public EList<OneToOne> getOneToOnes() + public EList<XmlOneToOne> getOneToOnes() { if (oneToOnes == null) { - oneToOnes = new EObjectContainmentEList<OneToOne>(OneToOne.class, this, OrmPackage.ATTRIBUTES__ONE_TO_ONES); + oneToOnes = new EObjectContainmentEList<XmlOneToOne>(XmlOneToOne.class, this, OrmPackage.ATTRIBUTES__ONE_TO_ONES); } return oneToOnes; } /** * Returns the value of the '<em><b>Many To Manys</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.ManyToMany}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlManyToMany}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Many To Manys</em>' containment reference list isn't clear, @@ -339,22 +339,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Many To Manys</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_ManyToManys() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_ManyToManys() * @model containment="true" * @generated */ - public EList<ManyToMany> getManyToManys() + public EList<XmlManyToMany> getManyToManys() { if (manyToManys == null) { - manyToManys = new EObjectContainmentEList<ManyToMany>(ManyToMany.class, this, OrmPackage.ATTRIBUTES__MANY_TO_MANYS); + manyToManys = new EObjectContainmentEList<XmlManyToMany>(XmlManyToMany.class, this, OrmPackage.ATTRIBUTES__MANY_TO_MANYS); } return manyToManys; } /** * Returns the value of the '<em><b>Embeddeds</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Embedded}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbedded}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Embeddeds</em>' containment reference list isn't clear, @@ -362,22 +362,22 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Embeddeds</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_Embeddeds() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Embeddeds() * @model containment="true" * @generated */ - public EList<Embedded> getEmbeddeds() + public EList<XmlEmbedded> getEmbeddeds() { if (embeddeds == null) { - embeddeds = new EObjectContainmentEList<Embedded>(Embedded.class, this, OrmPackage.ATTRIBUTES__EMBEDDEDS); + embeddeds = new EObjectContainmentEList<XmlEmbedded>(XmlEmbedded.class, this, OrmPackage.ATTRIBUTES__EMBEDDEDS); } return embeddeds; } /** * Returns the value of the '<em><b>Transients</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Transient}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlTransient}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Transients</em>' containment reference list isn't clear, @@ -385,15 +385,15 @@ public class Attributes extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Transients</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes_Transients() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes_Transients() * @model containment="true" * @generated */ - public EList<Transient> getTransients() + public EList<XmlTransient> getTransients() { if (transients == null) { - transients = new EObjectContainmentEList<Transient>(Transient.class, this, OrmPackage.ATTRIBUTES__TRANSIENTS); + transients = new EObjectContainmentEList<XmlTransient>(XmlTransient.class, this, OrmPackage.ATTRIBUTES__TRANSIENTS); } return transients; } @@ -479,43 +479,43 @@ public class Attributes extends JpaEObject implements IJpaEObject { case OrmPackage.ATTRIBUTES__IDS: getIds().clear(); - getIds().addAll((Collection<? extends Id>)newValue); + getIds().addAll((Collection<? extends XmlId>)newValue); return; case OrmPackage.ATTRIBUTES__EMBEDDED_IDS: getEmbeddedIds().clear(); - getEmbeddedIds().addAll((Collection<? extends EmbeddedId>)newValue); + getEmbeddedIds().addAll((Collection<? extends XmlEmbeddedId>)newValue); return; case OrmPackage.ATTRIBUTES__BASICS: getBasics().clear(); - getBasics().addAll((Collection<? extends Basic>)newValue); + getBasics().addAll((Collection<? extends XmlBasic>)newValue); return; case OrmPackage.ATTRIBUTES__VERSIONS: getVersions().clear(); - getVersions().addAll((Collection<? extends Version>)newValue); + getVersions().addAll((Collection<? extends XmlVersion>)newValue); return; case OrmPackage.ATTRIBUTES__MANY_TO_ONES: getManyToOnes().clear(); - getManyToOnes().addAll((Collection<? extends ManyToOne>)newValue); + getManyToOnes().addAll((Collection<? extends XmlManyToOne>)newValue); return; case OrmPackage.ATTRIBUTES__ONE_TO_MANYS: getOneToManys().clear(); - getOneToManys().addAll((Collection<? extends OneToMany>)newValue); + getOneToManys().addAll((Collection<? extends XmlOneToMany>)newValue); return; case OrmPackage.ATTRIBUTES__ONE_TO_ONES: getOneToOnes().clear(); - getOneToOnes().addAll((Collection<? extends OneToOne>)newValue); + getOneToOnes().addAll((Collection<? extends XmlOneToOne>)newValue); return; case OrmPackage.ATTRIBUTES__MANY_TO_MANYS: getManyToManys().clear(); - getManyToManys().addAll((Collection<? extends ManyToMany>)newValue); + getManyToManys().addAll((Collection<? extends XmlManyToMany>)newValue); return; case OrmPackage.ATTRIBUTES__EMBEDDEDS: getEmbeddeds().clear(); - getEmbeddeds().addAll((Collection<? extends Embedded>)newValue); + getEmbeddeds().addAll((Collection<? extends XmlEmbedded>)newValue); return; case OrmPackage.ATTRIBUTES__TRANSIENTS: getTransients().clear(); - getTransients().addAll((Collection<? extends Transient>)newValue); + getTransients().addAll((Collection<? extends XmlTransient>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/BasicImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/BasicImpl.java index 12091c7028..27db6d2382 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/BasicImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/BasicImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,11 +25,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasicImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasicImpl() * @model kind="class" * @generated */ -public class BasicImpl extends JpaEObject implements Basic +public class BasicImpl extends AbstractJpaEObject implements XmlBasic { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -59,7 +59,7 @@ public class BasicImpl extends JpaEObject implements Basic * @generated * @ordered */ - protected Column column; + protected XmlColumn column; /** * changed this to null and removed the generated flag so emf won't generate over it @@ -180,7 +180,7 @@ public class BasicImpl extends JpaEObject implements Basic * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -190,7 +190,7 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -214,12 +214,12 @@ public class BasicImpl extends JpaEObject implements Basic * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column() * @model containment="true" * @generated */ - public Column getColumn() + public XmlColumn getColumn() { return column; } @@ -229,9 +229,9 @@ public class BasicImpl extends JpaEObject implements Basic * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetColumn(Column newColumn, NotificationChain msgs) + public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs) { - Column oldColumn = column; + XmlColumn oldColumn = column; column = newColumn; if (eNotificationRequired()) { @@ -242,14 +242,14 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - public void setColumn(Column newColumn) + public void setColumn(XmlColumn newColumn) { if (newColumn != column) { @@ -268,7 +268,7 @@ public class BasicImpl extends JpaEObject implements Basic /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -276,9 +276,9 @@ public class BasicImpl extends JpaEObject implements Basic * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Fetch() * @model default="LAZY" * @generated */ @@ -288,11 +288,11 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -314,7 +314,7 @@ public class BasicImpl extends JpaEObject implements Basic * <!-- end-user-doc --> * @return the value of the '<em>Optional</em>' attribute. * @see #setOptional(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Optional() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Optional() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -324,7 +324,7 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getOptional <em>Optional</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getOptional <em>Optional</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Optional</em>' attribute. @@ -349,7 +349,7 @@ public class BasicImpl extends JpaEObject implements Basic * <!-- end-user-doc --> * @return the value of the '<em>Lob</em>' attribute. * @see #setLob(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Lob() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Lob() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -359,7 +359,7 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#isLob <em>Lob</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#isLob <em>Lob</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Lob</em>' attribute. @@ -376,7 +376,7 @@ public class BasicImpl extends JpaEObject implements Basic /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -384,9 +384,9 @@ public class BasicImpl extends JpaEObject implements Basic * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Temporal() * @model * @generated */ @@ -396,11 +396,11 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ @@ -414,7 +414,7 @@ public class BasicImpl extends JpaEObject implements Basic /** * Returns the value of the '<em><b>Enumerated</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.EnumType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.EnumType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Enumerated</em>' attribute isn't clear, @@ -422,9 +422,9 @@ public class BasicImpl extends JpaEObject implements Basic * </p> * <!-- end-user-doc --> * @return the value of the '<em>Enumerated</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.EnumType * @see #setEnumerated(EnumType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Enumerated() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Enumerated() * @model * @generated */ @@ -434,11 +434,11 @@ public class BasicImpl extends JpaEObject implements Basic } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl#getEnumerated <em>Enumerated</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl#getEnumerated <em>Enumerated</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Enumerated</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.EnumType * @see #getEnumerated() * @generated */ @@ -508,7 +508,7 @@ public class BasicImpl extends JpaEObject implements Basic setName((String)newValue); return; case OrmPackage.BASIC_IMPL__COLUMN: - setColumn((Column)newValue); + setColumn((XmlColumn)newValue); return; case OrmPackage.BASIC_IMPL__FETCH: setFetch((FetchType)newValue); @@ -543,7 +543,7 @@ public class BasicImpl extends JpaEObject implements Basic setName(NAME_EDEFAULT); return; case OrmPackage.BASIC_IMPL__COLUMN: - setColumn((Column)null); + setColumn((XmlColumn)null); return; case OrmPackage.BASIC_IMPL__FETCH: setFetch(FETCH_EDEFAULT); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/CascadeType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeType.java index 27284069c4..f60381de89 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/CascadeType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeType.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,20 +19,20 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface CascadeType extends IJpaEObject +public interface CascadeType extends JpaEObject { /** * Returns the value of the '<em><b>Cascade All</b></em>' attribute. @@ -44,14 +44,14 @@ public interface CascadeType extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade All</em>' attribute. * @see #setCascadeAll(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeAll() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeAll() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isCascadeAll(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade All</em>' attribute. @@ -70,14 +70,14 @@ public interface CascadeType extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade Persist</em>' attribute. * @see #setCascadePersist(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadePersist() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isCascadePersist(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Persist</em>' attribute. @@ -96,14 +96,14 @@ public interface CascadeType extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade Merge</em>' attribute. * @see #setCascadeMerge(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeMerge() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeMerge() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isCascadeMerge(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Merge</em>' attribute. @@ -122,14 +122,14 @@ public interface CascadeType extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade Remove</em>' attribute. * @see #setCascadeRemove(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRemove() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isCascadeRemove(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Remove</em>' attribute. @@ -148,14 +148,14 @@ public interface CascadeType extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade Refresh</em>' attribute. * @see #setCascadeRefresh(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeRefresh() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRefresh() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isCascadeRefresh(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Refresh</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/CascadeTypeImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeTypeImpl.java index a7d4efa0df..3a2efe0649 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/CascadeTypeImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/CascadeTypeImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeTypeImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl() * @model kind="class" * @generated */ -public class CascadeTypeImpl extends JpaEObject implements CascadeType +public class CascadeTypeImpl extends AbstractJpaEObject implements CascadeType { /** * The default value of the '{@link #isCascadeAll() <em>Cascade All</em>}' attribute. @@ -157,7 +157,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType * <!-- end-user-doc --> * @return the value of the '<em>Cascade All</em>' attribute. * @see #setCascadeAll(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeAll() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeAll() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -167,7 +167,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl#isCascadeAll <em>Cascade All</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeAll <em>Cascade All</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade All</em>' attribute. @@ -192,7 +192,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType * <!-- end-user-doc --> * @return the value of the '<em>Cascade Persist</em>' attribute. * @see #setCascadePersist(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadePersist() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -202,7 +202,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl#isCascadePersist <em>Cascade Persist</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadePersist <em>Cascade Persist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Persist</em>' attribute. @@ -227,7 +227,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType * <!-- end-user-doc --> * @return the value of the '<em>Cascade Merge</em>' attribute. * @see #setCascadeMerge(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeMerge() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeMerge() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -237,7 +237,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl#isCascadeMerge <em>Cascade Merge</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeMerge <em>Cascade Merge</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Merge</em>' attribute. @@ -262,7 +262,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType * <!-- end-user-doc --> * @return the value of the '<em>Cascade Remove</em>' attribute. * @see #setCascadeRemove(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRemove() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -272,7 +272,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl#isCascadeRemove <em>Cascade Remove</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeRemove <em>Cascade Remove</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Remove</em>' attribute. @@ -297,7 +297,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType * <!-- end-user-doc --> * @return the value of the '<em>Cascade Refresh</em>' attribute. * @see #setCascadeRefresh(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType_CascadeRefresh() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType_CascadeRefresh() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -307,7 +307,7 @@ public class CascadeTypeImpl extends JpaEObject implements CascadeType } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl#isCascadeRefresh <em>Cascade Refresh</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl#isCascadeRefresh <em>Cascade Refresh</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Refresh</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnImpl.java index 55bfc9192e..f4adce1691 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; @@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,11 +23,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnImpl() * @model kind="class" * @generated */ -public class ColumnImpl extends JpaEObject implements Column +public class ColumnImpl extends AbstractJpaEObject implements XmlColumn { /** * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute. @@ -260,7 +260,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Column Definition</em>' attribute. * @see #setColumnDefinition(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -270,7 +270,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getColumnDefinition <em>Column Definition</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getColumnDefinition <em>Column Definition</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column Definition</em>' attribute. @@ -295,7 +295,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -305,7 +305,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -330,7 +330,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Insertable</em>' attribute. * @see #setInsertable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Insertable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Insertable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -340,7 +340,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getInsertable <em>Insertable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getInsertable <em>Insertable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Insertable</em>' attribute. @@ -365,7 +365,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Nullable</em>' attribute. * @see #setNullable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Nullable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Nullable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -375,7 +375,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getNullable <em>Nullable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getNullable <em>Nullable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Nullable</em>' attribute. @@ -400,7 +400,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' attribute. * @see #setTable(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Table() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Table() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -410,7 +410,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getTable <em>Table</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getTable <em>Table</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' attribute. @@ -435,7 +435,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Unique</em>' attribute. * @see #setUnique(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Unique() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Unique() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -445,7 +445,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getUnique <em>Unique</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getUnique <em>Unique</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Unique</em>' attribute. @@ -470,7 +470,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Updatable</em>' attribute. * @see #setUpdatable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Updatable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Updatable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -480,7 +480,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getUpdatable <em>Updatable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getUpdatable <em>Updatable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Updatable</em>' attribute. @@ -505,7 +505,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Length</em>' attribute. * @see #setLength(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Length() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Length() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -515,7 +515,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getLength <em>Length</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getLength <em>Length</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Length</em>' attribute. @@ -540,7 +540,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Precision</em>' attribute. * @see #setPrecision(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Precision() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Precision() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -550,7 +550,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getPrecision <em>Precision</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getPrecision <em>Precision</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Precision</em>' attribute. @@ -575,7 +575,7 @@ public class ColumnImpl extends JpaEObject implements Column * <!-- end-user-doc --> * @return the value of the '<em>Scale</em>' attribute. * @see #setScale(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Scale() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Scale() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -585,7 +585,7 @@ public class ColumnImpl extends JpaEObject implements Column } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl#getScale <em>Scale</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl#getScale <em>Scale</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Scale</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnMapping.java index 8d9f7866c7..ea9581cced 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnMapping.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,16 +19,16 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping#getColumn <em>Column</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface ColumnMapping extends IJpaEObject +public interface ColumnMapping extends JpaEObject { /** * Returns the value of the '<em><b>Column</b></em>' containment reference. @@ -39,21 +39,21 @@ public interface ColumnMapping extends IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column() * @model containment="true" * @generated */ - Column getColumn(); + XmlColumn getColumn(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - void setColumn(Column value); + void setColumn(XmlColumn value); } // ColumnMapping diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnResult.java index eccbb8573a..19d41bf957 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ColumnResult.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ColumnResult.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,16 +23,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.ColumnResult#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnResult() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult() * @model kind="class" * @extends IJpaEObject * @generated */ -public class ColumnResult extends JpaEObject implements IJpaEObject +public class ColumnResult extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -85,7 +85,7 @@ public class ColumnResult extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnResult_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -95,7 +95,7 @@ public class ColumnResult extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/DiscriminatorType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/DiscriminatorType.java index d2773d8b83..03cd38079d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/DiscriminatorType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/DiscriminatorType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Discriminator Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedIdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EmbeddedIdImpl.java index c6d495c88e..e175159d33 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedIdImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EmbeddedIdImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedIdImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedIdImpl() * @model kind="class" * @generated */ -public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId +public class EmbeddedIdImpl extends AbstractJpaEObject implements XmlEmbeddedId { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -60,7 +60,7 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId * @generated * @ordered */ - protected EList<AttributeOverride> attributeOverrides; + protected EList<XmlAttributeOverride> attributeOverrides; /** * <!-- begin-user-doc --> @@ -93,7 +93,7 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -103,7 +103,7 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -120,7 +120,7 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId /** * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear, @@ -128,15 +128,15 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedId_AttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedId_AttributeOverrides() * @model containment="true" * @generated */ - public EList<AttributeOverride> getAttributeOverrides() + public EList<XmlAttributeOverride> getAttributeOverrides() { if (attributeOverrides == null) { - attributeOverrides = new EObjectContainmentEList<AttributeOverride>(AttributeOverride.class, this, OrmPackage.EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES); + attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES); } return attributeOverrides; } @@ -191,7 +191,7 @@ public class EmbeddedIdImpl extends JpaEObject implements EmbeddedId return; case OrmPackage.EMBEDDED_ID_IMPL__ATTRIBUTE_OVERRIDES: getAttributeOverrides().clear(); - getAttributeOverrides().addAll((Collection<? extends AttributeOverride>)newValue); + getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EmbeddedImpl.java index f418fb67bd..4c3cce11bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EmbeddedImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedImpl() * @model kind="class" * @generated */ -public class EmbeddedImpl extends JpaEObject implements Embedded +public class EmbeddedImpl extends AbstractJpaEObject implements XmlEmbedded { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -60,7 +60,7 @@ public class EmbeddedImpl extends JpaEObject implements Embedded * @generated * @ordered */ - protected EList<AttributeOverride> attributeOverrides; + protected EList<XmlAttributeOverride> attributeOverrides; /** * <!-- begin-user-doc --> @@ -93,7 +93,7 @@ public class EmbeddedImpl extends JpaEObject implements Embedded * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -103,7 +103,7 @@ public class EmbeddedImpl extends JpaEObject implements Embedded } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -120,7 +120,7 @@ public class EmbeddedImpl extends JpaEObject implements Embedded /** * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear, @@ -128,15 +128,15 @@ public class EmbeddedImpl extends JpaEObject implements Embedded * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbedded_AttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbedded_AttributeOverrides() * @model containment="true" * @generated */ - public EList<AttributeOverride> getAttributeOverrides() + public EList<XmlAttributeOverride> getAttributeOverrides() { if (attributeOverrides == null) { - attributeOverrides = new EObjectContainmentEList<AttributeOverride>(AttributeOverride.class, this, OrmPackage.EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES); + attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES); } return attributeOverrides; } @@ -191,7 +191,7 @@ public class EmbeddedImpl extends JpaEObject implements Embedded return; case OrmPackage.EMBEDDED_IMPL__ATTRIBUTE_OVERRIDES: getAttributeOverrides().clear(); - getAttributeOverrides().addAll((Collection<? extends AttributeOverride>)newValue); + getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityListener.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListener.java index c141a5d5f5..adba9e49bd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityListener.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListener.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,23 +25,23 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getClassName <em>Class Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getClassName <em>Class Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener() * @model kind="class" * @extends IJpaEObject * @generated */ -public class EntityListener extends JpaEObject implements IJpaEObject +public class EntityListener extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. @@ -164,7 +164,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Class Name</em>' attribute. * @see #setClassName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_ClassName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_ClassName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -174,7 +174,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getClassName <em>Class Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getClassName <em>Class Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Class Name</em>' attribute. @@ -199,7 +199,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Pre Persist</em>' containment reference. * @see #setPrePersist(PrePersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PrePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PrePersist() * @model containment="true" * @generated */ @@ -226,7 +226,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Persist</em>' containment reference. @@ -259,7 +259,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Post Persist</em>' containment reference. * @see #setPostPersist(PostPersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PostPersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostPersist() * @model containment="true" * @generated */ @@ -286,7 +286,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Persist</em>' containment reference. @@ -319,7 +319,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Pre Remove</em>' containment reference. * @see #setPreRemove(PreRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PreRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PreRemove() * @model containment="true" * @generated */ @@ -346,7 +346,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Remove</em>' containment reference. @@ -379,7 +379,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Post Remove</em>' containment reference. * @see #setPostRemove(PostRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PostRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostRemove() * @model containment="true" * @generated */ @@ -406,7 +406,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Remove</em>' containment reference. @@ -439,7 +439,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Pre Update</em>' containment reference. * @see #setPreUpdate(PreUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PreUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PreUpdate() * @model containment="true" * @generated */ @@ -466,7 +466,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Update</em>' containment reference. @@ -499,7 +499,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Post Update</em>' containment reference. * @see #setPostUpdate(PostUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PostUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostUpdate() * @model containment="true" * @generated */ @@ -526,7 +526,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Update</em>' containment reference. @@ -559,7 +559,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Post Load</em>' containment reference. * @see #setPostLoad(PostLoad) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener_PostLoad() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener_PostLoad() * @model containment="true" * @generated */ @@ -586,7 +586,7 @@ public class EntityListener extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Load</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityListeners.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListeners.java index 490f8a261e..00cc6c1d5b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityListeners.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityListeners.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -16,8 +16,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -27,16 +27,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners() * @model kind="class" * @extends IJpaEObject * @generated */ -public class EntityListeners extends JpaEObject implements IJpaEObject +public class EntityListeners extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getEntityListeners() <em>Entity Listeners</em>}' containment reference list. @@ -71,7 +71,7 @@ public class EntityListeners extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Entity Listeners</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.EntityListener}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.EntityListener}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Entity Listeners</em>' containment reference list isn't clear, @@ -79,7 +79,7 @@ public class EntityListeners extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Entity Listeners</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListeners_EntityListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners_EntityListeners() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityMappings.java index 2ae5b1e52b..a25da0fbe5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityMappings.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,30 +29,30 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion <em>Version</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPackage <em>Package</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSchema <em>Schema</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getAccess <em>Access</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSequenceGenerators <em>Sequence Generators</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getTableGenerators <em>Table Generators</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedQueries <em>Named Queries</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEntities <em>Entities</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEmbeddables <em>Embeddables</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion <em>Version</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPackage <em>Package</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSchema <em>Schema</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getAccess <em>Access</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSequenceGenerators <em>Sequence Generators</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getTableGenerators <em>Table Generators</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedQueries <em>Named Queries</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getEntities <em>Entities</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getEmbeddables <em>Embeddables</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings() * @model kind="class" * @extends IJpaEObject * @generated */ -public class EntityMappings extends JpaEObject implements IJpaEObject +public class EntityMappings extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getVersion() <em>Version</em>}' attribute. @@ -197,7 +197,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<SequenceGenerator> sequenceGenerators; + protected EList<XmlSequenceGenerator> sequenceGenerators; /** * The cached value of the '{@link #getTableGenerators() <em>Table Generators</em>}' containment reference list. @@ -207,7 +207,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<TableGenerator> tableGenerators; + protected EList<XmlTableGenerator> tableGenerators; /** * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list. @@ -217,7 +217,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<NamedQuery> namedQueries; + protected EList<XmlNamedQuery> namedQueries; /** * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list. @@ -227,7 +227,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<NamedNativeQuery> namedNativeQueries; + protected EList<XmlNamedNativeQuery> namedNativeQueries; /** * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list. @@ -247,7 +247,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<MappedSuperclass> mappedSuperclasses; + protected EList<XmlMappedSuperclass> mappedSuperclasses; /** * The cached value of the '{@link #getEntities() <em>Entities</em>}' containment reference list. @@ -257,7 +257,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Entity> entities; + protected EList<XmlEntity> entities; /** * The cached value of the '{@link #getEmbeddables() <em>Embeddables</em>}' containment reference list. @@ -267,7 +267,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<Embeddable> embeddables; + protected EList<XmlEmbeddable> embeddables; /** * <!-- begin-user-doc --> @@ -303,7 +303,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * @see #isSetVersion() * @see #unsetVersion() * @see #setVersion(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Version() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Version() * @model default="1.0" unsettable="true" dataType="org.eclipse.jpt.core.internal.resource.orm.VersionType" required="true" * @generated */ @@ -313,7 +313,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Version</em>' attribute. @@ -333,7 +333,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Unsets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute. + * Unsets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #isSetVersion() @@ -352,7 +352,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Returns whether the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute is set. + * Returns whether the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion <em>Version</em>}' attribute is set. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return whether the value of the '<em>Version</em>' attribute is set. @@ -376,7 +376,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Description() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Description() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -386,7 +386,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getDescription <em>Description</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getDescription <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Description</em>' attribute. @@ -411,7 +411,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Persistence Unit Metadata</em>' containment reference. * @see #setPersistenceUnitMetadata(PersistenceUnitMetadata) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_PersistenceUnitMetadata() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_PersistenceUnitMetadata() * @model containment="true" * @generated */ @@ -438,7 +438,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Persistence Unit Metadata</em>' containment reference. @@ -471,7 +471,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Package</em>' attribute. * @see #setPackage(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Package() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Package() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -481,7 +481,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPackage <em>Package</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPackage <em>Package</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Package</em>' attribute. @@ -506,7 +506,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -516,7 +516,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -541,7 +541,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -551,7 +551,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -569,7 +569,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Access</b></em>' attribute. * The default value is <code>"PROPERTY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.AccessType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Access</em>' attribute isn't clear, @@ -577,9 +577,9 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #setAccess(AccessType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Access() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Access() * @model default="PROPERTY" * @generated */ @@ -589,11 +589,11 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getAccess <em>Access</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getAccess <em>Access</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #getAccess() * @generated */ @@ -607,7 +607,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Sequence Generators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Sequence Generators</em>' containment reference list isn't clear, @@ -615,22 +615,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sequence Generators</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_SequenceGenerators() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_SequenceGenerators() * @model containment="true" * @generated */ - public EList<SequenceGenerator> getSequenceGenerators() + public EList<XmlSequenceGenerator> getSequenceGenerators() { if (sequenceGenerators == null) { - sequenceGenerators = new EObjectContainmentEList<SequenceGenerator>(SequenceGenerator.class, this, OrmPackage.ENTITY_MAPPINGS__SEQUENCE_GENERATORS); + sequenceGenerators = new EObjectContainmentEList<XmlSequenceGenerator>(XmlSequenceGenerator.class, this, OrmPackage.ENTITY_MAPPINGS__SEQUENCE_GENERATORS); } return sequenceGenerators; } /** * Returns the value of the '<em><b>Table Generators</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Table Generators</em>' containment reference list isn't clear, @@ -638,22 +638,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Table Generators</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_TableGenerators() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_TableGenerators() * @model containment="true" * @generated */ - public EList<TableGenerator> getTableGenerators() + public EList<XmlTableGenerator> getTableGenerators() { if (tableGenerators == null) { - tableGenerators = new EObjectContainmentEList<TableGenerator>(TableGenerator.class, this, OrmPackage.ENTITY_MAPPINGS__TABLE_GENERATORS); + tableGenerators = new EObjectContainmentEList<XmlTableGenerator>(XmlTableGenerator.class, this, OrmPackage.ENTITY_MAPPINGS__TABLE_GENERATORS); } return tableGenerators; } /** * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear, @@ -661,22 +661,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Named Queries</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_NamedQueries() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_NamedQueries() * @model containment="true" * @generated */ - public EList<NamedQuery> getNamedQueries() + public EList<XmlNamedQuery> getNamedQueries() { if (namedQueries == null) { - namedQueries = new EObjectContainmentEList<NamedQuery>(NamedQuery.class, this, OrmPackage.ENTITY_MAPPINGS__NAMED_QUERIES); + namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, OrmPackage.ENTITY_MAPPINGS__NAMED_QUERIES); } return namedQueries; } /** * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear, @@ -684,22 +684,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Named Native Queries</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_NamedNativeQueries() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_NamedNativeQueries() * @model containment="true" * @generated */ - public EList<NamedNativeQuery> getNamedNativeQueries() + public EList<XmlNamedNativeQuery> getNamedNativeQueries() { if (namedNativeQueries == null) { - namedNativeQueries = new EObjectContainmentEList<NamedNativeQuery>(NamedNativeQuery.class, this, OrmPackage.ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES); + namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, OrmPackage.ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES); } return namedNativeQueries; } /** * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear, @@ -707,7 +707,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_SqlResultSetMappings() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_SqlResultSetMappings() * @model containment="true" * @generated */ @@ -722,7 +722,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Mapped Superclasses</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Mapped Superclasses</em>' containment reference list isn't clear, @@ -730,22 +730,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Mapped Superclasses</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_MappedSuperclasses() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_MappedSuperclasses() * @model containment="true" * @generated */ - public EList<MappedSuperclass> getMappedSuperclasses() + public EList<XmlMappedSuperclass> getMappedSuperclasses() { if (mappedSuperclasses == null) { - mappedSuperclasses = new EObjectContainmentEList<MappedSuperclass>(MappedSuperclass.class, this, OrmPackage.ENTITY_MAPPINGS__MAPPED_SUPERCLASSES); + mappedSuperclasses = new EObjectContainmentEList<XmlMappedSuperclass>(XmlMappedSuperclass.class, this, OrmPackage.ENTITY_MAPPINGS__MAPPED_SUPERCLASSES); } return mappedSuperclasses; } /** * Returns the value of the '<em><b>Entities</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Entity}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEntity}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Entities</em>' containment reference list isn't clear, @@ -753,22 +753,22 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Entities</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Entities() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Entities() * @model containment="true" * @generated */ - public EList<Entity> getEntities() + public EList<XmlEntity> getEntities() { if (entities == null) { - entities = new EObjectContainmentEList<Entity>(Entity.class, this, OrmPackage.ENTITY_MAPPINGS__ENTITIES); + entities = new EObjectContainmentEList<XmlEntity>(XmlEntity.class, this, OrmPackage.ENTITY_MAPPINGS__ENTITIES); } return entities; } /** * Returns the value of the '<em><b>Embeddables</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.Embeddable}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Embeddables</em>' containment reference list isn't clear, @@ -776,15 +776,15 @@ public class EntityMappings extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Embeddables</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings_Embeddables() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings_Embeddables() * @model containment="true" * @generated */ - public EList<Embeddable> getEmbeddables() + public EList<XmlEmbeddable> getEmbeddables() { if (embeddables == null) { - embeddables = new EObjectContainmentEList<Embeddable>(Embeddable.class, this, OrmPackage.ENTITY_MAPPINGS__EMBEDDABLES); + embeddables = new EObjectContainmentEList<XmlEmbeddable>(XmlEmbeddable.class, this, OrmPackage.ENTITY_MAPPINGS__EMBEDDABLES); } return embeddables; } @@ -899,19 +899,19 @@ public class EntityMappings extends JpaEObject implements IJpaEObject return; case OrmPackage.ENTITY_MAPPINGS__SEQUENCE_GENERATORS: getSequenceGenerators().clear(); - getSequenceGenerators().addAll((Collection<? extends SequenceGenerator>)newValue); + getSequenceGenerators().addAll((Collection<? extends XmlSequenceGenerator>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__TABLE_GENERATORS: getTableGenerators().clear(); - getTableGenerators().addAll((Collection<? extends TableGenerator>)newValue); + getTableGenerators().addAll((Collection<? extends XmlTableGenerator>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__NAMED_QUERIES: getNamedQueries().clear(); - getNamedQueries().addAll((Collection<? extends NamedQuery>)newValue); + getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__NAMED_NATIVE_QUERIES: getNamedNativeQueries().clear(); - getNamedNativeQueries().addAll((Collection<? extends NamedNativeQuery>)newValue); + getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__SQL_RESULT_SET_MAPPINGS: getSqlResultSetMappings().clear(); @@ -919,15 +919,15 @@ public class EntityMappings extends JpaEObject implements IJpaEObject return; case OrmPackage.ENTITY_MAPPINGS__MAPPED_SUPERCLASSES: getMappedSuperclasses().clear(); - getMappedSuperclasses().addAll((Collection<? extends MappedSuperclass>)newValue); + getMappedSuperclasses().addAll((Collection<? extends XmlMappedSuperclass>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__ENTITIES: getEntities().clear(); - getEntities().addAll((Collection<? extends Entity>)newValue); + getEntities().addAll((Collection<? extends XmlEntity>)newValue); return; case OrmPackage.ENTITY_MAPPINGS__EMBEDDABLES: getEmbeddables().clear(); - getEmbeddables().addAll((Collection<? extends Embeddable>)newValue); + getEmbeddables().addAll((Collection<? extends XmlEmbeddable>)newValue); return; } super.eSet(featureID, newValue); @@ -1067,7 +1067,7 @@ public class EntityMappings extends JpaEObject implements IJpaEObject } @Override - public IJpaEObject root() { + public JpaEObject root() { return this; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityResult.java index cc851b4dc5..ad84b8627b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EntityResult.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EntityResult.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,18 +29,18 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult() * @model kind="class" * @extends IJpaEObject * @generated */ -public class EntityResult extends JpaEObject implements IJpaEObject +public class EntityResult extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getDiscriminatorColumn() <em>Discriminator Column</em>}' attribute. @@ -123,7 +123,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Discriminator Column</em>' attribute. * @see #setDiscriminatorColumn(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult_DiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_DiscriminatorColumn() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -133,7 +133,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Discriminator Column</em>' attribute. @@ -158,7 +158,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Entity Class</em>' attribute. * @see #setEntityClass(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult_EntityClass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_EntityClass() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -168,7 +168,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Entity Class</em>' attribute. @@ -185,7 +185,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Field Results</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.FieldResult}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.FieldResult}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Field Results</em>' containment reference list isn't clear, @@ -193,7 +193,7 @@ public class EntityResult extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Field Results</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult_FieldResults() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult_FieldResults() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EnumType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EnumType.java index a5074a36b9..8298cea138 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EnumType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EnumType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Enum Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEnumType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EventMethod.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EventMethod.java index 5f5f922b34..a4d327ef46 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EventMethod.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/EventMethod.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,16 +23,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod#getMethodName <em>Method Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEventMethod() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod() * @model kind="class" * @extends IJpaEObject * @generated */ -public class EventMethod extends JpaEObject implements IJpaEObject +public class EventMethod extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getMethodName() <em>Method Name</em>}' attribute. @@ -85,7 +85,7 @@ public class EventMethod extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Method Name</em>' attribute. * @see #setMethodName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEventMethod_MethodName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod_MethodName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -95,7 +95,7 @@ public class EventMethod extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod#getMethodName <em>Method Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Method Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/FetchType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FetchType.java index d2d24f432a..5339bf3e1a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/FetchType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FetchType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Fetch Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFetchType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/FieldResult.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FieldResult.java index afb5d25df2..01c7240de2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/FieldResult.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/FieldResult.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,17 +23,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getColumn <em>Column</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.FieldResult#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFieldResult() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult() * @model kind="class" * @extends IJpaEObject * @generated */ -public class FieldResult extends JpaEObject implements IJpaEObject +public class FieldResult extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -106,7 +106,7 @@ public class FieldResult extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFieldResult_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -116,7 +116,7 @@ public class FieldResult extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -141,7 +141,7 @@ public class FieldResult extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' attribute. * @see #setColumn(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFieldResult_Column() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult_Column() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -151,7 +151,7 @@ public class FieldResult extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getColumn <em>Column</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GeneratedValueImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GeneratedValueImpl.java index 9ee9153545..47a7bf93f4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GeneratedValueImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GeneratedValueImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValueImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValueImpl() * @model kind="class" * @generated */ -public class GeneratedValueImpl extends JpaEObject implements GeneratedValue +public class GeneratedValueImpl extends AbstractJpaEObject implements XmlGeneratedValue { /** * The default value of the '{@link #getGenerator() <em>Generator</em>}' attribute. @@ -93,7 +93,7 @@ public class GeneratedValueImpl extends JpaEObject implements GeneratedValue * <!-- end-user-doc --> * @return the value of the '<em>Generator</em>' attribute. * @see #setGenerator(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue_Generator() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue_Generator() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -103,7 +103,7 @@ public class GeneratedValueImpl extends JpaEObject implements GeneratedValue } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl#getGenerator <em>Generator</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.GeneratedValueImpl#getGenerator <em>Generator</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Generator</em>' attribute. @@ -121,7 +121,7 @@ public class GeneratedValueImpl extends JpaEObject implements GeneratedValue /** * Returns the value of the '<em><b>Strategy</b></em>' attribute. * The default value is <code>"TABLE"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.GenerationType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.GenerationType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Strategy</em>' attribute isn't clear, @@ -129,9 +129,9 @@ public class GeneratedValueImpl extends JpaEObject implements GeneratedValue * </p> * <!-- end-user-doc --> * @return the value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.GenerationType * @see #setStrategy(GenerationType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue_Strategy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue_Strategy() * @model default="TABLE" * @generated */ @@ -141,11 +141,11 @@ public class GeneratedValueImpl extends JpaEObject implements GeneratedValue } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl#getStrategy <em>Strategy</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.GeneratedValueImpl#getStrategy <em>Strategy</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.GenerationType * @see #getStrategy() * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GenerationType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GenerationType.java index 897d11b5e1..5db7265b98 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GenerationType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/GenerationType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Generation Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerationType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/IdClass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/IdClass.java index 740e692371..a0c2cf3335 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/IdClass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/IdClass.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,16 +23,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.IdClass#getClassName <em>Class Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.IdClass#getClassName <em>Class Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdClass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdClass() * @model kind="class" * @extends IJpaEObject * @generated */ -public class IdClass extends JpaEObject implements IJpaEObject +public class IdClass extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getClassName() <em>Class Name</em>}' attribute. @@ -85,7 +85,7 @@ public class IdClass extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Class Name</em>' attribute. * @see #setClassName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdClass_ClassName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdClass_ClassName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -95,7 +95,7 @@ public class IdClass extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass#getClassName <em>Class Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdClass#getClassName <em>Class Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Class Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/IdImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/IdImpl.java index cf90587bb6..e9e6d1bf8b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/IdImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/IdImpl.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,11 +22,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdImpl() * @model kind="class" * @generated */ -public class IdImpl extends JpaEObject implements Id +public class IdImpl extends AbstractJpaEObject implements XmlId { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -56,7 +56,7 @@ public class IdImpl extends JpaEObject implements Id * @generated * @ordered */ - protected Column column; + protected XmlColumn column; /** * The cached value of the '{@link #getGeneratedValue() <em>Generated Value</em>}' containment reference. @@ -66,7 +66,7 @@ public class IdImpl extends JpaEObject implements Id * @generated * @ordered */ - protected GeneratedValue generatedValue; + protected XmlGeneratedValue generatedValue; /** * changed this to null and removed the generated flag so emf won't generate over it @@ -92,7 +92,7 @@ public class IdImpl extends JpaEObject implements Id * @generated * @ordered */ - protected TableGenerator tableGenerator; + protected XmlTableGenerator tableGenerator; /** * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference. @@ -102,7 +102,7 @@ public class IdImpl extends JpaEObject implements Id * @generated * @ordered */ - protected SequenceGenerator sequenceGenerator; + protected XmlSequenceGenerator sequenceGenerator; /** * <!-- begin-user-doc --> @@ -135,7 +135,7 @@ public class IdImpl extends JpaEObject implements Id * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -145,7 +145,7 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -169,12 +169,12 @@ public class IdImpl extends JpaEObject implements Id * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column() * @model containment="true" * @generated */ - public Column getColumn() + public XmlColumn getColumn() { return column; } @@ -184,9 +184,9 @@ public class IdImpl extends JpaEObject implements Id * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetColumn(Column newColumn, NotificationChain msgs) + public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs) { - Column oldColumn = column; + XmlColumn oldColumn = column; column = newColumn; if (eNotificationRequired()) { @@ -197,14 +197,14 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - public void setColumn(Column newColumn) + public void setColumn(XmlColumn newColumn) { if (newColumn != column) { @@ -229,12 +229,12 @@ public class IdImpl extends JpaEObject implements Id * </p> * <!-- end-user-doc --> * @return the value of the '<em>Generated Value</em>' containment reference. - * @see #setGeneratedValue(GeneratedValue) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_GeneratedValue() + * @see #setGeneratedValue(XmlGeneratedValue) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_GeneratedValue() * @model containment="true" * @generated */ - public GeneratedValue getGeneratedValue() + public XmlGeneratedValue getGeneratedValue() { return generatedValue; } @@ -244,9 +244,9 @@ public class IdImpl extends JpaEObject implements Id * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetGeneratedValue(GeneratedValue newGeneratedValue, NotificationChain msgs) + public NotificationChain basicSetGeneratedValue(XmlGeneratedValue newGeneratedValue, NotificationChain msgs) { - GeneratedValue oldGeneratedValue = generatedValue; + XmlGeneratedValue oldGeneratedValue = generatedValue; generatedValue = newGeneratedValue; if (eNotificationRequired()) { @@ -257,14 +257,14 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getGeneratedValue <em>Generated Value</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getGeneratedValue <em>Generated Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Generated Value</em>' containment reference. * @see #getGeneratedValue() * @generated */ - public void setGeneratedValue(GeneratedValue newGeneratedValue) + public void setGeneratedValue(XmlGeneratedValue newGeneratedValue) { if (newGeneratedValue != generatedValue) { @@ -282,7 +282,7 @@ public class IdImpl extends JpaEObject implements Id /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -290,9 +290,9 @@ public class IdImpl extends JpaEObject implements Id * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_Temporal() * @model * @generated */ @@ -302,11 +302,11 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ @@ -327,12 +327,12 @@ public class IdImpl extends JpaEObject implements Id * </p> * <!-- end-user-doc --> * @return the value of the '<em>Table Generator</em>' containment reference. - * @see #setTableGenerator(TableGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_TableGenerator() + * @see #setTableGenerator(XmlTableGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_TableGenerator() * @model containment="true" * @generated */ - public TableGenerator getTableGenerator() + public XmlTableGenerator getTableGenerator() { return tableGenerator; } @@ -342,9 +342,9 @@ public class IdImpl extends JpaEObject implements Id * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetTableGenerator(TableGenerator newTableGenerator, NotificationChain msgs) + public NotificationChain basicSetTableGenerator(XmlTableGenerator newTableGenerator, NotificationChain msgs) { - TableGenerator oldTableGenerator = tableGenerator; + XmlTableGenerator oldTableGenerator = tableGenerator; tableGenerator = newTableGenerator; if (eNotificationRequired()) { @@ -355,14 +355,14 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getTableGenerator <em>Table Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getTableGenerator <em>Table Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table Generator</em>' containment reference. * @see #getTableGenerator() * @generated */ - public void setTableGenerator(TableGenerator newTableGenerator) + public void setTableGenerator(XmlTableGenerator newTableGenerator) { if (newTableGenerator != tableGenerator) { @@ -387,12 +387,12 @@ public class IdImpl extends JpaEObject implements Id * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sequence Generator</em>' containment reference. - * @see #setSequenceGenerator(SequenceGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_SequenceGenerator() + * @see #setSequenceGenerator(XmlSequenceGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_SequenceGenerator() * @model containment="true" * @generated */ - public SequenceGenerator getSequenceGenerator() + public XmlSequenceGenerator getSequenceGenerator() { return sequenceGenerator; } @@ -402,9 +402,9 @@ public class IdImpl extends JpaEObject implements Id * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetSequenceGenerator(SequenceGenerator newSequenceGenerator, NotificationChain msgs) + public NotificationChain basicSetSequenceGenerator(XmlSequenceGenerator newSequenceGenerator, NotificationChain msgs) { - SequenceGenerator oldSequenceGenerator = sequenceGenerator; + XmlSequenceGenerator oldSequenceGenerator = sequenceGenerator; sequenceGenerator = newSequenceGenerator; if (eNotificationRequired()) { @@ -415,14 +415,14 @@ public class IdImpl extends JpaEObject implements Id } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.IdImpl#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Sequence Generator</em>' containment reference. * @see #getSequenceGenerator() * @generated */ - public void setSequenceGenerator(SequenceGenerator newSequenceGenerator) + public void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator) { if (newSequenceGenerator != sequenceGenerator) { @@ -500,19 +500,19 @@ public class IdImpl extends JpaEObject implements Id setName((String)newValue); return; case OrmPackage.ID_IMPL__COLUMN: - setColumn((Column)newValue); + setColumn((XmlColumn)newValue); return; case OrmPackage.ID_IMPL__GENERATED_VALUE: - setGeneratedValue((GeneratedValue)newValue); + setGeneratedValue((XmlGeneratedValue)newValue); return; case OrmPackage.ID_IMPL__TEMPORAL: setTemporal((TemporalType)newValue); return; case OrmPackage.ID_IMPL__TABLE_GENERATOR: - setTableGenerator((TableGenerator)newValue); + setTableGenerator((XmlTableGenerator)newValue); return; case OrmPackage.ID_IMPL__SEQUENCE_GENERATOR: - setSequenceGenerator((SequenceGenerator)newValue); + setSequenceGenerator((XmlSequenceGenerator)newValue); return; } super.eSet(featureID, newValue); @@ -532,19 +532,19 @@ public class IdImpl extends JpaEObject implements Id setName(NAME_EDEFAULT); return; case OrmPackage.ID_IMPL__COLUMN: - setColumn((Column)null); + setColumn((XmlColumn)null); return; case OrmPackage.ID_IMPL__GENERATED_VALUE: - setGeneratedValue((GeneratedValue)null); + setGeneratedValue((XmlGeneratedValue)null); return; case OrmPackage.ID_IMPL__TEMPORAL: setTemporal(TEMPORAL_EDEFAULT); return; case OrmPackage.ID_IMPL__TABLE_GENERATOR: - setTableGenerator((TableGenerator)null); + setTableGenerator((XmlTableGenerator)null); return; case OrmPackage.ID_IMPL__SEQUENCE_GENERATOR: - setSequenceGenerator((SequenceGenerator)null); + setSequenceGenerator((XmlSequenceGenerator)null); return; } super.eUnset(featureID); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Inheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Inheritance.java index b892fb5591..6b5a14ca49 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Inheritance.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Inheritance.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,16 +23,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance#getStrategy <em>Strategy</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritance() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance() * @model kind="class" * @extends IJpaEObject * @generated */ -public class Inheritance extends JpaEObject implements IJpaEObject +public class Inheritance extends AbstractJpaEObject implements JpaEObject { /** * changed this to null and removed the generated flag so emf won't generate over it @@ -74,7 +74,7 @@ public class Inheritance extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Strategy</b></em>' attribute. * The default value is <code>"SINGLE_TABLE"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.InheritanceType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.InheritanceType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Strategy</em>' attribute isn't clear, @@ -82,9 +82,9 @@ public class Inheritance extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.InheritanceType + * @see org.eclipse.jpt.core.resource.orm.InheritanceType * @see #setStrategy(InheritanceType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritance_Strategy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance_Strategy() * @model default="SINGLE_TABLE" * @generated */ @@ -94,11 +94,11 @@ public class Inheritance extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance#getStrategy <em>Strategy</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.InheritanceType + * @see org.eclipse.jpt.core.resource.orm.InheritanceType * @see #getStrategy() * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/InheritanceType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/InheritanceType.java index 96cdc79463..5097037295 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/InheritanceType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/InheritanceType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Inheritance Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritanceType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinColumnImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/JoinColumnImpl.java index 466466606c..9e52c9e74b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinColumnImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/JoinColumnImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumnImpl() * @model kind="class" * @generated */ -public class JoinColumnImpl extends JpaEObject implements JoinColumn +public class JoinColumnImpl extends AbstractJpaEObject implements XmlJoinColumn { /** * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute. @@ -217,7 +217,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -227,7 +227,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -252,7 +252,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Insertable</em>' attribute. * @see #setInsertable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Insertable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Insertable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -262,7 +262,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getInsertable <em>Insertable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getInsertable <em>Insertable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Insertable</em>' attribute. @@ -287,7 +287,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Nullable</em>' attribute. * @see #setNullable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Nullable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Nullable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -297,7 +297,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getNullable <em>Nullable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getNullable <em>Nullable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Nullable</em>' attribute. @@ -322,7 +322,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Column Definition</em>' attribute. * @see #setColumnDefinition(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -332,7 +332,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getColumnDefinition <em>Column Definition</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getColumnDefinition <em>Column Definition</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column Definition</em>' attribute. @@ -357,7 +357,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' attribute. * @see #setTable(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Table() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Table() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -367,7 +367,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getTable <em>Table</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getTable <em>Table</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' attribute. @@ -392,7 +392,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Unique</em>' attribute. * @see #setUnique(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Unique() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Unique() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -402,7 +402,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getUnique <em>Unique</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getUnique <em>Unique</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Unique</em>' attribute. @@ -427,7 +427,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Updatable</em>' attribute. * @see #setUpdatable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Updatable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Updatable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -437,7 +437,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getUpdatable <em>Updatable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getUpdatable <em>Updatable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Updatable</em>' attribute. @@ -462,7 +462,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn * <!-- end-user-doc --> * @return the value of the '<em>Referenced Column Name</em>' attribute. * @see #setReferencedColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumn_ReferencedColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumn_ReferencedColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -472,7 +472,7 @@ public class JoinColumnImpl extends JpaEObject implements JoinColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Referenced Column Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinTableImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/JoinTableImpl.java index 35f139e0e3..8992907d8d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinTableImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/JoinTableImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTableImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTableImpl() * @model kind="class" * @generated */ -public class JoinTableImpl extends JpaEObject implements JoinTable +public class JoinTableImpl extends AbstractJpaEObject implements XmlJoinTable { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -104,7 +104,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * @generated * @ordered */ - protected EList<JoinColumn> joinColumns; + protected EList<XmlJoinColumn> joinColumns; /** * The cached value of the '{@link #getInverseJoinColumns() <em>Inverse Join Columns</em>}' containment reference list. * <!-- begin-user-doc --> @@ -113,7 +113,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * @generated * @ordered */ - protected EList<JoinColumn> inverseJoinColumns; + protected EList<XmlJoinColumn> inverseJoinColumns; /** * <!-- begin-user-doc --> @@ -146,7 +146,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -156,7 +156,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -181,7 +181,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -191,7 +191,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -216,7 +216,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -226,7 +226,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -243,7 +243,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -251,7 +251,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() * @model containment="true" * @generated */ @@ -266,7 +266,7 @@ public class JoinTableImpl extends JpaEObject implements JoinTable /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -274,22 +274,22 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable_JoinColumns() * @model containment="true" * @generated */ - public EList<JoinColumn> getJoinColumns() + public EList<XmlJoinColumn> getJoinColumns() { if (joinColumns == null) { - joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.JOIN_TABLE_IMPL__JOIN_COLUMNS); + joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.JOIN_TABLE_IMPL__JOIN_COLUMNS); } return joinColumns; } /** * Returns the value of the '<em><b>Inverse Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Inverse Join Columns</em>' containment reference list isn't clear, @@ -297,15 +297,15 @@ public class JoinTableImpl extends JpaEObject implements JoinTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Inverse Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable_InverseJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable_InverseJoinColumns() * @model containment="true" * @generated */ - public EList<JoinColumn> getInverseJoinColumns() + public EList<XmlJoinColumn> getInverseJoinColumns() { if (inverseJoinColumns == null) { - inverseJoinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS); + inverseJoinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS); } return inverseJoinColumns; } @@ -382,11 +382,11 @@ public class JoinTableImpl extends JpaEObject implements JoinTable return; case OrmPackage.JOIN_TABLE_IMPL__JOIN_COLUMNS: getJoinColumns().clear(); - getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; case OrmPackage.JOIN_TABLE_IMPL__INVERSE_JOIN_COLUMNS: getInverseJoinColumns().clear(); - getInverseJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getInverseJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Lob.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Lob.java index dda8c8fcf5..5a0f49e5d2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Lob.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/Lob.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -19,12 +19,12 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getLob() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob() * @model kind="class" * @extends IJpaEObject * @generated */ -public class Lob extends JpaEObject implements IJpaEObject +public class Lob extends AbstractJpaEObject implements JpaEObject { /** * <!-- begin-user-doc --> diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ManyToManyImpl.java index 74a695ab58..1c4faf9695 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToManyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ManyToManyImpl.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,11 +22,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToManyImpl() * @model kind="class" * @generated */ -public class ManyToManyImpl extends JpaEObject implements ManyToMany +public class ManyToManyImpl extends AbstractJpaEObject implements XmlManyToMany { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -92,7 +92,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * @generated * @ordered */ - protected JoinTable joinTable; + protected XmlJoinTable joinTable; /** * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference. @@ -185,7 +185,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -195,7 +195,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -220,7 +220,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Target Entity</em>' attribute. * @see #setTargetEntity(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -230,7 +230,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Target Entity</em>' attribute. @@ -248,7 +248,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -256,9 +256,9 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Fetch() * @model default="LAZY" * @generated */ @@ -268,11 +268,11 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -294,7 +294,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Mapped By</em>' attribute. * @see #setMappedBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -304,7 +304,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getMappedBy <em>Mapped By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getMappedBy <em>Mapped By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Mapped By</em>' attribute. @@ -329,7 +329,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Order By</em>' attribute. * @see #setOrderBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() * @model dataType="org.eclipse.jpt.core.internal.resource.orm.OrderBy" * @generated */ @@ -339,7 +339,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getOrderBy <em>Order By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getOrderBy <em>Order By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Order By</em>' attribute. @@ -364,7 +364,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Map Key</em>' containment reference. * @see #setMapKey(MapKey) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() * @model containment="true" * @generated */ @@ -391,7 +391,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getMapKey <em>Map Key</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getMapKey <em>Map Key</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Map Key</em>' containment reference. @@ -423,12 +423,12 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Table</em>' containment reference. - * @see #setJoinTable(JoinTable) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() + * @see #setJoinTable(XmlJoinTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() * @model containment="true" * @generated */ - public JoinTable getJoinTable() + public XmlJoinTable getJoinTable() { return joinTable; } @@ -438,9 +438,9 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetJoinTable(JoinTable newJoinTable, NotificationChain msgs) + public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs) { - JoinTable oldJoinTable = joinTable; + XmlJoinTable oldJoinTable = joinTable; joinTable = newJoinTable; if (eNotificationRequired()) { @@ -451,14 +451,14 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getJoinTable <em>Join Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getJoinTable <em>Join Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Join Table</em>' containment reference. * @see #getJoinTable() * @generated */ - public void setJoinTable(JoinTable newJoinTable) + public void setJoinTable(XmlJoinTable newJoinTable) { if (newJoinTable != joinTable) { @@ -484,7 +484,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany * <!-- end-user-doc --> * @return the value of the '<em>Cascade</em>' containment reference. * @see #setCascade(CascadeType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Cascade() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Cascade() * @model containment="true" * @generated */ @@ -511,7 +511,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl#getCascade <em>Cascade</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl#getCascade <em>Cascade</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade</em>' containment reference. @@ -604,7 +604,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany setFetch((FetchType)newValue); return; case OrmPackage.MANY_TO_MANY_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)newValue); + setJoinTable((XmlJoinTable)newValue); return; case OrmPackage.MANY_TO_MANY_IMPL__CASCADE: setCascade((CascadeType)newValue); @@ -642,7 +642,7 @@ public class ManyToManyImpl extends JpaEObject implements ManyToMany setFetch(FETCH_EDEFAULT); return; case OrmPackage.MANY_TO_MANY_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)null); + setJoinTable((XmlJoinTable)null); return; case OrmPackage.MANY_TO_MANY_IMPL__CASCADE: setCascade((CascadeType)null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ManyToOneImpl.java index 46fb308a34..2827e87f07 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToOneImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/ManyToOneImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOneImpl() * @model kind="class" * @generated */ -public class ManyToOneImpl extends JpaEObject implements ManyToOne +public class ManyToOneImpl extends AbstractJpaEObject implements XmlManyToOne { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -96,7 +96,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * @generated * @ordered */ - protected JoinTable joinTable; + protected XmlJoinTable joinTable; /** * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference. @@ -136,7 +136,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * @generated * @ordered */ - protected EList<JoinColumn> joinColumns; + protected EList<XmlJoinColumn> joinColumns; /** * <!-- begin-user-doc --> @@ -169,7 +169,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -179,7 +179,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -204,7 +204,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * <!-- end-user-doc --> * @return the value of the '<em>Target Entity</em>' attribute. * @see #setTargetEntity(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -214,7 +214,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Target Entity</em>' attribute. @@ -232,7 +232,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -240,9 +240,9 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Fetch() * @model default="LAZY" * @generated */ @@ -252,11 +252,11 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -278,7 +278,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * <!-- end-user-doc --> * @return the value of the '<em>Optional</em>' attribute. * @see #setOptional(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -288,7 +288,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getOptional <em>Optional</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getOptional <em>Optional</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Optional</em>' attribute. @@ -305,7 +305,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -313,15 +313,15 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() * @model containment="true" * @generated */ - public EList<JoinColumn> getJoinColumns() + public EList<XmlJoinColumn> getJoinColumns() { if (joinColumns == null) { - joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.MANY_TO_ONE_IMPL__JOIN_COLUMNS); + joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.MANY_TO_ONE_IMPL__JOIN_COLUMNS); } return joinColumns; } @@ -335,12 +335,12 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Table</em>' containment reference. - * @see #setJoinTable(JoinTable) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() + * @see #setJoinTable(XmlJoinTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() * @model containment="true" * @generated */ - public JoinTable getJoinTable() + public XmlJoinTable getJoinTable() { return joinTable; } @@ -350,9 +350,9 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetJoinTable(JoinTable newJoinTable, NotificationChain msgs) + public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs) { - JoinTable oldJoinTable = joinTable; + XmlJoinTable oldJoinTable = joinTable; joinTable = newJoinTable; if (eNotificationRequired()) { @@ -363,14 +363,14 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getJoinTable <em>Join Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getJoinTable <em>Join Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Join Table</em>' containment reference. * @see #getJoinTable() * @generated */ - public void setJoinTable(JoinTable newJoinTable) + public void setJoinTable(XmlJoinTable newJoinTable) { if (newJoinTable != joinTable) { @@ -396,7 +396,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne * <!-- end-user-doc --> * @return the value of the '<em>Cascade</em>' containment reference. * @see #setCascade(CascadeType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Cascade() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Cascade() * @model containment="true" * @generated */ @@ -423,7 +423,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl#getCascade <em>Cascade</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl#getCascade <em>Cascade</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade</em>' containment reference. @@ -515,7 +515,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne setFetch((FetchType)newValue); return; case OrmPackage.MANY_TO_ONE_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)newValue); + setJoinTable((XmlJoinTable)newValue); return; case OrmPackage.MANY_TO_ONE_IMPL__CASCADE: setCascade((CascadeType)newValue); @@ -525,7 +525,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne return; case OrmPackage.MANY_TO_ONE_IMPL__JOIN_COLUMNS: getJoinColumns().clear(); - getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; } super.eSet(featureID, newValue); @@ -551,7 +551,7 @@ public class ManyToOneImpl extends JpaEObject implements ManyToOne setFetch(FETCH_EDEFAULT); return; case OrmPackage.MANY_TO_ONE_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)null); + setJoinTable((XmlJoinTable)null); return; case OrmPackage.MANY_TO_ONE_IMPL__CASCADE: setCascade((CascadeType)null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MapKey.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKey.java index 8028d1e090..312a03dd7f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MapKey.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKey.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,16 +19,16 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MapKey#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.MapKey#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKey() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface MapKey extends IJpaEObject +public interface MapKey extends JpaEObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -40,14 +40,14 @@ public interface MapKey extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKey_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.MapKey#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MapKeyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKeyImpl.java index c106aad681..d3017ea573 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MapKeyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/MapKeyImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKeyImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKeyImpl() * @model kind="class" * @generated */ -public class MapKeyImpl extends JpaEObject implements MapKey +public class MapKeyImpl extends AbstractJpaEObject implements MapKey { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -77,7 +77,7 @@ public class MapKeyImpl extends JpaEObject implements MapKey * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKey_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -87,7 +87,7 @@ public class MapKeyImpl extends JpaEObject implements MapKey } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToManyImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OneToManyImpl.java index f10396b88e..e49c3efd8f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToManyImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OneToManyImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToManyImpl() * @model kind="class" * @generated */ -public class OneToManyImpl extends JpaEObject implements OneToMany +public class OneToManyImpl extends AbstractJpaEObject implements XmlOneToMany { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -96,7 +96,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * @generated * @ordered */ - protected JoinTable joinTable; + protected XmlJoinTable joinTable; /** * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference. @@ -166,7 +166,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * @generated * @ordered */ - protected EList<JoinColumn> joinColumns; + protected EList<XmlJoinColumn> joinColumns; /** * <!-- begin-user-doc --> @@ -199,7 +199,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -209,7 +209,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -234,7 +234,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Target Entity</em>' attribute. * @see #setTargetEntity(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -244,7 +244,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getTargetEntity <em>Target Entity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Target Entity</em>' attribute. @@ -262,7 +262,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -270,9 +270,9 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Fetch() * @model default="LAZY" * @generated */ @@ -282,11 +282,11 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -308,7 +308,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Mapped By</em>' attribute. * @see #setMappedBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -318,7 +318,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getMappedBy <em>Mapped By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getMappedBy <em>Mapped By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Mapped By</em>' attribute. @@ -343,7 +343,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Order By</em>' attribute. * @see #setOrderBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() * @model dataType="org.eclipse.jpt.core.internal.resource.orm.OrderBy" * @generated */ @@ -353,7 +353,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getOrderBy <em>Order By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getOrderBy <em>Order By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Order By</em>' attribute. @@ -378,7 +378,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Map Key</em>' containment reference. * @see #setMapKey(MapKey) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() * @model containment="true" * @generated */ @@ -405,7 +405,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getMapKey <em>Map Key</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getMapKey <em>Map Key</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Map Key</em>' containment reference. @@ -437,12 +437,12 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Table</em>' containment reference. - * @see #setJoinTable(JoinTable) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() + * @see #setJoinTable(XmlJoinTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() * @model containment="true" * @generated */ - public JoinTable getJoinTable() + public XmlJoinTable getJoinTable() { return joinTable; } @@ -452,9 +452,9 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetJoinTable(JoinTable newJoinTable, NotificationChain msgs) + public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs) { - JoinTable oldJoinTable = joinTable; + XmlJoinTable oldJoinTable = joinTable; joinTable = newJoinTable; if (eNotificationRequired()) { @@ -465,14 +465,14 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getJoinTable <em>Join Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getJoinTable <em>Join Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Join Table</em>' containment reference. * @see #getJoinTable() * @generated */ - public void setJoinTable(JoinTable newJoinTable) + public void setJoinTable(XmlJoinTable newJoinTable) { if (newJoinTable != joinTable) { @@ -490,7 +490,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -498,15 +498,15 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToMany_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToMany_JoinColumns() * @model containment="true" * @generated */ - public EList<JoinColumn> getJoinColumns() + public EList<XmlJoinColumn> getJoinColumns() { if (joinColumns == null) { - joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.ONE_TO_MANY_IMPL__JOIN_COLUMNS); + joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.ONE_TO_MANY_IMPL__JOIN_COLUMNS); } return joinColumns; } @@ -521,7 +521,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany * <!-- end-user-doc --> * @return the value of the '<em>Cascade</em>' containment reference. * @see #setCascade(CascadeType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Cascade() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Cascade() * @model containment="true" * @generated */ @@ -548,7 +548,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl#getCascade <em>Cascade</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl#getCascade <em>Cascade</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade</em>' containment reference. @@ -646,7 +646,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany setFetch((FetchType)newValue); return; case OrmPackage.ONE_TO_MANY_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)newValue); + setJoinTable((XmlJoinTable)newValue); return; case OrmPackage.ONE_TO_MANY_IMPL__CASCADE: setCascade((CascadeType)newValue); @@ -662,7 +662,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany return; case OrmPackage.ONE_TO_MANY_IMPL__JOIN_COLUMNS: getJoinColumns().clear(); - getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; } super.eSet(featureID, newValue); @@ -688,7 +688,7 @@ public class OneToManyImpl extends JpaEObject implements OneToMany setFetch(FETCH_EDEFAULT); return; case OrmPackage.ONE_TO_MANY_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)null); + setJoinTable((XmlJoinTable)null); return; case OrmPackage.ONE_TO_MANY_IMPL__CASCADE: setCascade((CascadeType)null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToOneImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OneToOneImpl.java index 065341e7cb..34876f8f0f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToOneImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OneToOneImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOneImpl() * @model kind="class" * @generated */ -public class OneToOneImpl extends JpaEObject implements OneToOne +public class OneToOneImpl extends AbstractJpaEObject implements XmlOneToOne { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -96,7 +96,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * @generated * @ordered */ - protected JoinTable joinTable; + protected XmlJoinTable joinTable; /** * The cached value of the '{@link #getCascade() <em>Cascade</em>}' containment reference. @@ -136,7 +136,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * @generated * @ordered */ - protected EList<JoinColumn> joinColumns; + protected EList<XmlJoinColumn> joinColumns; /** * The default value of the '{@link #getMappedBy() <em>Mapped By</em>}' attribute. @@ -166,7 +166,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * @generated * @ordered */ - protected EList<PrimaryKeyJoinColumn> primaryKeyJoinColumns; + protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns; /** * <!-- begin-user-doc --> @@ -199,7 +199,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -209,7 +209,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -234,7 +234,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @return the value of the '<em>Target Entity</em>' attribute. * @see #setTargetEntity(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -244,7 +244,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getTargetEntity <em>Target Entity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Target Entity</em>' attribute. @@ -262,7 +262,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -270,9 +270,9 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Fetch() * @model default="LAZY" * @generated */ @@ -282,11 +282,11 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -308,7 +308,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @return the value of the '<em>Optional</em>' attribute. * @see #setOptional(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ @@ -318,7 +318,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getOptional <em>Optional</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getOptional <em>Optional</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Optional</em>' attribute. @@ -343,7 +343,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @return the value of the '<em>Mapped By</em>' attribute. * @see #setMappedBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne_MappedBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne_MappedBy() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -353,7 +353,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getMappedBy <em>Mapped By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getMappedBy <em>Mapped By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Mapped By</em>' attribute. @@ -370,7 +370,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne /** * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Primary Key Join Columns</em>' containment reference list isn't clear, @@ -378,22 +378,22 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne_PrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne_PrimaryKeyJoinColumns() * @model containment="true" * @generated */ - public EList<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() + public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() { if (primaryKeyJoinColumns == null) { - primaryKeyJoinColumns = new EObjectContainmentEList<PrimaryKeyJoinColumn>(PrimaryKeyJoinColumn.class, this, OrmPackage.ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS); + primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS); } return primaryKeyJoinColumns; } /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -401,15 +401,15 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() * @model containment="true" * @generated */ - public EList<JoinColumn> getJoinColumns() + public EList<XmlJoinColumn> getJoinColumns() { if (joinColumns == null) { - joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.ONE_TO_ONE_IMPL__JOIN_COLUMNS); + joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.ONE_TO_ONE_IMPL__JOIN_COLUMNS); } return joinColumns; } @@ -423,12 +423,12 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Table</em>' containment reference. - * @see #setJoinTable(JoinTable) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() + * @see #setJoinTable(XmlJoinTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() * @model containment="true" * @generated */ - public JoinTable getJoinTable() + public XmlJoinTable getJoinTable() { return joinTable; } @@ -438,9 +438,9 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetJoinTable(JoinTable newJoinTable, NotificationChain msgs) + public NotificationChain basicSetJoinTable(XmlJoinTable newJoinTable, NotificationChain msgs) { - JoinTable oldJoinTable = joinTable; + XmlJoinTable oldJoinTable = joinTable; joinTable = newJoinTable; if (eNotificationRequired()) { @@ -451,14 +451,14 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getJoinTable <em>Join Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getJoinTable <em>Join Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Join Table</em>' containment reference. * @see #getJoinTable() * @generated */ - public void setJoinTable(JoinTable newJoinTable) + public void setJoinTable(XmlJoinTable newJoinTable) { if (newJoinTable != joinTable) { @@ -484,7 +484,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne * <!-- end-user-doc --> * @return the value of the '<em>Cascade</em>' containment reference. * @see #setCascade(CascadeType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Cascade() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Cascade() * @model containment="true" * @generated */ @@ -511,7 +511,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl#getCascade <em>Cascade</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl#getCascade <em>Cascade</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade</em>' containment reference. @@ -609,7 +609,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne setFetch((FetchType)newValue); return; case OrmPackage.ONE_TO_ONE_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)newValue); + setJoinTable((XmlJoinTable)newValue); return; case OrmPackage.ONE_TO_ONE_IMPL__CASCADE: setCascade((CascadeType)newValue); @@ -619,14 +619,14 @@ public class OneToOneImpl extends JpaEObject implements OneToOne return; case OrmPackage.ONE_TO_ONE_IMPL__JOIN_COLUMNS: getJoinColumns().clear(); - getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; case OrmPackage.ONE_TO_ONE_IMPL__MAPPED_BY: setMappedBy((String)newValue); return; case OrmPackage.ONE_TO_ONE_IMPL__PRIMARY_KEY_JOIN_COLUMNS: getPrimaryKeyJoinColumns().clear(); - getPrimaryKeyJoinColumns().addAll((Collection<? extends PrimaryKeyJoinColumn>)newValue); + getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue); return; } super.eSet(featureID, newValue); @@ -652,7 +652,7 @@ public class OneToOneImpl extends JpaEObject implements OneToOne setFetch(FETCH_EDEFAULT); return; case OrmPackage.ONE_TO_ONE_IMPL__JOIN_TABLE: - setJoinTable((JoinTable)null); + setJoinTable((XmlJoinTable)null); return; case OrmPackage.ONE_TO_ONE_IMPL__CASCADE: setCascade((CascadeType)null); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmArtifactEdit.java index 5197c4ee11..19a8c576a5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmArtifactEdit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmArtifactEdit.java @@ -8,14 +8,14 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.io.IOException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.emf.common.util.URI; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.resource.common.JpaArtifactEdit; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.resource.common.JpaArtifactEdit; public class OrmArtifactEdit extends JpaArtifactEdit { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java index 5c0ac9371d..a82d245194 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmFactory.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.Enumerator; import org.eclipse.emf.ecore.EClass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage + * @see org.eclipse.jpt.core.resource.orm.OrmPackage * @generated */ public class OrmFactory extends EFactoryImpl @@ -248,9 +248,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public MappedSuperclass createMappedSuperclass() + public XmlMappedSuperclass createMappedSuperclass() { - MappedSuperclass mappedSuperclass = new MappedSuperclass(); + XmlMappedSuperclass mappedSuperclass = new XmlMappedSuperclass(); return mappedSuperclass; } @@ -259,9 +259,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public Entity createEntity() + public XmlEntity createEntity() { - Entity entity = new Entity(); + XmlEntity entity = new XmlEntity(); return entity; } @@ -270,9 +270,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public Embeddable createEmbeddable() + public XmlEmbeddable createEmbeddable() { - Embeddable embeddable = new Embeddable(); + XmlEmbeddable embeddable = new XmlEmbeddable(); return embeddable; } @@ -402,9 +402,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public AssociationOverride createAssociationOverride() + public XmlAssociationOverride createAssociationOverride() { - AssociationOverride associationOverride = new AssociationOverride(); + XmlAssociationOverride associationOverride = new XmlAssociationOverride(); return associationOverride; } @@ -457,9 +457,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public DiscriminatorColumn createDiscriminatorColumn() + public XmlDiscriminatorColumn createDiscriminatorColumn() { - DiscriminatorColumn discriminatorColumn = new DiscriminatorColumn(); + XmlDiscriminatorColumn discriminatorColumn = new XmlDiscriminatorColumn(); return discriminatorColumn; } @@ -600,9 +600,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public NamedNativeQuery createNamedNativeQuery() + public XmlNamedNativeQuery createNamedNativeQuery() { - NamedNativeQuery namedNativeQuery = new NamedNativeQuery(); + XmlNamedNativeQuery namedNativeQuery = new XmlNamedNativeQuery(); return namedNativeQuery; } @@ -611,9 +611,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public NamedQuery createNamedQuery() + public XmlNamedQuery createNamedQuery() { - NamedQuery namedQuery = new NamedQuery(); + XmlNamedQuery namedQuery = new XmlNamedQuery(); return namedQuery; } @@ -699,9 +699,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public QueryHint createQueryHint() + public XmlQueryHint createQueryHint() { - QueryHint queryHint = new QueryHint(); + XmlQueryHint queryHint = new XmlQueryHint(); return queryHint; } @@ -732,9 +732,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public PrimaryKeyJoinColumn createPrimaryKeyJoinColumn() + public XmlPrimaryKeyJoinColumn createPrimaryKeyJoinColumn() { - PrimaryKeyJoinColumn primaryKeyJoinColumn = new PrimaryKeyJoinColumn(); + XmlPrimaryKeyJoinColumn primaryKeyJoinColumn = new XmlPrimaryKeyJoinColumn(); return primaryKeyJoinColumn; } @@ -743,9 +743,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public SecondaryTable createSecondaryTable() + public XmlSecondaryTable createSecondaryTable() { - SecondaryTable secondaryTable = new SecondaryTable(); + XmlSecondaryTable secondaryTable = new XmlSecondaryTable(); return secondaryTable; } @@ -765,9 +765,9 @@ public class OrmFactory extends EFactoryImpl * <!-- end-user-doc --> * @generated */ - public Table createTable() + public XmlTable createTable() { - Table table = new Table(); + XmlTable table = new XmlTable(); return table; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmPackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java index c108d62246..6eb2f525b2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmPackage.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmPackage.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.Enumerator; import org.eclipse.emf.ecore.EAttribute; @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; +import org.eclipse.jpt.core.resource.persistence.PersistencePackage; /** * <!-- begin-user-doc --> @@ -32,7 +32,7 @@ import org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmFactory + * @see org.eclipse.jpt.core.resource.orm.OrmFactory * @model kind="package" * @generated */ @@ -68,14 +68,14 @@ public class OrmPackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final OrmPackage eINSTANCE = org.eclipse.jpt.core.internal.resource.orm.OrmPackage.init(); + public static final OrmPackage eINSTANCE = org.eclipse.jpt.core.resource.orm.OrmPackage.init(); /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings <em>Entity Mappings</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings <em>Entity Mappings</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings() * @generated */ public static final int ENTITY_MAPPINGS = 0; @@ -225,11 +225,11 @@ public class OrmPackage extends EPackageImpl public static final int ENTITY_MAPPINGS_FEATURE_COUNT = 15; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitMetadata() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitMetadata() * @generated */ public static final int PERSISTENCE_UNIT_METADATA = 1; @@ -262,11 +262,11 @@ public class OrmPackage extends EPackageImpl public static final int PERSISTENCE_UNIT_METADATA_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults() * @generated */ public static final int PERSISTENCE_UNIT_DEFAULTS = 2; @@ -326,11 +326,11 @@ public class OrmPackage extends EPackageImpl public static final int PERSISTENCE_UNIT_DEFAULTS_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping <em>Type Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping <em>Type Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping() * @generated */ public static final int TYPE_MAPPING = 3; @@ -390,11 +390,11 @@ public class OrmPackage extends EPackageImpl public static final int TYPE_MAPPING_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass <em>Mapped Superclass</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Mapped Superclass</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass() * @generated */ public static final int MAPPED_SUPERCLASS = 4; @@ -553,11 +553,11 @@ public class OrmPackage extends EPackageImpl public static final int MAPPED_SUPERCLASS_FEATURE_COUNT = TYPE_MAPPING_FEATURE_COUNT + 11; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity <em>Entity</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity <em>Entity</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Entity - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity() * @generated */ public static final int ENTITY = 5; @@ -842,11 +842,11 @@ public class OrmPackage extends EPackageImpl public static final int ENTITY_FEATURE_COUNT = TYPE_MAPPING_FEATURE_COUNT + 25; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Embeddable <em>Embeddable</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable <em>Embeddable</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Embeddable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddable() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddable() * @generated */ public static final int EMBEDDABLE = 6; @@ -906,11 +906,11 @@ public class OrmPackage extends EPackageImpl public static final int EMBEDDABLE_FEATURE_COUNT = TYPE_MAPPING_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes <em>Attributes</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Attributes <em>Attributes</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes() + * @see org.eclipse.jpt.core.resource.orm.Attributes + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes() * @generated */ public static final int ATTRIBUTES = 7; @@ -1015,11 +1015,11 @@ public class OrmPackage extends EPackageImpl public static final int ATTRIBUTES_FEATURE_COUNT = 10; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping <em>Attribute Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Attribute Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping() * @generated */ public static final int ATTRIBUTE_MAPPING = 8; @@ -1043,11 +1043,11 @@ public class OrmPackage extends EPackageImpl public static final int ATTRIBUTE_MAPPING_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping <em>Column Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping() + * @see org.eclipse.jpt.core.resource.orm.ColumnMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping() * @generated */ public static final int COLUMN_MAPPING = 9; @@ -1071,11 +1071,11 @@ public class OrmPackage extends EPackageImpl public static final int COLUMN_MAPPING_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping <em>Relationship Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping() * @generated */ public static final int RELATIONSHIP_MAPPING = 10; @@ -1135,11 +1135,11 @@ public class OrmPackage extends EPackageImpl public static final int RELATIONSHIP_MAPPING_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 4; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping <em>Multi Relationship Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Multi Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping() * @generated */ public static final int MULTI_RELATIONSHIP_MAPPING = 11; @@ -1226,11 +1226,11 @@ public class OrmPackage extends EPackageImpl public static final int MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT = RELATIONSHIP_MAPPING_FEATURE_COUNT + 3; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping <em>Single Relationship Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Single Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping() * @generated */ public static final int SINGLE_RELATIONSHIP_MAPPING = 12; @@ -1308,11 +1308,11 @@ public class OrmPackage extends EPackageImpl public static final int SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT = RELATIONSHIP_MAPPING_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Id <em>Id</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Id</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Id - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId() + * @see org.eclipse.jpt.core.resource.orm.XmlId + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId() * @generated */ public static final int ID = 13; @@ -1381,11 +1381,11 @@ public class OrmPackage extends EPackageImpl public static final int ID_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl <em>Id Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.IdImpl <em>Id Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.IdImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdImpl() + * @see org.eclipse.jpt.core.resource.orm.IdImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdImpl() * @generated */ public static final int ID_IMPL = 14; @@ -1454,11 +1454,11 @@ public class OrmPackage extends EPackageImpl public static final int ID_IMPL_FEATURE_COUNT = ID_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId <em>Embedded Id</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Embedded Id</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedId - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedId() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedId() * @generated */ public static final int EMBEDDED_ID = 15; @@ -1491,11 +1491,11 @@ public class OrmPackage extends EPackageImpl public static final int EMBEDDED_ID_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedIdImpl() + * @see org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedIdImpl() * @generated */ public static final int EMBEDDED_ID_IMPL = 16; @@ -1528,11 +1528,11 @@ public class OrmPackage extends EPackageImpl public static final int EMBEDDED_ID_IMPL_FEATURE_COUNT = EMBEDDED_ID_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic <em>Basic</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Basic</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Basic - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic() * @generated */ public static final int BASIC = 17; @@ -1610,11 +1610,11 @@ public class OrmPackage extends EPackageImpl public static final int BASIC_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 6; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl <em>Basic Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl <em>Basic Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.BasicImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasicImpl() + * @see org.eclipse.jpt.core.resource.orm.BasicImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasicImpl() * @generated */ public static final int BASIC_IMPL = 18; @@ -1692,11 +1692,11 @@ public class OrmPackage extends EPackageImpl public static final int BASIC_IMPL_FEATURE_COUNT = BASIC_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Version <em>Version</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Version</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Version - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersion() + * @see org.eclipse.jpt.core.resource.orm.XmlVersion + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersion() * @generated */ public static final int VERSION = 19; @@ -1738,11 +1738,11 @@ public class OrmPackage extends EPackageImpl public static final int VERSION_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl <em>Version Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.VersionImpl <em>Version Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.VersionImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersionImpl() + * @see org.eclipse.jpt.core.resource.orm.VersionImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionImpl() * @generated */ public static final int VERSION_IMPL = 20; @@ -1784,11 +1784,11 @@ public class OrmPackage extends EPackageImpl public static final int VERSION_IMPL_FEATURE_COUNT = VERSION_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOne <em>Many To One</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Many To One</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOne - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOne() + * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOne() * @generated */ public static final int MANY_TO_ONE = 21; @@ -1866,11 +1866,11 @@ public class OrmPackage extends EPackageImpl public static final int MANY_TO_ONE_FEATURE_COUNT = SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.ManyToOneImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOneImpl() * @generated */ public static final int MANY_TO_ONE_IMPL = 22; @@ -1948,11 +1948,11 @@ public class OrmPackage extends EPackageImpl public static final int MANY_TO_ONE_IMPL_FEATURE_COUNT = MANY_TO_ONE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany <em>One To Many</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>One To Many</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToMany - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToMany() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToMany() * @generated */ public static final int ONE_TO_MANY = 23; @@ -2048,11 +2048,11 @@ public class OrmPackage extends EPackageImpl public static final int ONE_TO_MANY_FEATURE_COUNT = MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl <em>One To Many Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl <em>One To Many Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.OneToManyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToManyImpl() * @generated */ public static final int ONE_TO_MANY_IMPL = 24; @@ -2148,11 +2148,11 @@ public class OrmPackage extends EPackageImpl public static final int ONE_TO_MANY_IMPL_FEATURE_COUNT = ONE_TO_MANY_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne <em>One To One</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>One To One</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne() * @generated */ public static final int ONE_TO_ONE = 25; @@ -2248,11 +2248,11 @@ public class OrmPackage extends EPackageImpl public static final int ONE_TO_ONE_FEATURE_COUNT = SINGLE_RELATIONSHIP_MAPPING_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl <em>One To One Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl <em>One To One Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.OneToOneImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOneImpl() * @generated */ public static final int ONE_TO_ONE_IMPL = 26; @@ -2348,11 +2348,11 @@ public class OrmPackage extends EPackageImpl public static final int ONE_TO_ONE_IMPL_FEATURE_COUNT = ONE_TO_ONE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToMany <em>Many To Many</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Many To Many</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToMany - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToMany() + * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToMany() * @generated */ public static final int MANY_TO_MANY = 27; @@ -2439,11 +2439,11 @@ public class OrmPackage extends EPackageImpl public static final int MANY_TO_MANY_FEATURE_COUNT = MULTI_RELATIONSHIP_MAPPING_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.ManyToManyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToManyImpl() * @generated */ public static final int MANY_TO_MANY_IMPL = 28; @@ -2530,11 +2530,11 @@ public class OrmPackage extends EPackageImpl public static final int MANY_TO_MANY_IMPL_FEATURE_COUNT = MANY_TO_MANY_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Embedded <em>Embedded</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Embedded</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Embedded - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbedded() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbedded() * @generated */ public static final int EMBEDDED = 29; @@ -2567,11 +2567,11 @@ public class OrmPackage extends EPackageImpl public static final int EMBEDDED_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedImpl() + * @see org.eclipse.jpt.core.resource.orm.EmbeddedImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedImpl() * @generated */ public static final int EMBEDDED_IMPL = 30; @@ -2604,11 +2604,11 @@ public class OrmPackage extends EPackageImpl public static final int EMBEDDED_IMPL_FEATURE_COUNT = EMBEDDED_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Transient <em>Transient</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Transient</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Transient - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransient() + * @see org.eclipse.jpt.core.resource.orm.XmlTransient + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransient() * @generated */ public static final int TRANSIENT = 31; @@ -2632,11 +2632,11 @@ public class OrmPackage extends EPackageImpl public static final int TRANSIENT_FEATURE_COUNT = ATTRIBUTE_MAPPING_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.TransientImpl <em>Transient Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TransientImpl <em>Transient Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TransientImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransientImpl() + * @see org.eclipse.jpt.core.resource.orm.TransientImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransientImpl() * @generated */ public static final int TRANSIENT_IMPL = 32; @@ -2660,11 +2660,11 @@ public class OrmPackage extends EPackageImpl public static final int TRANSIENT_IMPL_FEATURE_COUNT = TRANSIENT_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride <em>Association Override</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Association Override</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAssociationOverride() + * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAssociationOverride() * @generated */ public static final int ASSOCIATION_OVERRIDE = 33; @@ -2697,11 +2697,11 @@ public class OrmPackage extends EPackageImpl public static final int ASSOCIATION_OVERRIDE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride <em>Attribute Override</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Attribute Override</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride() * @generated */ public static final int ATTRIBUTE_OVERRIDE = 34; @@ -2734,11 +2734,11 @@ public class OrmPackage extends EPackageImpl public static final int ATTRIBUTE_OVERRIDE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverrideImpl() + * @see org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverrideImpl() * @generated */ public static final int ATTRIBUTE_OVERRIDE_IMPL = 35; @@ -2771,11 +2771,11 @@ public class OrmPackage extends EPackageImpl public static final int ATTRIBUTE_OVERRIDE_IMPL_FEATURE_COUNT = ATTRIBUTE_OVERRIDE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType <em>Cascade Type</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType() + * @see org.eclipse.jpt.core.resource.orm.CascadeType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType() * @generated */ public static final int CASCADE_TYPE = 36; @@ -2835,11 +2835,11 @@ public class OrmPackage extends EPackageImpl public static final int CASCADE_TYPE_FEATURE_COUNT = 5; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeTypeImpl() + * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl() * @generated */ public static final int CASCADE_TYPE_IMPL = 37; @@ -2899,11 +2899,11 @@ public class OrmPackage extends EPackageImpl public static final int CASCADE_TYPE_IMPL_FEATURE_COUNT = CASCADE_TYPE_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn <em>Named Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Named Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn() * @generated */ public static final int NAMED_COLUMN = 38; @@ -2936,11 +2936,11 @@ public class OrmPackage extends EPackageImpl public static final int NAMED_COLUMN_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn <em>Abstract Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Abstract Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn() * @generated */ public static final int ABSTRACT_COLUMN = 39; @@ -3018,11 +3018,11 @@ public class OrmPackage extends EPackageImpl public static final int ABSTRACT_COLUMN_FEATURE_COUNT = NAMED_COLUMN_FEATURE_COUNT + 5; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Column <em>Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Column - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn() * @generated */ public static final int COLUMN = 40; @@ -3127,11 +3127,11 @@ public class OrmPackage extends EPackageImpl public static final int COLUMN_FEATURE_COUNT = ABSTRACT_COLUMN_FEATURE_COUNT + 3; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl <em>Column Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl <em>Column Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.ColumnImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnImpl() * @generated */ public static final int COLUMN_IMPL = 41; @@ -3236,11 +3236,11 @@ public class OrmPackage extends EPackageImpl public static final int COLUMN_IMPL_FEATURE_COUNT = COLUMN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult <em>Column Result</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnResult() + * @see org.eclipse.jpt.core.resource.orm.ColumnResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult() * @generated */ public static final int COLUMN_RESULT = 42; @@ -3264,11 +3264,11 @@ public class OrmPackage extends EPackageImpl public static final int COLUMN_RESULT_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn <em>Discriminator Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Discriminator Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorColumn() * @generated */ public static final int DISCRIMINATOR_COLUMN = 43; @@ -3319,11 +3319,11 @@ public class OrmPackage extends EPackageImpl public static final int DISCRIMINATOR_COLUMN_FEATURE_COUNT = NAMED_COLUMN_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners <em>Entity Listeners</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListeners - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.EntityListeners + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners() * @generated */ public static final int ENTITY_LISTENERS = 44; @@ -3347,11 +3347,11 @@ public class OrmPackage extends EPackageImpl public static final int ENTITY_LISTENERS_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener <em>Entity Listener</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener() + * @see org.eclipse.jpt.core.resource.orm.EntityListener + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener() * @generated */ public static final int ENTITY_LISTENER = 45; @@ -3438,11 +3438,11 @@ public class OrmPackage extends EPackageImpl public static final int ENTITY_LISTENER_FEATURE_COUNT = 8; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult <em>Entity Result</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult() + * @see org.eclipse.jpt.core.resource.orm.EntityResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult() * @generated */ public static final int ENTITY_RESULT = 46; @@ -3484,91 +3484,91 @@ public class OrmPackage extends EPackageImpl public static final int ENTITY_RESULT_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult <em>Field Result</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFieldResult() + * @see org.eclipse.jpt.core.resource.orm.FieldResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult() * @generated */ public static final int FIELD_RESULT = 48; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue <em>Generated Value</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Generated Value</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue() + * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue() * @generated */ public static final int GENERATED_VALUE = 49; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass <em>Id Class</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.IdClass <em>Id Class</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.IdClass - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdClass() + * @see org.eclipse.jpt.core.resource.orm.IdClass + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdClass() * @generated */ public static final int ID_CLASS = 51; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance <em>Inheritance</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Inheritance - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritance() + * @see org.eclipse.jpt.core.resource.orm.Inheritance + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance() * @generated */ public static final int INHERITANCE = 52; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn <em>Join Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Join Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumn() * @generated */ public static final int JOIN_COLUMN = 53; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable <em>Join Table</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Join Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable() * @generated */ public static final int JOIN_TABLE = 55; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Lob <em>Lob</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Lob - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getLob() + * @see org.eclipse.jpt.core.resource.orm.Lob + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob() * @generated */ public static final int LOB = 57; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey <em>Map Key</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MapKey - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKey() + * @see org.eclipse.jpt.core.resource.orm.MapKey + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey() * @generated */ public static final int MAP_KEY = 58; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod <em>Event Method</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EventMethod - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEventMethod() + * @see org.eclipse.jpt.core.resource.orm.EventMethod + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod() * @generated */ public static final int EVENT_METHOD = 47; @@ -3646,11 +3646,11 @@ public class OrmPackage extends EPackageImpl public static final int GENERATED_VALUE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValueImpl() + * @see org.eclipse.jpt.core.resource.orm.GeneratedValueImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValueImpl() * @generated */ public static final int GENERATED_VALUE_IMPL = 50; @@ -3800,11 +3800,11 @@ public class OrmPackage extends EPackageImpl public static final int JOIN_COLUMN_FEATURE_COUNT = ABSTRACT_COLUMN_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.JoinColumnImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumnImpl() * @generated */ public static final int JOIN_COLUMN_IMPL = 54; @@ -3891,11 +3891,11 @@ public class OrmPackage extends EPackageImpl public static final int JOIN_COLUMN_IMPL_FEATURE_COUNT = JOIN_COLUMN_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable <em>Abstract Table</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable <em>Abstract Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable() * @generated */ public static final int ABSTRACT_TABLE = 72; @@ -4009,11 +4009,11 @@ public class OrmPackage extends EPackageImpl public static final int JOIN_TABLE_FEATURE_COUNT = ABSTRACT_TABLE_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl <em>Join Table Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl <em>Join Table Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTableImpl() + * @see org.eclipse.jpt.core.resource.orm.JoinTableImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTableImpl() * @generated */ public static final int JOIN_TABLE_IMPL = 56; @@ -4109,11 +4109,11 @@ public class OrmPackage extends EPackageImpl public static final int MAP_KEY_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKeyImpl() + * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKeyImpl() * @generated */ public static final int MAP_KEY_IMPL = 59; @@ -4137,11 +4137,11 @@ public class OrmPackage extends EPackageImpl public static final int MAP_KEY_IMPL_FEATURE_COUNT = MAP_KEY_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Query <em>Query</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Query - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery() * @generated */ public static final int QUERY = 60; @@ -4183,11 +4183,11 @@ public class OrmPackage extends EPackageImpl public static final int QUERY_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery <em>Named Native Query</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Named Native Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedNativeQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedNativeQuery() * @generated */ public static final int NAMED_NATIVE_QUERY = 61; @@ -4247,11 +4247,11 @@ public class OrmPackage extends EPackageImpl public static final int NAMED_NATIVE_QUERY_FEATURE_COUNT = QUERY_FEATURE_COUNT + 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery <em>Named Query</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Named Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedQuery - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedQuery() * @generated */ public static final int NAMED_QUERY = 62; @@ -4293,11 +4293,11 @@ public class OrmPackage extends EPackageImpl public static final int NAMED_QUERY_FEATURE_COUNT = QUERY_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostLoad <em>Post Load</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostLoad - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.PostLoad + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad() * @generated */ public static final int POST_LOAD = 63; @@ -4321,11 +4321,11 @@ public class OrmPackage extends EPackageImpl public static final int POST_LOAD_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostPersist <em>Post Persist</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostPersist - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.PostPersist + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist() * @generated */ public static final int POST_PERSIST = 64; @@ -4349,11 +4349,11 @@ public class OrmPackage extends EPackageImpl public static final int POST_PERSIST_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostRemove <em>Post Remove</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostRemove - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.PostRemove + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove() * @generated */ public static final int POST_REMOVE = 65; @@ -4377,11 +4377,11 @@ public class OrmPackage extends EPackageImpl public static final int POST_REMOVE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostUpdate <em>Post Update</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostUpdate - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.PostUpdate + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate() * @generated */ public static final int POST_UPDATE = 66; @@ -4405,11 +4405,11 @@ public class OrmPackage extends EPackageImpl public static final int POST_UPDATE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PrePersist <em>Pre Persist</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PrePersist - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.PrePersist + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist() * @generated */ public static final int PRE_PERSIST = 67; @@ -4433,11 +4433,11 @@ public class OrmPackage extends EPackageImpl public static final int PRE_PERSIST_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PreRemove <em>Pre Remove</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PreRemove - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.PreRemove + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove() * @generated */ public static final int PRE_REMOVE = 68; @@ -4461,11 +4461,11 @@ public class OrmPackage extends EPackageImpl public static final int PRE_REMOVE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PreUpdate <em>Pre Update</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PreUpdate - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.PreUpdate + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate() * @generated */ public static final int PRE_UPDATE = 69; @@ -4489,31 +4489,31 @@ public class OrmPackage extends EPackageImpl public static final int PRE_UPDATE_FEATURE_COUNT = EVENT_METHOD_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint <em>Query Hint</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Query Hint</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQueryHint() + * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQueryHint() * @generated */ public static final int QUERY_HINT = 71; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping() + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping() * @generated */ public static final int SQL_RESULT_SET_MAPPING = 78; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn <em>Primary Key Join Column</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Primary Key Join Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() * @generated */ public static final int PRIMARY_KEY_JOIN_COLUMN = 70; @@ -4582,31 +4582,31 @@ public class OrmPackage extends EPackageImpl public static final int QUERY_HINT_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable <em>Secondary Table</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Secondary Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SecondaryTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSecondaryTable() + * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSecondaryTable() * @generated */ public static final int SECONDARY_TABLE = 74; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator <em>Sequence Generator</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Sequence Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGenerator() * @generated */ public static final int SEQUENCE_GENERATOR = 76; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Table <em>Table</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Table - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTable() + * @see org.eclipse.jpt.core.resource.orm.XmlTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTable() * @generated */ public static final int TABLE = 73; @@ -4711,11 +4711,11 @@ public class OrmPackage extends EPackageImpl public static final int SECONDARY_TABLE_FEATURE_COUNT = ABSTRACT_TABLE_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.Generator <em>Generator</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Generator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator() * @generated */ public static final int GENERATOR = 75; @@ -4802,11 +4802,11 @@ public class OrmPackage extends EPackageImpl public static final int SEQUENCE_GENERATOR_FEATURE_COUNT = GENERATOR_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGeneratorImpl() * @generated */ public static final int SEQUENCE_GENERATOR_IMPL = 77; @@ -4893,11 +4893,11 @@ public class OrmPackage extends EPackageImpl public static final int SQL_RESULT_SET_MAPPING_FEATURE_COUNT = 3; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator <em>Table Generator</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Table Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator() * @generated */ public static final int TABLE_GENERATOR = 79; @@ -5002,11 +5002,11 @@ public class OrmPackage extends EPackageImpl public static final int TABLE_GENERATOR_FEATURE_COUNT = GENERATOR_FEATURE_COUNT + 7; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.TableGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGeneratorImpl() * @generated */ public static final int TABLE_GENERATOR_IMPL = 80; @@ -5111,11 +5111,11 @@ public class OrmPackage extends EPackageImpl public static final int TABLE_GENERATOR_IMPL_FEATURE_COUNT = TABLE_GENERATOR_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint <em>Unique Constraint</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.UniqueConstraint <em>Unique Constraint</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getUniqueConstraint() + * @see org.eclipse.jpt.core.resource.orm.UniqueConstraint + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getUniqueConstraint() * @generated */ public static final int UNIQUE_CONSTRAINT = 81; @@ -5139,71 +5139,71 @@ public class OrmPackage extends EPackageImpl public static final int UNIQUE_CONSTRAINT_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.AccessType <em>Access Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAccessType() + * @see org.eclipse.jpt.core.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType() * @generated */ public static final int ACCESS_TYPE = 82; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorType() + * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType() * @generated */ public static final int DISCRIMINATOR_TYPE = 83; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.EnumType <em>Enum Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEnumType() + * @see org.eclipse.jpt.core.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType() * @generated */ public static final int ENUM_TYPE = 84; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.FetchType <em>Fetch Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFetchType() + * @see org.eclipse.jpt.core.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType() * @generated */ public static final int FETCH_TYPE = 85; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.GenerationType <em>Generation Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerationType() + * @see org.eclipse.jpt.core.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType() * @generated */ public static final int GENERATION_TYPE = 86; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.InheritanceType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritanceType() + * @see org.eclipse.jpt.core.resource.orm.InheritanceType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType() * @generated */ public static final int INHERITANCE_TYPE = 87; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.orm.TemporalType <em>Temporal Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTemporalType() + * @see org.eclipse.jpt.core.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType() * @generated */ public static final int TEMPORAL_TYPE = 88; @@ -5213,7 +5213,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue() * @generated */ public static final int DISCRIMINATOR_VALUE = 89; @@ -5223,7 +5223,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.common.util.Enumerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEnumerated() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated() * @generated */ public static final int ENUMERATED = 90; @@ -5233,7 +5233,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOrderBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy() * @generated */ public static final int ORDER_BY = 91; @@ -5243,7 +5243,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersionType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionType() * @generated */ public static final int VERSION_TYPE = 92; @@ -5910,7 +5910,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#eNS_URI + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#eNS_URI * @see #init() * @generated */ @@ -5980,11 +5980,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings <em>Entity Mappings</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityMappings <em>Entity Mappings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity Mappings</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings + * @see org.eclipse.jpt.core.resource.orm.EntityMappings * @generated */ public EClass getEntityMappings() @@ -5993,11 +5993,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion <em>Version</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion <em>Version</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Version</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getVersion() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getVersion() * @see #getEntityMappings() * @generated */ @@ -6007,11 +6007,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getDescription <em>Description</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getDescription <em>Description</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getDescription() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getDescription() * @see #getEntityMappings() * @generated */ @@ -6021,11 +6021,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Persistence Unit Metadata</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPersistenceUnitMetadata() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getPersistenceUnitMetadata() * @see #getEntityMappings() * @generated */ @@ -6035,11 +6035,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPackage <em>Package</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getPackage <em>Package</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Package</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getPackage() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getPackage() * @see #getEntityMappings() * @generated */ @@ -6049,11 +6049,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSchema <em>Schema</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSchema <em>Schema</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Schema</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSchema() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getSchema() * @see #getEntityMappings() * @generated */ @@ -6063,11 +6063,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getCatalog <em>Catalog</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Catalog</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getCatalog() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getCatalog() * @see #getEntityMappings() * @generated */ @@ -6077,11 +6077,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getAccess <em>Access</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getAccess <em>Access</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Access</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getAccess() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getAccess() * @see #getEntityMappings() * @generated */ @@ -6091,11 +6091,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSequenceGenerators <em>Sequence Generators</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSequenceGenerators <em>Sequence Generators</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Sequence Generators</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSequenceGenerators() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getSequenceGenerators() * @see #getEntityMappings() * @generated */ @@ -6105,11 +6105,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getTableGenerators <em>Table Generators</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getTableGenerators <em>Table Generators</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Table Generators</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getTableGenerators() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getTableGenerators() * @see #getEntityMappings() * @generated */ @@ -6119,11 +6119,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedQueries <em>Named Queries</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedQueries <em>Named Queries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Named Queries</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedQueries() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedQueries() * @see #getEntityMappings() * @generated */ @@ -6133,11 +6133,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedNativeQueries <em>Named Native Queries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Named Native Queries</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getNamedNativeQueries() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getNamedNativeQueries() * @see #getEntityMappings() * @generated */ @@ -6147,11 +6147,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getSqlResultSetMappings() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getSqlResultSetMappings() * @see #getEntityMappings() * @generated */ @@ -6161,11 +6161,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getMappedSuperclasses <em>Mapped Superclasses</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Mapped Superclasses</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getMappedSuperclasses() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getMappedSuperclasses() * @see #getEntityMappings() * @generated */ @@ -6175,11 +6175,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEntities <em>Entities</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getEntities <em>Entities</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Entities</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEntities() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getEntities() * @see #getEntityMappings() * @generated */ @@ -6189,11 +6189,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEmbeddables <em>Embeddables</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityMappings#getEmbeddables <em>Embeddables</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Embeddables</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings#getEmbeddables() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings#getEmbeddables() * @see #getEntityMappings() * @generated */ @@ -6203,11 +6203,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Persistence Unit Metadata</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata * @generated */ public EClass getPersistenceUnitMetadata() @@ -6216,11 +6216,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Xml Mapping Metadata Complete</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete() * @see #getPersistenceUnitMetadata() * @generated */ @@ -6230,11 +6230,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Persistence Unit Defaults</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults() * @see #getPersistenceUnitMetadata() * @generated */ @@ -6244,11 +6244,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Persistence Unit Defaults</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults * @generated */ public EClass getPersistenceUnitDefaults() @@ -6257,11 +6257,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Schema</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getSchema() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getSchema() * @see #getPersistenceUnitDefaults() * @generated */ @@ -6271,11 +6271,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Catalog</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getCatalog() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getCatalog() * @see #getPersistenceUnitDefaults() * @generated */ @@ -6285,11 +6285,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Access</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getAccess() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getAccess() * @see #getPersistenceUnitDefaults() * @generated */ @@ -6299,11 +6299,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#isCascadePersist() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#isCascadePersist() * @see #getPersistenceUnitDefaults() * @generated */ @@ -6313,11 +6313,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Entity Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getEntityListeners() * @see #getPersistenceUnitDefaults() * @generated */ @@ -6327,11 +6327,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping <em>Type Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping <em>Type Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Type Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping * @generated */ public EClass getTypeMapping() @@ -6341,11 +6341,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getClassName <em>Class Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getClassName <em>Class Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getClassName() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getClassName() * @see #getTypeMapping() * @generated */ @@ -6356,11 +6356,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAccess <em>Access</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAccess <em>Access</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Access</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAccess() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAccess() * @see #getTypeMapping() * @generated */ @@ -6371,11 +6371,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getMetadataComplete <em>Metadata Complete</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getMetadataComplete <em>Metadata Complete</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Metadata Complete</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getMetadataComplete() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getMetadataComplete() * @see #getTypeMapping() * @generated */ @@ -6386,11 +6386,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getDescription <em>Description</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getDescription <em>Description</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getDescription() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getDescription() * @see #getTypeMapping() * @generated */ @@ -6401,11 +6401,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAttributes <em>Attributes</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAttributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Attributes</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping#getAttributes() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping#getAttributes() * @see #getTypeMapping() * @generated */ @@ -6416,11 +6416,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass <em>Mapped Superclass</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Mapped Superclass</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Mapped Superclass</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass * @generated */ public EClass getMappedSuperclass() @@ -6429,11 +6429,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getIdClass <em>Id Class</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Id Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getIdClass() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass() * @see #getMappedSuperclass() * @generated */ @@ -6443,11 +6443,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Exclude Default Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeDefaultListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners() * @see #getMappedSuperclass() * @generated */ @@ -6457,11 +6457,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Exclude Superclass Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeSuperclassListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners() * @see #getMappedSuperclass() * @generated */ @@ -6471,11 +6471,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getEntityListeners <em>Entity Listeners</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Entity Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners() * @see #getMappedSuperclass() * @generated */ @@ -6485,11 +6485,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPrePersist <em>Pre Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist() * @see #getMappedSuperclass() * @generated */ @@ -6499,11 +6499,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostPersist <em>Post Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist() * @see #getMappedSuperclass() * @generated */ @@ -6513,11 +6513,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreRemove <em>Pre Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove() * @see #getMappedSuperclass() * @generated */ @@ -6527,11 +6527,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostRemove <em>Post Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove() * @see #getMappedSuperclass() * @generated */ @@ -6541,11 +6541,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreUpdate <em>Pre Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate() * @see #getMappedSuperclass() * @generated */ @@ -6555,11 +6555,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostUpdate <em>Post Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate() * @see #getMappedSuperclass() * @generated */ @@ -6569,11 +6569,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostLoad <em>Post Load</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Load</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad() * @see #getMappedSuperclass() * @generated */ @@ -6583,11 +6583,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Entity <em>Entity</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlEntity <em>Entity</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity + * @see org.eclipse.jpt.core.resource.orm.XmlEntity * @generated */ public EClass getEntity() @@ -6596,11 +6596,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getName() * @see #getEntity() * @generated */ @@ -6610,11 +6610,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTable <em>Table</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getTable() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getTable() * @see #getEntity() * @generated */ @@ -6625,11 +6625,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSecondaryTables <em>Secondary Tables</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables <em>Secondary Tables</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Secondary Tables</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getSecondaryTables() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables() * @see #getEntity() * @generated */ @@ -6639,11 +6639,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns() * @see #getEntity() * @generated */ @@ -6653,11 +6653,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getIdClass <em>Id Class</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Id Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getIdClass() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass() * @see #getEntity() * @generated */ @@ -6667,11 +6667,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getInheritance <em>Inheritance</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Inheritance</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getInheritance() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance() * @see #getEntity() * @generated */ @@ -6681,11 +6681,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorValue <em>Discriminator Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Discriminator Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorValue() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue() * @see #getEntity() * @generated */ @@ -6695,11 +6695,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorColumn <em>Discriminator Column</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Discriminator Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn() * @see #getEntity() * @generated */ @@ -6709,11 +6709,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSequenceGenerator <em>Sequence Generator</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSequenceGenerator <em>Sequence Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Sequence Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getSequenceGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getSequenceGenerator() * @see #getEntity() * @generated */ @@ -6723,11 +6723,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTableGenerator <em>Table Generator</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTableGenerator <em>Table Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Table Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getTableGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getTableGenerator() * @see #getEntity() * @generated */ @@ -6737,11 +6737,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedQueries <em>Named Queries</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries <em>Named Queries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Named Queries</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedQueries() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries() * @see #getEntity() * @generated */ @@ -6751,11 +6751,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedNativeQueries <em>Named Native Queries</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries <em>Named Native Queries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Named Native Queries</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedNativeQueries() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries() * @see #getEntity() * @generated */ @@ -6765,11 +6765,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Sql Result Set Mappings</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getSqlResultSetMappings() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings() * @see #getEntity() * @generated */ @@ -6779,11 +6779,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Exclude Default Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeDefaultListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners() * @see #getEntity() * @generated */ @@ -6793,11 +6793,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Exclude Superclass Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeSuperclassListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners() * @see #getEntity() * @generated */ @@ -6807,11 +6807,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getEntityListeners <em>Entity Listeners</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Entity Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners() * @see #getEntity() * @generated */ @@ -6821,11 +6821,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPrePersist <em>Pre Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist() * @see #getEntity() * @generated */ @@ -6835,11 +6835,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostPersist <em>Post Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist() * @see #getEntity() * @generated */ @@ -6849,11 +6849,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreRemove <em>Pre Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove() * @see #getEntity() * @generated */ @@ -6863,11 +6863,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostRemove <em>Post Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove() * @see #getEntity() * @generated */ @@ -6877,11 +6877,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreUpdate <em>Pre Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate() * @see #getEntity() * @generated */ @@ -6891,11 +6891,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostUpdate <em>Post Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate() * @see #getEntity() * @generated */ @@ -6905,11 +6905,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostLoad <em>Post Load</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Load</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad() * @see #getEntity() * @generated */ @@ -6919,11 +6919,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getAttributeOverrides <em>Attribute Overrides</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides <em>Attribute Overrides</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides() * @see #getEntity() * @generated */ @@ -6933,11 +6933,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getAssociationOverrides <em>Association Overrides</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides <em>Association Overrides</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Association Overrides</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Entity#getAssociationOverrides() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides() * @see #getEntity() * @generated */ @@ -6947,11 +6947,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Embeddable <em>Embeddable</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable <em>Embeddable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Embeddable</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Embeddable + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddable * @generated */ public EClass getEmbeddable() @@ -6960,11 +6960,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes <em>Attributes</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.Attributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Attributes</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes + * @see org.eclipse.jpt.core.resource.orm.Attributes * @generated */ public EClass getAttributes() @@ -6973,11 +6973,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getIds <em>Ids</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getIds <em>Ids</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Ids</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getIds() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getIds() * @see #getAttributes() * @generated */ @@ -6987,11 +6987,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds <em>Embedded Ids</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Embedded Ids</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddedIds() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddedIds() * @see #getAttributes() * @generated */ @@ -7002,11 +7002,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getBasics <em>Basics</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getBasics <em>Basics</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Basics</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getBasics() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getBasics() * @see #getAttributes() * @generated */ @@ -7016,11 +7016,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getVersions <em>Versions</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getVersions <em>Versions</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Versions</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getVersions() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getVersions() * @see #getAttributes() * @generated */ @@ -7030,11 +7030,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes <em>Many To Ones</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Many To Ones</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToOnes() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getManyToOnes() * @see #getAttributes() * @generated */ @@ -7044,11 +7044,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys <em>One To Manys</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>One To Manys</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToManys() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getOneToManys() * @see #getAttributes() * @generated */ @@ -7059,11 +7059,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes <em>One To Ones</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>One To Ones</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getOneToOnes() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getOneToOnes() * @see #getAttributes() * @generated */ @@ -7073,11 +7073,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys <em>Many To Manys</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Many To Manys</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getManyToManys() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getManyToManys() * @see #getAttributes() * @generated */ @@ -7088,11 +7088,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds <em>Embeddeds</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Embeddeds</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getEmbeddeds() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getEmbeddeds() * @see #getAttributes() * @generated */ @@ -7102,11 +7102,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes#getTransients <em>Transients</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.Attributes#getTransients <em>Transients</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Transients</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes#getTransients() + * @see org.eclipse.jpt.core.resource.orm.Attributes#getTransients() * @see #getAttributes() * @generated */ @@ -7116,11 +7116,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping <em>Attribute Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Attribute Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Attribute Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeMapping + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping * @generated */ public EClass getAttributeMapping() @@ -7130,11 +7130,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeMapping#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName() * @see #getAttributeMapping() * @generated */ @@ -7145,11 +7145,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping <em>Column Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Column Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnMapping + * @see org.eclipse.jpt.core.resource.orm.ColumnMapping * @generated */ public EClass getColumnMapping() @@ -7159,11 +7159,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping#getColumn <em>Column</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn <em>Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnMapping#getColumn() + * @see org.eclipse.jpt.core.resource.orm.ColumnMapping#getColumn() * @see #getColumnMapping() * @generated */ @@ -7174,11 +7174,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping <em>Relationship Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Relationship Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Relationship Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping * @generated */ public EClass getRelationshipMapping() @@ -7188,11 +7188,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getTargetEntity <em>Target Entity</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Target Entity</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getTargetEntity() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity() * @see #getRelationshipMapping() * @generated */ @@ -7203,11 +7203,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getFetch <em>Fetch</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Fetch</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getFetch() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch() * @see #getRelationshipMapping() * @generated */ @@ -7218,11 +7218,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getCascade <em>Cascade</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Cascade</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getCascade() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade() * @see #getRelationshipMapping() * @generated */ @@ -7233,11 +7233,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getJoinTable <em>Join Table</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Join Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getJoinTable() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable() * @see #getRelationshipMapping() * @generated */ @@ -7248,11 +7248,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping <em>Multi Relationship Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Multi Relationship Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Multi Relationship Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping * @generated */ public EClass getMultiRelationshipMapping() @@ -7262,11 +7262,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getOrderBy <em>Order By</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Order By</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getOrderBy() + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy() * @see #getMultiRelationshipMapping() * @generated */ @@ -7277,11 +7277,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMapKey <em>Map Key</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Map Key</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMapKey() + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey() * @see #getMultiRelationshipMapping() * @generated */ @@ -7292,11 +7292,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMappedBy <em>Mapped By</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Mapped By</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMappedBy() + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy() * @see #getMultiRelationshipMapping() * @generated */ @@ -7307,11 +7307,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping <em>Single Relationship Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Single Relationship Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Single Relationship Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping * @generated */ public EClass getSingleRelationshipMapping() @@ -7321,11 +7321,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getOptional <em>Optional</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Optional</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getOptional() + * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional() * @see #getSingleRelationshipMapping() * @generated */ @@ -7336,11 +7336,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns() * @see #getSingleRelationshipMapping() * @generated */ @@ -7351,11 +7351,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Id <em>Id</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Id</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Id + * @see org.eclipse.jpt.core.resource.orm.XmlId * @generated */ public EClass getId() @@ -7364,11 +7364,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getGeneratedValue <em>Generated Value</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#getGeneratedValue <em>Generated Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Generated Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Id#getGeneratedValue() + * @see org.eclipse.jpt.core.resource.orm.XmlId#getGeneratedValue() * @see #getId() * @generated */ @@ -7378,11 +7378,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTemporal <em>Temporal</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Temporal</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Id#getTemporal() + * @see org.eclipse.jpt.core.resource.orm.XmlId#getTemporal() * @see #getId() * @generated */ @@ -7392,11 +7392,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTableGenerator <em>Table Generator</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTableGenerator <em>Table Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Table Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Id#getTableGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlId#getTableGenerator() * @see #getId() * @generated */ @@ -7406,11 +7406,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getSequenceGenerator <em>Sequence Generator</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlId#getSequenceGenerator <em>Sequence Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Sequence Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Id#getSequenceGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlId#getSequenceGenerator() * @see #getId() * @generated */ @@ -7420,11 +7420,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl <em>Id Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.IdImpl <em>Id Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Id Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.IdImpl + * @see org.eclipse.jpt.core.resource.orm.IdImpl * @generated */ public EClass getIdImpl() @@ -7434,11 +7434,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId <em>Embedded Id</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Embedded Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Embedded Id</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedId + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId * @generated */ public EClass getEmbeddedId() @@ -7447,11 +7447,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId#getAttributeOverrides <em>Attribute Overrides</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId#getAttributeOverrides <em>Attribute Overrides</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedId#getAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId#getAttributeOverrides() * @see #getEmbeddedId() * @generated */ @@ -7461,11 +7461,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Embedded Id Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl + * @see org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl * @generated */ public EClass getEmbeddedIdImpl() @@ -7475,11 +7475,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Basic <em>Basic</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Basic</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Basic</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic + * @see org.eclipse.jpt.core.resource.orm.XmlBasic * @generated */ public EClass getBasic() @@ -7488,11 +7488,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getFetch <em>Fetch</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Fetch</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic#getFetch() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch() * @see #getBasic() * @generated */ @@ -7502,11 +7502,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getOptional <em>Optional</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Optional</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic#getOptional() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional() * @see #getBasic() * @generated */ @@ -7516,11 +7516,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#isLob <em>Lob</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Lob</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic#isLob() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic#isLob() * @see #getBasic() * @generated */ @@ -7530,11 +7530,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getTemporal <em>Temporal</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Temporal</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic#getTemporal() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal() * @see #getBasic() * @generated */ @@ -7544,11 +7544,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getEnumerated <em>Enumerated</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Enumerated</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Basic#getEnumerated() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated() * @see #getBasic() * @generated */ @@ -7558,11 +7558,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl <em>Basic Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.BasicImpl <em>Basic Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Basic Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.BasicImpl + * @see org.eclipse.jpt.core.resource.orm.BasicImpl * @generated */ public EClass getBasicImpl() @@ -7572,11 +7572,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Version <em>Version</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Version</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Version</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Version + * @see org.eclipse.jpt.core.resource.orm.XmlVersion * @generated */ public EClass getVersion() @@ -7585,11 +7585,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Version#getTemporal <em>Temporal</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Temporal</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Version#getTemporal() + * @see org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal() * @see #getVersion() * @generated */ @@ -7599,11 +7599,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl <em>Version Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.VersionImpl <em>Version Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Version Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.VersionImpl + * @see org.eclipse.jpt.core.resource.orm.VersionImpl * @generated */ public EClass getVersionImpl() @@ -7613,11 +7613,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOne <em>Many To One</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Many To One</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Many To One</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOne + * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne * @generated */ public EClass getManyToOne() @@ -7626,11 +7626,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Many To One Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl + * @see org.eclipse.jpt.core.resource.orm.ManyToOneImpl * @generated */ public EClass getManyToOneImpl() @@ -7640,11 +7640,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany <em>One To Many</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>One To Many</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>One To Many</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToMany + * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany * @generated */ public EClass getOneToMany() @@ -7653,11 +7653,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany#getJoinColumns <em>Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns <em>Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToMany#getJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns() * @see #getOneToMany() * @generated */ @@ -7667,11 +7667,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl <em>One To Many Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl <em>One To Many Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>One To Many Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl + * @see org.eclipse.jpt.core.resource.orm.OneToManyImpl * @generated */ public EClass getOneToManyImpl() @@ -7681,11 +7681,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne <em>One To One</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>One To One</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>One To One</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne + * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne * @generated */ public EClass getOneToOne() @@ -7694,11 +7694,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne#getPrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns() * @see #getOneToOne() * @generated */ @@ -7708,11 +7708,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl <em>One To One Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl <em>One To One Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>One To One Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl + * @see org.eclipse.jpt.core.resource.orm.OneToOneImpl * @generated */ public EClass getOneToOneImpl() @@ -7722,11 +7722,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne#getMappedBy <em>Mapped By</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Mapped By</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne#getMappedBy() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy() * @see #getOneToOne() * @generated */ @@ -7737,11 +7737,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToMany <em>Many To Many</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Many To Many</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Many To Many</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToMany + * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany * @generated */ public EClass getManyToMany() @@ -7750,11 +7750,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Many To Many Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl + * @see org.eclipse.jpt.core.resource.orm.ManyToManyImpl * @generated */ public EClass getManyToManyImpl() @@ -7764,11 +7764,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Embedded <em>Embedded</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Embedded</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Embedded</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Embedded + * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded * @generated */ public EClass getEmbedded() @@ -7777,11 +7777,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Embedded#getAttributeOverrides <em>Attribute Overrides</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded#getAttributeOverrides <em>Attribute Overrides</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Attribute Overrides</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Embedded#getAttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded#getAttributeOverrides() * @see #getEmbedded() * @generated */ @@ -7791,11 +7791,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Embedded Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl + * @see org.eclipse.jpt.core.resource.orm.EmbeddedImpl * @generated */ public EClass getEmbeddedImpl() @@ -7805,11 +7805,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Transient <em>Transient</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Transient</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Transient</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Transient + * @see org.eclipse.jpt.core.resource.orm.XmlTransient * @generated */ public EClass getTransient() @@ -7818,11 +7818,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.TransientImpl <em>Transient Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.TransientImpl <em>Transient Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Transient Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TransientImpl + * @see org.eclipse.jpt.core.resource.orm.TransientImpl * @generated */ public EClass getTransientImpl() @@ -7832,11 +7832,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride <em>Association Override</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Association Override</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Association Override</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride + * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride * @generated */ public EClass getAssociationOverride() @@ -7845,11 +7845,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getJoinColumns <em>Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getJoinColumns <em>Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getJoinColumns() * @see #getAssociationOverride() * @generated */ @@ -7860,11 +7860,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName() * @see #getAssociationOverride() * @generated */ @@ -7874,11 +7874,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride <em>Attribute Override</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Attribute Override</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Attribute Override</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride * @generated */ public EClass getAttributeOverride() @@ -7887,11 +7887,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getColumn <em>Column</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn() * @see #getAttributeOverride() * @generated */ @@ -7901,11 +7901,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName() * @see #getAttributeOverride() * @generated */ @@ -7915,11 +7915,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Attribute Override Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl + * @see org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl * @generated */ public EClass getAttributeOverrideImpl() @@ -7929,11 +7929,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType <em>Cascade Type</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Cascade Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType + * @see org.eclipse.jpt.core.resource.orm.CascadeType * @generated */ public EClass getCascadeType() @@ -7942,11 +7942,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll <em>Cascade All</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade All</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeAll() + * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeAll() * @see #getCascadeType() * @generated */ @@ -7956,11 +7956,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist <em>Cascade Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadePersist() + * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadePersist() * @see #getCascadeType() * @generated */ @@ -7970,11 +7970,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge <em>Cascade Merge</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade Merge</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeMerge() + * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeMerge() * @see #getCascadeType() * @generated */ @@ -7984,11 +7984,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove <em>Cascade Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRemove() + * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRemove() * @see #getCascadeType() * @generated */ @@ -7998,11 +7998,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh <em>Cascade Refresh</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Cascade Refresh</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType#isCascadeRefresh() + * @see org.eclipse.jpt.core.resource.orm.CascadeType#isCascadeRefresh() * @see #getCascadeType() * @generated */ @@ -8012,11 +8012,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Cascade Type Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl + * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl * @generated */ public EClass getCascadeTypeImpl() @@ -8026,11 +8026,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn <em>Named Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Named Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Named Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn + * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn * @generated */ public EClass getNamedColumn() @@ -8040,11 +8040,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getColumnDefinition <em>Column Definition</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Column Definition</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition() * @see #getNamedColumn() * @generated */ @@ -8055,11 +8055,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName() * @see #getNamedColumn() * @generated */ @@ -8070,11 +8070,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn <em>Abstract Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Abstract Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Abstract Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn * @generated */ public EClass getAbstractColumn() @@ -8084,11 +8084,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getInsertable <em>Insertable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Insertable</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getInsertable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable() * @see #getAbstractColumn() * @generated */ @@ -8099,11 +8099,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getNullable <em>Nullable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Nullable</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getNullable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable() * @see #getAbstractColumn() * @generated */ @@ -8114,11 +8114,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getTable <em>Table</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getTable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable() * @see #getAbstractColumn() * @generated */ @@ -8129,11 +8129,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUnique <em>Unique</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Unique</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUnique() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique() * @see #getAbstractColumn() * @generated */ @@ -8144,11 +8144,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUpdatable <em>Updatable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Updatable</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUpdatable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable() * @see #getAbstractColumn() * @generated */ @@ -8159,11 +8159,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Column <em>Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Column + * @see org.eclipse.jpt.core.resource.orm.XmlColumn * @generated */ public EClass getColumn() @@ -8172,11 +8172,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getLength <em>Length</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getLength <em>Length</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Length</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Column#getLength() + * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getLength() * @see #getColumn() * @generated */ @@ -8186,11 +8186,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getPrecision <em>Precision</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Precision</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Column#getPrecision() + * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision() * @see #getColumn() * @generated */ @@ -8200,11 +8200,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getScale <em>Scale</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Scale</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Column#getScale() + * @see org.eclipse.jpt.core.resource.orm.XmlColumn#getScale() * @see #getColumn() * @generated */ @@ -8214,11 +8214,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl <em>Column Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl <em>Column Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Column Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnImpl + * @see org.eclipse.jpt.core.resource.orm.ColumnImpl * @generated */ public EClass getColumnImpl() @@ -8228,11 +8228,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult <em>Column Result</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Column Result</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnResult + * @see org.eclipse.jpt.core.resource.orm.ColumnResult * @generated */ public EClass getColumnResult() @@ -8241,11 +8241,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.ColumnResult#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnResult#getName() + * @see org.eclipse.jpt.core.resource.orm.ColumnResult#getName() * @see #getColumnResult() * @generated */ @@ -8255,11 +8255,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn <em>Discriminator Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Discriminator Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Discriminator Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn + * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn * @generated */ public EClass getDiscriminatorColumn() @@ -8268,11 +8268,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Discriminator Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getDiscriminatorType() + * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType() * @see #getDiscriminatorColumn() * @generated */ @@ -8282,11 +8282,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getLength <em>Length</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Length</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getLength() + * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength() * @see #getDiscriminatorColumn() * @generated */ @@ -8296,11 +8296,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners <em>Entity Listeners</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListeners + * @see org.eclipse.jpt.core.resource.orm.EntityListeners * @generated */ public EClass getEntityListeners() @@ -8309,11 +8309,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityListeners#getEntityListeners <em>Entity Listeners</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Entity Listeners</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListeners#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.EntityListeners#getEntityListeners() * @see #getEntityListeners() * @generated */ @@ -8323,11 +8323,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener <em>Entity Listener</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity Listener</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener + * @see org.eclipse.jpt.core.resource.orm.EntityListener * @generated */ public EClass getEntityListener() @@ -8336,11 +8336,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getClassName <em>Class Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getClassName <em>Class Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getClassName() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getClassName() * @see #getEntityListener() * @generated */ @@ -8350,11 +8350,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist <em>Pre Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPrePersist() * @see #getEntityListener() * @generated */ @@ -8364,11 +8364,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist <em>Post Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostPersist() * @see #getEntityListener() * @generated */ @@ -8378,11 +8378,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove <em>Pre Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPreRemove() * @see #getEntityListener() * @generated */ @@ -8392,11 +8392,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove <em>Post Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostRemove() * @see #getEntityListener() * @generated */ @@ -8406,11 +8406,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate <em>Pre Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Pre Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPreUpdate() * @see #getEntityListener() * @generated */ @@ -8420,11 +8420,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate <em>Post Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostUpdate() * @see #getEntityListener() * @generated */ @@ -8434,11 +8434,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad <em>Post Load</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Post Load</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.EntityListener#getPostLoad() * @see #getEntityListener() * @generated */ @@ -8448,11 +8448,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult <em>Entity Result</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity Result</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult + * @see org.eclipse.jpt.core.resource.orm.EntityResult * @generated */ public EClass getEntityResult() @@ -8461,11 +8461,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn <em>Discriminator Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Discriminator Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult#getDiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.EntityResult#getDiscriminatorColumn() * @see #getEntityResult() * @generated */ @@ -8475,11 +8475,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass <em>Entity Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Entity Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult#getEntityClass() + * @see org.eclipse.jpt.core.resource.orm.EntityResult#getEntityClass() * @see #getEntityResult() * @generated */ @@ -8489,11 +8489,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults <em>Field Results</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Field Results</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult#getFieldResults() + * @see org.eclipse.jpt.core.resource.orm.EntityResult#getFieldResults() * @see #getEntityResult() * @generated */ @@ -8503,11 +8503,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult <em>Field Result</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Field Result</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult + * @see org.eclipse.jpt.core.resource.orm.FieldResult * @generated */ public EClass getFieldResult() @@ -8516,11 +8516,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult#getName() + * @see org.eclipse.jpt.core.resource.orm.FieldResult#getName() * @see #getFieldResult() * @generated */ @@ -8530,11 +8530,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult#getColumn <em>Column</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.FieldResult#getColumn <em>Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult#getColumn() + * @see org.eclipse.jpt.core.resource.orm.FieldResult#getColumn() * @see #getFieldResult() * @generated */ @@ -8544,11 +8544,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue <em>Generated Value</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Generated Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Generated Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue + * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue * @generated */ public EClass getGeneratedValue() @@ -8557,11 +8557,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getGenerator <em>Generator</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator() * @see #getGeneratedValue() * @generated */ @@ -8571,11 +8571,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getStrategy <em>Strategy</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Strategy</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getStrategy() + * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy() * @see #getGeneratedValue() * @generated */ @@ -8585,11 +8585,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Generated Value Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl + * @see org.eclipse.jpt.core.resource.orm.GeneratedValueImpl * @generated */ public EClass getGeneratedValueImpl() @@ -8599,11 +8599,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass <em>Id Class</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.IdClass <em>Id Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Id Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.IdClass + * @see org.eclipse.jpt.core.resource.orm.IdClass * @generated */ public EClass getIdClass() @@ -8612,11 +8612,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass#getClassName <em>Class Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.IdClass#getClassName <em>Class Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Class Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.IdClass#getClassName() + * @see org.eclipse.jpt.core.resource.orm.IdClass#getClassName() * @see #getIdClass() * @generated */ @@ -8626,11 +8626,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance <em>Inheritance</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Inheritance</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Inheritance + * @see org.eclipse.jpt.core.resource.orm.Inheritance * @generated */ public EClass getInheritance() @@ -8639,11 +8639,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance#getStrategy <em>Strategy</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy <em>Strategy</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Strategy</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Inheritance#getStrategy() + * @see org.eclipse.jpt.core.resource.orm.Inheritance#getStrategy() * @see #getInheritance() * @generated */ @@ -8653,11 +8653,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn <em>Join Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Join Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Join Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumn + * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn * @generated */ public EClass getJoinColumn() @@ -8666,11 +8666,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Referenced Column Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumn#getReferencedColumnName() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName() * @see #getJoinColumn() * @generated */ @@ -8680,11 +8680,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Join Column Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl + * @see org.eclipse.jpt.core.resource.orm.JoinColumnImpl * @generated */ public EClass getJoinColumnImpl() @@ -8694,11 +8694,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable <em>Join Table</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Join Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Join Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable + * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable * @generated */ public EClass getJoinTable() @@ -8707,11 +8707,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable#getJoinColumns <em>Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns <em>Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable#getJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns() * @see #getJoinTable() * @generated */ @@ -8721,11 +8721,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Inverse Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable#getInverseJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns() * @see #getJoinTable() * @generated */ @@ -8735,11 +8735,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl <em>Join Table Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl <em>Join Table Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Join Table Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl + * @see org.eclipse.jpt.core.resource.orm.JoinTableImpl * @generated */ public EClass getJoinTableImpl() @@ -8749,11 +8749,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Lob <em>Lob</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Lob</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Lob + * @see org.eclipse.jpt.core.resource.orm.Lob * @generated */ public EClass getLob() @@ -8762,11 +8762,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey <em>Map Key</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Map Key</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MapKey + * @see org.eclipse.jpt.core.resource.orm.MapKey * @generated */ public EClass getMapKey() @@ -8775,11 +8775,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.MapKey#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MapKey#getName() + * @see org.eclipse.jpt.core.resource.orm.MapKey#getName() * @see #getMapKey() * @generated */ @@ -8789,11 +8789,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl <em>Map Key Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Map Key Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl + * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl * @generated */ public EClass getMapKeyImpl() @@ -8803,11 +8803,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Query <em>Query</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Query</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Query</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Query + * @see org.eclipse.jpt.core.resource.orm.XmlQuery * @generated */ public EClass getQuery() @@ -8817,11 +8817,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Query#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Query#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlQuery#getName() * @see #getQuery() * @generated */ @@ -8832,11 +8832,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Query#getQuery <em>Query</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Query</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Query#getQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery() * @see #getQuery() * @generated */ @@ -8847,11 +8847,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.Query#getHints <em>Hints</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getHints <em>Hints</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Hints</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Query#getHints() + * @see org.eclipse.jpt.core.resource.orm.XmlQuery#getHints() * @see #getQuery() * @generated */ @@ -8862,11 +8862,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod <em>Event Method</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Event Method</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EventMethod + * @see org.eclipse.jpt.core.resource.orm.EventMethod * @generated */ public EClass getEventMethod() @@ -8876,11 +8876,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod#getMethodName <em>Method Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName <em>Method Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Method Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EventMethod#getMethodName() + * @see org.eclipse.jpt.core.resource.orm.EventMethod#getMethodName() * @see #getEventMethod() * @generated */ @@ -8891,11 +8891,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery <em>Named Native Query</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Named Native Query</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Named Native Query</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery + * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery * @generated */ public EClass getNamedNativeQuery() @@ -8904,11 +8904,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultClass <em>Result Class</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Result Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultClass() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultClass() * @see #getNamedNativeQuery() * @generated */ @@ -8918,11 +8918,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Result Set Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultSetMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping() * @see #getNamedNativeQuery() * @generated */ @@ -8932,11 +8932,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery <em>Named Query</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Named Query</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Named Query</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.NamedQuery + * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery * @generated */ public EClass getNamedQuery() @@ -8945,11 +8945,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PostLoad <em>Post Load</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Post Load</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PostLoad + * @see org.eclipse.jpt.core.resource.orm.PostLoad * @generated */ public EClass getPostLoad() @@ -8958,11 +8958,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PostPersist <em>Post Persist</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Post Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PostPersist + * @see org.eclipse.jpt.core.resource.orm.PostPersist * @generated */ public EClass getPostPersist() @@ -8971,11 +8971,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PostRemove <em>Post Remove</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Post Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PostRemove + * @see org.eclipse.jpt.core.resource.orm.PostRemove * @generated */ public EClass getPostRemove() @@ -8984,11 +8984,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PostUpdate <em>Post Update</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Post Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PostUpdate + * @see org.eclipse.jpt.core.resource.orm.PostUpdate * @generated */ public EClass getPostUpdate() @@ -8997,11 +8997,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PrePersist <em>Pre Persist</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Pre Persist</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PrePersist + * @see org.eclipse.jpt.core.resource.orm.PrePersist * @generated */ public EClass getPrePersist() @@ -9010,11 +9010,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PreRemove <em>Pre Remove</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Pre Remove</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PreRemove + * @see org.eclipse.jpt.core.resource.orm.PreRemove * @generated */ public EClass getPreRemove() @@ -9023,11 +9023,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PreUpdate <em>Pre Update</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Pre Update</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PreUpdate + * @see org.eclipse.jpt.core.resource.orm.PreUpdate * @generated */ public EClass getPreUpdate() @@ -9036,11 +9036,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint <em>Query Hint</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Query Hint</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Query Hint</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint + * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint * @generated */ public EClass getQueryHint() @@ -9049,11 +9049,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName() * @see #getQueryHint() * @generated */ @@ -9063,11 +9063,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint#getValue() + * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue() * @see #getQueryHint() * @generated */ @@ -9077,11 +9077,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable <em>Abstract Table</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable <em>Abstract Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Abstract Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable * @generated */ public EClass getAbstractTable() @@ -9091,11 +9091,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getName() * @see #getAbstractTable() * @generated */ @@ -9106,11 +9106,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getCatalog <em>Catalog</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getCatalog <em>Catalog</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Catalog</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getCatalog() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getCatalog() * @see #getAbstractTable() * @generated */ @@ -9121,11 +9121,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getSchema <em>Schema</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getSchema <em>Schema</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Schema</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getSchema() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getSchema() * @see #getAbstractTable() * @generated */ @@ -9136,11 +9136,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getUniqueConstraints <em>Unique Constraints</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getUniqueConstraints <em>Unique Constraints</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Unique Constraints</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getUniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getUniqueConstraints() * @see #getAbstractTable() * @generated */ @@ -9151,11 +9151,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Sql Result Set Mapping</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping * @generated */ public EClass getSqlResultSetMapping() @@ -9164,11 +9164,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getName() + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName() * @see #getSqlResultSetMapping() * @generated */ @@ -9178,11 +9178,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Entity Results</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getEntityResults() + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults() * @see #getSqlResultSetMapping() * @generated */ @@ -9192,11 +9192,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Column Results</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getColumnResults() + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults() * @see #getSqlResultSetMapping() * @generated */ @@ -9206,11 +9206,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn <em>Primary Key Join Column</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Primary Key Join Column</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Primary Key Join Column</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn + * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn * @generated */ public EClass getPrimaryKeyJoinColumn() @@ -9219,11 +9219,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Referenced Column Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getReferencedColumnName() + * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName() * @see #getPrimaryKeyJoinColumn() * @generated */ @@ -9233,11 +9233,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable <em>Secondary Table</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Secondary Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Secondary Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SecondaryTable + * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable * @generated */ public EClass getSecondaryTable() @@ -9246,11 +9246,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Primary Key Join Columns</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getPrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns() * @see #getSecondaryTable() * @generated */ @@ -9260,11 +9260,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Generator <em>Generator</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Generator + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator * @generated */ public EClass getGenerator() @@ -9274,11 +9274,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Generator#getName() + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getName() * @see #getGenerator() * @generated */ @@ -9289,11 +9289,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getInitialValue <em>Initial Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Initial Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Generator#getInitialValue() + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue() * @see #getGenerator() * @generated */ @@ -9304,11 +9304,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getAllocationSize <em>Allocation Size</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Allocation Size</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Generator#getAllocationSize() + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize() * @see #getGenerator() * @generated */ @@ -9319,11 +9319,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator <em>Sequence Generator</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Sequence Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Sequence Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator + * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator * @generated */ public EClass getSequenceGenerator() @@ -9332,11 +9332,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator#getSequenceName <em>Sequence Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Sequence Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator#getSequenceName() + * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName() * @see #getSequenceGenerator() * @generated */ @@ -9346,11 +9346,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Sequence Generator Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl * @generated */ public EClass getSequenceGeneratorImpl() @@ -9360,11 +9360,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.Table <em>Table</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.Table + * @see org.eclipse.jpt.core.resource.orm.XmlTable * @generated */ public EClass getTable() @@ -9373,11 +9373,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator <em>Table Generator</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Table Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Table Generator</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator * @generated */ public EClass getTableGenerator() @@ -9386,11 +9386,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getTable <em>Table</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Table</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getTable() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable() * @see #getTableGenerator() * @generated */ @@ -9400,11 +9400,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getCatalog <em>Catalog</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Catalog</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getCatalog() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog() * @see #getTableGenerator() * @generated */ @@ -9414,11 +9414,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getSchema <em>Schema</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Schema</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getSchema() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema() * @see #getTableGenerator() * @generated */ @@ -9428,11 +9428,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnName <em>Pk Column Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Pk Column Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnName() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName() * @see #getTableGenerator() * @generated */ @@ -9442,11 +9442,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getValueColumnName <em>Value Column Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value Column Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getValueColumnName() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName() * @see #getTableGenerator() * @generated */ @@ -9456,11 +9456,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnValue <em>Pk Column Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Pk Column Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnValue() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue() * @see #getTableGenerator() * @generated */ @@ -9470,11 +9470,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getUniqueConstraints <em>Unique Constraints</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints <em>Unique Constraints</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Unique Constraints</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getUniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints() * @see #getTableGenerator() * @generated */ @@ -9484,11 +9484,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Table Generator Impl</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.TableGeneratorImpl * @generated */ public EClass getTableGeneratorImpl() @@ -9498,11 +9498,11 @@ public class OrmPackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint <em>Unique Constraint</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.UniqueConstraint <em>Unique Constraint</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Unique Constraint</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint + * @see org.eclipse.jpt.core.resource.orm.UniqueConstraint * @generated */ public EClass getUniqueConstraint() @@ -9511,11 +9511,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint#getColumnNames <em>Column Names</em>}'. + * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.resource.orm.UniqueConstraint#getColumnNames <em>Column Names</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Column Names</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint#getColumnNames() + * @see org.eclipse.jpt.core.resource.orm.UniqueConstraint#getColumnNames() * @see #getUniqueConstraint() * @generated */ @@ -9525,11 +9525,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.AccessType <em>Access Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Access Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @generated */ public EEnum getAccessType() @@ -9538,11 +9538,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType <em>Discriminator Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Discriminator Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType + * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType * @generated */ public EEnum getDiscriminatorType() @@ -9551,11 +9551,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.EnumType <em>Enum Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Enum Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.EnumType * @generated */ public EEnum getEnumType() @@ -9564,11 +9564,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.FetchType <em>Fetch Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Fetch Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @generated */ public EEnum getFetchType() @@ -9577,11 +9577,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.GenerationType <em>Generation Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Generation Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.GenerationType * @generated */ public EEnum getGenerationType() @@ -9590,11 +9590,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.InheritanceType <em>Inheritance Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Inheritance Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.InheritanceType + * @see org.eclipse.jpt.core.resource.orm.InheritanceType * @generated */ public EEnum getInheritanceType() @@ -9603,11 +9603,11 @@ public class OrmPackage extends EPackageImpl } /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.orm.TemporalType <em>Temporal Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Temporal Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @generated */ public EEnum getTemporalType() @@ -10174,54 +10174,54 @@ public class OrmPackage extends EPackageImpl initEAttribute(getPersistenceUnitDefaults_CascadePersist(), theXMLTypePackage.getBoolean(), "cascadePersist", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getPersistenceUnitDefaults_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, PersistenceUnitDefaults.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(typeMappingEClass, TypeMapping.class, "TypeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTypeMapping_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTypeMapping_Access(), this.getAccessType(), "access", "PROPERTY", 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTypeMapping_MetadataComplete(), theXMLTypePackage.getBooleanObject(), "metadataComplete", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTypeMapping_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTypeMapping_Attributes(), this.getAttributes(), null, "attributes", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(mappedSuperclassEClass, MappedSuperclass.class, "MappedSuperclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getMappedSuperclass_IdClass(), this.getIdClass(), null, "idClass", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMappedSuperclass_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMappedSuperclass_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PrePersist(), this.getPrePersist(), null, "prePersist", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PostPersist(), this.getPostPersist(), null, "postPersist", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PreRemove(), this.getPreRemove(), null, "preRemove", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PostRemove(), this.getPostRemove(), null, "postRemove", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PreUpdate(), this.getPreUpdate(), null, "preUpdate", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PostUpdate(), this.getPostUpdate(), null, "postUpdate", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMappedSuperclass_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, MappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(entityEClass, Entity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getEntity_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_Table(), this.getTable(), null, "table", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_SecondaryTables(), this.getSecondaryTable(), null, "secondaryTables", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_IdClass(), this.getIdClass(), null, "idClass", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_Inheritance(), this.getInheritance(), null, "inheritance", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getEntity_DiscriminatorValue(), this.getDiscriminatorValue(), "discriminatorValue", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_DiscriminatorColumn(), this.getDiscriminatorColumn(), null, "discriminatorColumn", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_SequenceGenerator(), this.getSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_TableGenerator(), this.getTableGenerator(), null, "tableGenerator", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_NamedQueries(), this.getNamedQuery(), null, "namedQueries", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_NamedNativeQueries(), this.getNamedNativeQuery(), null, "namedNativeQueries", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getEntity_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getEntity_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PrePersist(), this.getPrePersist(), null, "prePersist", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PostPersist(), this.getPostPersist(), null, "postPersist", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PreRemove(), this.getPreRemove(), null, "preRemove", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PostRemove(), this.getPostRemove(), null, "postRemove", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PreUpdate(), this.getPreUpdate(), null, "preUpdate", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PostUpdate(), this.getPostUpdate(), null, "postUpdate", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getEntity_AssociationOverrides(), this.getAssociationOverride(), null, "associationOverrides", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - - initEClass(embeddableEClass, Embeddable.class, "Embeddable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(typeMappingEClass, AbstractTypeMapping.class, "TypeMapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTypeMapping_ClassName(), theXMLTypePackage.getString(), "className", null, 1, 1, AbstractTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTypeMapping_Access(), this.getAccessType(), "access", "PROPERTY", 0, 1, AbstractTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTypeMapping_MetadataComplete(), theXMLTypePackage.getBooleanObject(), "metadataComplete", null, 0, 1, AbstractTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTypeMapping_Description(), theXMLTypePackage.getString(), "description", null, 0, 1, AbstractTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTypeMapping_Attributes(), this.getAttributes(), null, "attributes", null, 0, 1, AbstractTypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(mappedSuperclassEClass, XmlMappedSuperclass.class, "MappedSuperclass", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getMappedSuperclass_IdClass(), this.getIdClass(), null, "idClass", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMappedSuperclass_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMappedSuperclass_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PrePersist(), this.getPrePersist(), null, "prePersist", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PostPersist(), this.getPostPersist(), null, "postPersist", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PreRemove(), this.getPreRemove(), null, "preRemove", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PostRemove(), this.getPostRemove(), null, "postRemove", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PreUpdate(), this.getPreUpdate(), null, "preUpdate", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PostUpdate(), this.getPostUpdate(), null, "postUpdate", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMappedSuperclass_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, XmlMappedSuperclass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(entityEClass, XmlEntity.class, "Entity", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getEntity_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_Table(), this.getTable(), null, "table", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_SecondaryTables(), this.getSecondaryTable(), null, "secondaryTables", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_IdClass(), this.getIdClass(), null, "idClass", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_Inheritance(), this.getInheritance(), null, "inheritance", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getEntity_DiscriminatorValue(), this.getDiscriminatorValue(), "discriminatorValue", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_DiscriminatorColumn(), this.getDiscriminatorColumn(), null, "discriminatorColumn", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_SequenceGenerator(), this.getSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_TableGenerator(), this.getTableGenerator(), null, "tableGenerator", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_NamedQueries(), this.getNamedQuery(), null, "namedQueries", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_NamedNativeQueries(), this.getNamedNativeQuery(), null, "namedNativeQueries", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_SqlResultSetMappings(), this.getSqlResultSetMapping(), null, "sqlResultSetMappings", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getEntity_ExcludeDefaultListeners(), theXMLTypePackage.getBoolean(), "excludeDefaultListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getEntity_ExcludeSuperclassListeners(), theXMLTypePackage.getBoolean(), "excludeSuperclassListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_EntityListeners(), this.getEntityListeners(), null, "entityListeners", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PrePersist(), this.getPrePersist(), null, "prePersist", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PostPersist(), this.getPostPersist(), null, "postPersist", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PreRemove(), this.getPreRemove(), null, "preRemove", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PostRemove(), this.getPostRemove(), null, "postRemove", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PreUpdate(), this.getPreUpdate(), null, "preUpdate", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PostUpdate(), this.getPostUpdate(), null, "postUpdate", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_PostLoad(), this.getPostLoad(), null, "postLoad", null, 0, 1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEntity_AssociationOverrides(), this.getAssociationOverride(), null, "associationOverrides", null, 0, -1, XmlEntity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(embeddableEClass, XmlEmbeddable.class, "Embeddable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(attributesEClass, Attributes.class, "Attributes", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getAttributes_Ids(), this.getId(), null, "ids", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -10235,89 +10235,89 @@ public class OrmPackage extends EPackageImpl initEReference(getAttributes_Embeddeds(), this.getEmbedded(), null, "embeddeds", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getAttributes_Transients(), this.getTransient(), null, "transients", null, 0, -1, Attributes.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(attributeMappingEClass, AttributeMapping.class, "AttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getAttributeMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, AttributeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(attributeMappingEClass, XmlAttributeMapping.class, "AttributeMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getAttributeMapping_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAttributeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(columnMappingEClass, ColumnMapping.class, "ColumnMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getColumnMapping_Column(), this.getColumn(), null, "column", null, 0, 1, ColumnMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(relationshipMappingEClass, RelationshipMapping.class, "RelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getRelationshipMapping_TargetEntity(), theXMLTypePackage.getString(), "targetEntity", null, 0, 1, RelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getRelationshipMapping_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, RelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRelationshipMapping_JoinTable(), this.getJoinTable(), null, "joinTable", null, 0, 1, RelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getRelationshipMapping_Cascade(), this.getCascadeType(), null, "cascade", null, 0, 1, RelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(relationshipMappingEClass, XmlRelationshipMapping.class, "RelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getRelationshipMapping_TargetEntity(), theXMLTypePackage.getString(), "targetEntity", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getRelationshipMapping_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRelationshipMapping_JoinTable(), this.getJoinTable(), null, "joinTable", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getRelationshipMapping_Cascade(), this.getCascadeType(), null, "cascade", null, 0, 1, XmlRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(multiRelationshipMappingEClass, MultiRelationshipMapping.class, "MultiRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getMultiRelationshipMapping_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, MultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getMultiRelationshipMapping_OrderBy(), this.getOrderBy(), "orderBy", null, 0, 1, MultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getMultiRelationshipMapping_MapKey(), this.getMapKey(), null, "mapKey", null, 0, 1, MultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(multiRelationshipMappingEClass, XmlMultiRelationshipMapping.class, "MultiRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getMultiRelationshipMapping_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getMultiRelationshipMapping_OrderBy(), this.getOrderBy(), "orderBy", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getMultiRelationshipMapping_MapKey(), this.getMapKey(), null, "mapKey", null, 0, 1, XmlMultiRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(singleRelationshipMappingEClass, SingleRelationshipMapping.class, "SingleRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getSingleRelationshipMapping_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, SingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getSingleRelationshipMapping_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, SingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(singleRelationshipMappingEClass, XmlSingleRelationshipMapping.class, "SingleRelationshipMapping", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getSingleRelationshipMapping_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, XmlSingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getSingleRelationshipMapping_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, XmlSingleRelationshipMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(idEClass, Id.class, "Id", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getId_GeneratedValue(), this.getGeneratedValue(), null, "generatedValue", null, 0, 1, Id.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getId_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, Id.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getId_TableGenerator(), this.getTableGenerator(), null, "tableGenerator", null, 0, 1, Id.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getId_SequenceGenerator(), this.getSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, Id.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(idEClass, XmlId.class, "Id", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getId_GeneratedValue(), this.getGeneratedValue(), null, "generatedValue", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getId_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getId_TableGenerator(), this.getTableGenerator(), null, "tableGenerator", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getId_SequenceGenerator(), this.getSequenceGenerator(), null, "sequenceGenerator", null, 0, 1, XmlId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(idImplEClass, IdImpl.class, "IdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(embeddedIdEClass, EmbeddedId.class, "EmbeddedId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEmbeddedId_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, EmbeddedId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(embeddedIdEClass, XmlEmbeddedId.class, "EmbeddedId", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getEmbeddedId_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, XmlEmbeddedId.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(embeddedIdImplEClass, EmbeddedIdImpl.class, "EmbeddedIdImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(basicEClass, Basic.class, "Basic", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getBasic_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, Basic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getBasic_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, Basic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getBasic_Lob(), theXMLTypePackage.getBoolean(), "lob", null, 0, 1, Basic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getBasic_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, Basic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getBasic_Enumerated(), this.getEnumType(), "enumerated", null, 0, 1, Basic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(basicEClass, XmlBasic.class, "Basic", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getBasic_Fetch(), this.getFetchType(), "fetch", "LAZY", 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getBasic_Optional(), theXMLTypePackage.getBooleanObject(), "optional", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getBasic_Lob(), theXMLTypePackage.getBoolean(), "lob", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getBasic_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getBasic_Enumerated(), this.getEnumType(), "enumerated", null, 0, 1, XmlBasic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(basicImplEClass, BasicImpl.class, "BasicImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(versionEClass, Version.class, "Version", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getVersion_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(versionEClass, XmlVersion.class, "Version", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getVersion_Temporal(), this.getTemporalType(), "temporal", null, 0, 1, XmlVersion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(versionImplEClass, VersionImpl.class, "VersionImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(manyToOneEClass, ManyToOne.class, "ManyToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(manyToOneEClass, XmlManyToOne.class, "ManyToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(manyToOneImplEClass, ManyToOneImpl.class, "ManyToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(oneToManyEClass, OneToMany.class, "OneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getOneToMany_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, OneToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(oneToManyEClass, XmlOneToMany.class, "OneToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getOneToMany_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, XmlOneToMany.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(oneToManyImplEClass, OneToManyImpl.class, "OneToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(oneToOneEClass, OneToOne.class, "OneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getOneToOne_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, OneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getOneToOne_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, OneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(oneToOneEClass, XmlOneToOne.class, "OneToOne", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getOneToOne_MappedBy(), theXMLTypePackage.getString(), "mappedBy", null, 0, 1, XmlOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getOneToOne_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlOneToOne.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(oneToOneImplEClass, OneToOneImpl.class, "OneToOneImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(manyToManyEClass, ManyToMany.class, "ManyToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(manyToManyEClass, XmlManyToMany.class, "ManyToMany", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(manyToManyImplEClass, ManyToManyImpl.class, "ManyToManyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(embeddedEClass, Embedded.class, "Embedded", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getEmbedded_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, Embedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(embeddedEClass, XmlEmbedded.class, "Embedded", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getEmbedded_AttributeOverrides(), this.getAttributeOverride(), null, "attributeOverrides", null, 0, -1, XmlEmbedded.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(embeddedImplEClass, EmbeddedImpl.class, "EmbeddedImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(transientEClass, Transient.class, "Transient", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(transientEClass, XmlTransient.class, "Transient", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(transientImplEClass, TransientImpl.class, "TransientImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(associationOverrideEClass, AssociationOverride.class, "AssociationOverride", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getAssociationOverride_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 1, -1, AssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAssociationOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, AssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(associationOverrideEClass, XmlAssociationOverride.class, "AssociationOverride", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getAssociationOverride_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 1, -1, XmlAssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAssociationOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAssociationOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(attributeOverrideEClass, AttributeOverride.class, "AttributeOverride", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getAttributeOverride_Column(), this.getColumn(), null, "column", null, 1, 1, AttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAttributeOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, AttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(attributeOverrideEClass, XmlAttributeOverride.class, "AttributeOverride", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getAttributeOverride_Column(), this.getColumn(), null, "column", null, 1, 1, XmlAttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAttributeOverride_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlAttributeOverride.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(attributeOverrideImplEClass, AttributeOverrideImpl.class, "AttributeOverrideImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10330,30 +10330,30 @@ public class OrmPackage extends EPackageImpl initEClass(cascadeTypeImplEClass, CascadeTypeImpl.class, "CascadeTypeImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(namedColumnEClass, NamedColumn.class, "NamedColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getNamedColumn_ColumnDefinition(), theXMLTypePackage.getString(), "columnDefinition", null, 0, 1, NamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getNamedColumn_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, NamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(namedColumnEClass, XmlNamedColumn.class, "NamedColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getNamedColumn_ColumnDefinition(), theXMLTypePackage.getString(), "columnDefinition", null, 0, 1, XmlNamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getNamedColumn_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlNamedColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(abstractColumnEClass, AbstractColumn.class, "AbstractColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getAbstractColumn_Insertable(), theXMLTypePackage.getBooleanObject(), "insertable", null, 0, 1, AbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractColumn_Nullable(), theXMLTypePackage.getBooleanObject(), "nullable", null, 0, 1, AbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractColumn_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, AbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractColumn_Unique(), theXMLTypePackage.getBooleanObject(), "unique", null, 0, 1, AbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractColumn_Updatable(), theXMLTypePackage.getBooleanObject(), "updatable", null, 0, 1, AbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(abstractColumnEClass, XmlAbstractColumn.class, "AbstractColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getAbstractColumn_Insertable(), theXMLTypePackage.getBooleanObject(), "insertable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractColumn_Nullable(), theXMLTypePackage.getBooleanObject(), "nullable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractColumn_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractColumn_Unique(), theXMLTypePackage.getBooleanObject(), "unique", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractColumn_Updatable(), theXMLTypePackage.getBooleanObject(), "updatable", null, 0, 1, XmlAbstractColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(columnEClass, Column.class, "Column", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getColumn_Precision(), theXMLTypePackage.getIntObject(), "precision", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getColumn_Scale(), theXMLTypePackage.getIntObject(), "scale", null, 0, 1, Column.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(columnEClass, XmlColumn.class, "Column", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getColumn_Precision(), theXMLTypePackage.getIntObject(), "precision", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getColumn_Scale(), theXMLTypePackage.getIntObject(), "scale", null, 0, 1, XmlColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(columnImplEClass, ColumnImpl.class, "ColumnImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(columnResultEClass, ColumnResult.class, "ColumnResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getColumnResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, ColumnResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(discriminatorColumnEClass, DiscriminatorColumn.class, "DiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getDiscriminatorColumn_DiscriminatorType(), this.getDiscriminatorType(), "discriminatorType", "STRING", 0, 1, DiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getDiscriminatorColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, DiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(discriminatorColumnEClass, XmlDiscriminatorColumn.class, "DiscriminatorColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getDiscriminatorColumn_DiscriminatorType(), this.getDiscriminatorType(), "discriminatorType", "STRING", 0, 1, XmlDiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getDiscriminatorColumn_Length(), theXMLTypePackage.getIntObject(), "length", null, 0, 1, XmlDiscriminatorColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(entityListenersEClass, EntityListeners.class, "EntityListeners", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getEntityListeners_EntityListeners(), this.getEntityListener(), null, "entityListeners", null, 0, -1, EntityListeners.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -10380,9 +10380,9 @@ public class OrmPackage extends EPackageImpl initEAttribute(getFieldResult_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEAttribute(getFieldResult_Column(), theXMLTypePackage.getString(), "column", null, 1, 1, FieldResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(generatedValueEClass, GeneratedValue.class, "GeneratedValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getGeneratedValue_Generator(), theXMLTypePackage.getString(), "generator", null, 0, 1, GeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getGeneratedValue_Strategy(), this.getGenerationType(), "strategy", "TABLE", 0, 1, GeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(generatedValueEClass, XmlGeneratedValue.class, "GeneratedValue", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getGeneratedValue_Generator(), theXMLTypePackage.getString(), "generator", null, 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getGeneratedValue_Strategy(), this.getGenerationType(), "strategy", "TABLE", 0, 1, XmlGeneratedValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(generatedValueImplEClass, GeneratedValueImpl.class, "GeneratedValueImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10392,14 +10392,14 @@ public class OrmPackage extends EPackageImpl initEClass(inheritanceEClass, Inheritance.class, "Inheritance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEAttribute(getInheritance_Strategy(), this.getInheritanceType(), "strategy", "SINGLE_TABLE", 0, 1, Inheritance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(joinColumnEClass, JoinColumn.class, "JoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, JoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(joinColumnEClass, XmlJoinColumn.class, "JoinColumn", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(joinColumnImplEClass, JoinColumnImpl.class, "JoinColumnImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(joinTableEClass, JoinTable.class, "JoinTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getJoinTable_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, JoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getJoinTable_InverseJoinColumns(), this.getJoinColumn(), null, "inverseJoinColumns", null, 0, -1, JoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(joinTableEClass, XmlJoinTable.class, "JoinTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getJoinTable_JoinColumns(), this.getJoinColumn(), null, "joinColumns", null, 0, -1, XmlJoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getJoinTable_InverseJoinColumns(), this.getJoinColumn(), null, "inverseJoinColumns", null, 0, -1, XmlJoinTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(joinTableImplEClass, JoinTableImpl.class, "JoinTableImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10410,16 +10410,16 @@ public class OrmPackage extends EPackageImpl initEClass(mapKeyImplEClass, MapKeyImpl.class, "MapKeyImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(queryEClass, Query.class, "Query", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getQuery_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getQuery_Hints(), this.getQueryHint(), null, "hints", null, 0, -1, Query.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(queryEClass, XmlQuery.class, "Query", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getQuery_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getQuery_Query(), theXMLTypePackage.getString(), "query", null, 1, 1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getQuery_Hints(), this.getQueryHint(), null, "hints", null, 0, -1, XmlQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(namedNativeQueryEClass, NamedNativeQuery.class, "NamedNativeQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getNamedNativeQuery_ResultClass(), theXMLTypePackage.getString(), "resultClass", null, 0, 1, NamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getNamedNativeQuery_ResultSetMapping(), theXMLTypePackage.getString(), "resultSetMapping", null, 0, 1, NamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(namedNativeQueryEClass, XmlNamedNativeQuery.class, "NamedNativeQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getNamedNativeQuery_ResultClass(), theXMLTypePackage.getString(), "resultClass", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getNamedNativeQuery_ResultSetMapping(), theXMLTypePackage.getString(), "resultSetMapping", null, 0, 1, XmlNamedNativeQuery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(namedQueryEClass, NamedQuery.class, "NamedQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(namedQueryEClass, XmlNamedQuery.class, "NamedQuery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEClass(postLoadEClass, PostLoad.class, "PostLoad", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10435,31 +10435,31 @@ public class OrmPackage extends EPackageImpl initEClass(preUpdateEClass, PreUpdate.class, "PreUpdate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(primaryKeyJoinColumnEClass, PrimaryKeyJoinColumn.class, "PrimaryKeyJoinColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getPrimaryKeyJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, PrimaryKeyJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(primaryKeyJoinColumnEClass, XmlPrimaryKeyJoinColumn.class, "PrimaryKeyJoinColumn", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getPrimaryKeyJoinColumn_ReferencedColumnName(), theXMLTypePackage.getString(), "referencedColumnName", null, 0, 1, XmlPrimaryKeyJoinColumn.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(queryHintEClass, QueryHint.class, "QueryHint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getQueryHint_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, QueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getQueryHint_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, QueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(queryHintEClass, XmlQueryHint.class, "QueryHint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getQueryHint_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlQueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getQueryHint_Value(), theXMLTypePackage.getString(), "value", null, 1, 1, XmlQueryHint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(abstractTableEClass, AbstractTable.class, "AbstractTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getAbstractTable_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, AbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractTable_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, AbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getAbstractTable_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, AbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getAbstractTable_UniqueConstraints(), this.getUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, AbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(abstractTableEClass, XmlAbstractTable.class, "AbstractTable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getAbstractTable_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlAbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractTable_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlAbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getAbstractTable_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlAbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getAbstractTable_UniqueConstraints(), this.getUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, XmlAbstractTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tableEClass, Table.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEClass(tableEClass, XmlTable.class, "Table", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(secondaryTableEClass, SecondaryTable.class, "SecondaryTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEReference(getSecondaryTable_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, SecondaryTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(secondaryTableEClass, XmlSecondaryTable.class, "SecondaryTable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getSecondaryTable_PrimaryKeyJoinColumns(), this.getPrimaryKeyJoinColumn(), null, "primaryKeyJoinColumns", null, 0, -1, XmlSecondaryTable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(generatorEClass, Generator.class, "Generator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getGenerator_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, Generator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getGenerator_InitialValue(), theXMLTypePackage.getIntObject(), "initialValue", null, 0, 1, Generator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getGenerator_AllocationSize(), theXMLTypePackage.getIntObject(), "allocationSize", null, 0, 1, Generator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(generatorEClass, XmlGenerator.class, "Generator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getGenerator_Name(), theXMLTypePackage.getString(), "name", null, 1, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getGenerator_InitialValue(), theXMLTypePackage.getIntObject(), "initialValue", null, 0, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getGenerator_AllocationSize(), theXMLTypePackage.getIntObject(), "allocationSize", null, 0, 1, XmlGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(sequenceGeneratorEClass, SequenceGenerator.class, "SequenceGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getSequenceGenerator_SequenceName(), theXMLTypePackage.getString(), "sequenceName", null, 0, 1, SequenceGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(sequenceGeneratorEClass, XmlSequenceGenerator.class, "SequenceGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getSequenceGenerator_SequenceName(), theXMLTypePackage.getString(), "sequenceName", null, 0, 1, XmlSequenceGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(sequenceGeneratorImplEClass, SequenceGeneratorImpl.class, "SequenceGeneratorImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10468,14 +10468,14 @@ public class OrmPackage extends EPackageImpl initEReference(getSqlResultSetMapping_EntityResults(), this.getEntityResult(), null, "entityResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getSqlResultSetMapping_ColumnResults(), this.getColumnResult(), null, "columnResults", null, 0, -1, SqlResultSetMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(tableGeneratorEClass, TableGenerator.class, "TableGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEAttribute(getTableGenerator_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTableGenerator_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTableGenerator_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTableGenerator_PkColumnName(), theXMLTypePackage.getString(), "pkColumnName", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTableGenerator_ValueColumnName(), theXMLTypePackage.getString(), "valueColumnName", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEAttribute(getTableGenerator_PkColumnValue(), theXMLTypePackage.getString(), "pkColumnValue", null, 0, 1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEReference(getTableGenerator_UniqueConstraints(), this.getUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, TableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEClass(tableGeneratorEClass, XmlTableGenerator.class, "TableGenerator", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getTableGenerator_Table(), theXMLTypePackage.getString(), "table", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTableGenerator_Catalog(), theXMLTypePackage.getString(), "catalog", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTableGenerator_Schema(), theXMLTypePackage.getString(), "schema", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTableGenerator_PkColumnName(), theXMLTypePackage.getString(), "pkColumnName", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTableGenerator_ValueColumnName(), theXMLTypePackage.getString(), "valueColumnName", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getTableGenerator_PkColumnValue(), theXMLTypePackage.getString(), "pkColumnValue", null, 0, 1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getTableGenerator_UniqueConstraints(), this.getUniqueConstraint(), null, "uniqueConstraints", null, 0, -1, XmlTableGenerator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEClass(tableGeneratorImplEClass, TableGeneratorImpl.class, "TableGeneratorImpl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -10541,11 +10541,11 @@ public class OrmPackage extends EPackageImpl public interface Literals { /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityMappings <em>Entity Mappings</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityMappings <em>Entity Mappings</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityMappings - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityMappings() + * @see org.eclipse.jpt.core.resource.orm.EntityMappings + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityMappings() * @generated */ public static final EClass ENTITY_MAPPINGS = eINSTANCE.getEntityMappings(); @@ -10671,11 +10671,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ENTITY_MAPPINGS__EMBEDDABLES = eINSTANCE.getEntityMappings_Embeddables(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata <em>Persistence Unit Metadata</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitMetadata() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitMetadata() * @generated */ public static final EClass PERSISTENCE_UNIT_METADATA = eINSTANCE.getPersistenceUnitMetadata(); @@ -10697,11 +10697,11 @@ public class OrmPackage extends EPackageImpl public static final EReference PERSISTENCE_UNIT_METADATA__PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getPersistenceUnitMetadata_PersistenceUnitDefaults(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults() + * @see org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults() * @generated */ public static final EClass PERSISTENCE_UNIT_DEFAULTS = eINSTANCE.getPersistenceUnitDefaults(); @@ -10747,11 +10747,11 @@ public class OrmPackage extends EPackageImpl public static final EReference PERSISTENCE_UNIT_DEFAULTS__ENTITY_LISTENERS = eINSTANCE.getPersistenceUnitDefaults_EntityListeners(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.TypeMapping <em>Type Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AbstractTypeMapping <em>Type Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TypeMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTypeMapping() + * @see org.eclipse.jpt.core.resource.orm.AbstractTypeMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTypeMapping() * @generated */ public static final EClass TYPE_MAPPING = eINSTANCE.getTypeMapping(); @@ -10797,11 +10797,11 @@ public class OrmPackage extends EPackageImpl public static final EReference TYPE_MAPPING__ATTRIBUTES = eINSTANCE.getTypeMapping_Attributes(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass <em>Mapped Superclass</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass <em>Mapped Superclass</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass() + * @see org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass() * @generated */ public static final EClass MAPPED_SUPERCLASS = eINSTANCE.getMappedSuperclass(); @@ -10895,11 +10895,11 @@ public class OrmPackage extends EPackageImpl public static final EReference MAPPED_SUPERCLASS__POST_LOAD = eINSTANCE.getMappedSuperclass_PostLoad(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity <em>Entity</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity <em>Entity</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Entity - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity() + * @see org.eclipse.jpt.core.resource.orm.XmlEntity + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity() * @generated */ public static final EClass ENTITY = eINSTANCE.getEntity(); @@ -11105,21 +11105,21 @@ public class OrmPackage extends EPackageImpl public static final EReference ENTITY__ASSOCIATION_OVERRIDES = eINSTANCE.getEntity_AssociationOverrides(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Embeddable <em>Embeddable</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddable <em>Embeddable</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Embeddable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddable() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddable() * @generated */ public static final EClass EMBEDDABLE = eINSTANCE.getEmbeddable(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Attributes <em>Attributes</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Attributes <em>Attributes</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Attributes - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributes() + * @see org.eclipse.jpt.core.resource.orm.Attributes + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributes() * @generated */ public static final EClass ATTRIBUTES = eINSTANCE.getAttributes(); @@ -11205,11 +11205,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ATTRIBUTES__TRANSIENTS = eINSTANCE.getAttributes_Transients(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping <em>Attribute Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping <em>Attribute Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping() * @generated */ public static final EClass ATTRIBUTE_MAPPING = eINSTANCE.getAttributeMapping(); @@ -11223,11 +11223,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ATTRIBUTE_MAPPING__NAME = eINSTANCE.getAttributeMapping_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnMapping <em>Column Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ColumnMapping <em>Column Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping() + * @see org.eclipse.jpt.core.resource.orm.ColumnMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping() * @generated */ public static final EClass COLUMN_MAPPING = eINSTANCE.getColumnMapping(); @@ -11241,11 +11241,11 @@ public class OrmPackage extends EPackageImpl public static final EReference COLUMN_MAPPING__COLUMN = eINSTANCE.getColumnMapping_Column(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping <em>Relationship Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping <em>Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping() * @generated */ public static final EClass RELATIONSHIP_MAPPING = eINSTANCE.getRelationshipMapping(); @@ -11283,11 +11283,11 @@ public class OrmPackage extends EPackageImpl public static final EReference RELATIONSHIP_MAPPING__JOIN_TABLE = eINSTANCE.getRelationshipMapping_JoinTable(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping <em>Multi Relationship Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping <em>Multi Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping() * @generated */ public static final EClass MULTI_RELATIONSHIP_MAPPING = eINSTANCE.getMultiRelationshipMapping(); @@ -11317,11 +11317,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute MULTI_RELATIONSHIP_MAPPING__MAPPED_BY = eINSTANCE.getMultiRelationshipMapping_MappedBy(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping <em>Single Relationship Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping <em>Single Relationship Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping() * @generated */ public static final EClass SINGLE_RELATIONSHIP_MAPPING = eINSTANCE.getSingleRelationshipMapping(); @@ -11343,11 +11343,11 @@ public class OrmPackage extends EPackageImpl public static final EReference SINGLE_RELATIONSHIP_MAPPING__JOIN_COLUMNS = eINSTANCE.getSingleRelationshipMapping_JoinColumns(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Id <em>Id</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlId <em>Id</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Id - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId() + * @see org.eclipse.jpt.core.resource.orm.XmlId + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId() * @generated */ public static final EClass ID = eINSTANCE.getId(); @@ -11385,21 +11385,21 @@ public class OrmPackage extends EPackageImpl public static final EReference ID__SEQUENCE_GENERATOR = eINSTANCE.getId_SequenceGenerator(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.IdImpl <em>Id Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.IdImpl <em>Id Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.IdImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdImpl() + * @see org.eclipse.jpt.core.resource.orm.IdImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdImpl() * @generated */ public static final EClass ID_IMPL = eINSTANCE.getIdImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId <em>Embedded Id</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId <em>Embedded Id</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedId - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedId() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbeddedId + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedId() * @generated */ public static final EClass EMBEDDED_ID = eINSTANCE.getEmbeddedId(); @@ -11413,21 +11413,21 @@ public class OrmPackage extends EPackageImpl public static final EReference EMBEDDED_ID__ATTRIBUTE_OVERRIDES = eINSTANCE.getEmbeddedId_AttributeOverrides(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl <em>Embedded Id Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedIdImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedIdImpl() + * @see org.eclipse.jpt.core.resource.orm.EmbeddedIdImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedIdImpl() * @generated */ public static final EClass EMBEDDED_ID_IMPL = eINSTANCE.getEmbeddedIdImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic <em>Basic</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic <em>Basic</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Basic - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic() + * @see org.eclipse.jpt.core.resource.orm.XmlBasic + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic() * @generated */ public static final EClass BASIC = eINSTANCE.getBasic(); @@ -11473,21 +11473,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute BASIC__ENUMERATED = eINSTANCE.getBasic_Enumerated(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.BasicImpl <em>Basic Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.BasicImpl <em>Basic Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.BasicImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasicImpl() + * @see org.eclipse.jpt.core.resource.orm.BasicImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasicImpl() * @generated */ public static final EClass BASIC_IMPL = eINSTANCE.getBasicImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Version <em>Version</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion <em>Version</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Version - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersion() + * @see org.eclipse.jpt.core.resource.orm.XmlVersion + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersion() * @generated */ public static final EClass VERSION = eINSTANCE.getVersion(); @@ -11501,41 +11501,41 @@ public class OrmPackage extends EPackageImpl public static final EAttribute VERSION__TEMPORAL = eINSTANCE.getVersion_Temporal(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl <em>Version Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.VersionImpl <em>Version Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.VersionImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersionImpl() + * @see org.eclipse.jpt.core.resource.orm.VersionImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionImpl() * @generated */ public static final EClass VERSION_IMPL = eINSTANCE.getVersionImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOne <em>Many To One</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToOne <em>Many To One</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOne - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOne() + * @see org.eclipse.jpt.core.resource.orm.XmlManyToOne + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOne() * @generated */ public static final EClass MANY_TO_ONE = eINSTANCE.getManyToOne(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ManyToOneImpl <em>Many To One Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToOneImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.ManyToOneImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOneImpl() * @generated */ public static final EClass MANY_TO_ONE_IMPL = eINSTANCE.getManyToOneImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany <em>One To Many</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany <em>One To Many</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToMany - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToMany() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToMany + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToMany() * @generated */ public static final EClass ONE_TO_MANY = eINSTANCE.getOneToMany(); @@ -11549,21 +11549,21 @@ public class OrmPackage extends EPackageImpl public static final EReference ONE_TO_MANY__JOIN_COLUMNS = eINSTANCE.getOneToMany_JoinColumns(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl <em>One To Many Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.OneToManyImpl <em>One To Many Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToManyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.OneToManyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToManyImpl() * @generated */ public static final EClass ONE_TO_MANY_IMPL = eINSTANCE.getOneToManyImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne <em>One To One</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne <em>One To One</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOne - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne() + * @see org.eclipse.jpt.core.resource.orm.XmlOneToOne + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne() * @generated */ public static final EClass ONE_TO_ONE = eINSTANCE.getOneToOne(); @@ -11577,11 +11577,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ONE_TO_ONE__PRIMARY_KEY_JOIN_COLUMNS = eINSTANCE.getOneToOne_PrimaryKeyJoinColumns(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl <em>One To One Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.OneToOneImpl <em>One To One Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OneToOneImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOneImpl() + * @see org.eclipse.jpt.core.resource.orm.OneToOneImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOneImpl() * @generated */ public static final EClass ONE_TO_ONE_IMPL = eINSTANCE.getOneToOneImpl(); @@ -11595,31 +11595,31 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ONE_TO_ONE__MAPPED_BY = eINSTANCE.getOneToOne_MappedBy(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToMany <em>Many To Many</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlManyToMany <em>Many To Many</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToMany - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToMany() + * @see org.eclipse.jpt.core.resource.orm.XmlManyToMany + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToMany() * @generated */ public static final EClass MANY_TO_MANY = eINSTANCE.getManyToMany(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ManyToManyImpl <em>Many To Many Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ManyToManyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToManyImpl() + * @see org.eclipse.jpt.core.resource.orm.ManyToManyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToManyImpl() * @generated */ public static final EClass MANY_TO_MANY_IMPL = eINSTANCE.getManyToManyImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Embedded <em>Embedded</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded <em>Embedded</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Embedded - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbedded() + * @see org.eclipse.jpt.core.resource.orm.XmlEmbedded + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbedded() * @generated */ public static final EClass EMBEDDED = eINSTANCE.getEmbedded(); @@ -11633,41 +11633,41 @@ public class OrmPackage extends EPackageImpl public static final EReference EMBEDDED__ATTRIBUTE_OVERRIDES = eINSTANCE.getEmbedded_AttributeOverrides(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EmbeddedImpl <em>Embedded Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EmbeddedImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedImpl() + * @see org.eclipse.jpt.core.resource.orm.EmbeddedImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedImpl() * @generated */ public static final EClass EMBEDDED_IMPL = eINSTANCE.getEmbeddedImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Transient <em>Transient</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTransient <em>Transient</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Transient - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransient() + * @see org.eclipse.jpt.core.resource.orm.XmlTransient + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransient() * @generated */ public static final EClass TRANSIENT = eINSTANCE.getTransient(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.TransientImpl <em>Transient Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.TransientImpl <em>Transient Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TransientImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransientImpl() + * @see org.eclipse.jpt.core.resource.orm.TransientImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransientImpl() * @generated */ public static final EClass TRANSIENT_IMPL = eINSTANCE.getTransientImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride <em>Association Override</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride <em>Association Override</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AssociationOverride - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAssociationOverride() + * @see org.eclipse.jpt.core.resource.orm.XmlAssociationOverride + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAssociationOverride() * @generated */ public static final EClass ASSOCIATION_OVERRIDE = eINSTANCE.getAssociationOverride(); @@ -11689,11 +11689,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ASSOCIATION_OVERRIDE__NAME = eINSTANCE.getAssociationOverride_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride <em>Attribute Override</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride <em>Attribute Override</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverride - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride() + * @see org.eclipse.jpt.core.resource.orm.XmlAttributeOverride + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride() * @generated */ public static final EClass ATTRIBUTE_OVERRIDE = eINSTANCE.getAttributeOverride(); @@ -11715,21 +11715,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ATTRIBUTE_OVERRIDE__NAME = eINSTANCE.getAttributeOverride_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl <em>Attribute Override Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AttributeOverrideImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverrideImpl() + * @see org.eclipse.jpt.core.resource.orm.AttributeOverrideImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverrideImpl() * @generated */ public static final EClass ATTRIBUTE_OVERRIDE_IMPL = eINSTANCE.getAttributeOverrideImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeType <em>Cascade Type</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.CascadeType <em>Cascade Type</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeType() + * @see org.eclipse.jpt.core.resource.orm.CascadeType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeType() * @generated */ public static final EClass CASCADE_TYPE = eINSTANCE.getCascadeType(); @@ -11775,21 +11775,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute CASCADE_TYPE__CASCADE_REFRESH = eINSTANCE.getCascadeType_CascadeRefresh(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.CascadeTypeImpl <em>Cascade Type Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.CascadeTypeImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getCascadeTypeImpl() + * @see org.eclipse.jpt.core.resource.orm.CascadeTypeImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getCascadeTypeImpl() * @generated */ public static final EClass CASCADE_TYPE_IMPL = eINSTANCE.getCascadeTypeImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn <em>Named Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn <em>Named Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn() * @generated */ public static final EClass NAMED_COLUMN = eINSTANCE.getNamedColumn(); @@ -11811,11 +11811,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute NAMED_COLUMN__NAME = eINSTANCE.getNamedColumn_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn <em>Abstract Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn <em>Abstract Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn() * @generated */ public static final EClass ABSTRACT_COLUMN = eINSTANCE.getAbstractColumn(); @@ -11861,11 +11861,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ABSTRACT_COLUMN__UPDATABLE = eINSTANCE.getAbstractColumn_Updatable(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Column <em>Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn <em>Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Column - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn() * @generated */ public static final EClass COLUMN = eINSTANCE.getColumn(); @@ -11895,21 +11895,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute COLUMN__SCALE = eINSTANCE.getColumn_Scale(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnImpl <em>Column Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ColumnImpl <em>Column Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.ColumnImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnImpl() * @generated */ public static final EClass COLUMN_IMPL = eINSTANCE.getColumnImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult <em>Column Result</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.ColumnResult <em>Column Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.ColumnResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnResult() + * @see org.eclipse.jpt.core.resource.orm.ColumnResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnResult() * @generated */ public static final EClass COLUMN_RESULT = eINSTANCE.getColumnResult(); @@ -11923,11 +11923,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute COLUMN_RESULT__NAME = eINSTANCE.getColumnResult_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn <em>Discriminator Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn <em>Discriminator Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorColumn() * @generated */ public static final EClass DISCRIMINATOR_COLUMN = eINSTANCE.getDiscriminatorColumn(); @@ -11949,11 +11949,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute DISCRIMINATOR_COLUMN__LENGTH = eINSTANCE.getDiscriminatorColumn_Length(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListeners <em>Entity Listeners</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityListeners <em>Entity Listeners</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListeners - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListeners() + * @see org.eclipse.jpt.core.resource.orm.EntityListeners + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListeners() * @generated */ public static final EClass ENTITY_LISTENERS = eINSTANCE.getEntityListeners(); @@ -11967,11 +11967,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ENTITY_LISTENERS__ENTITY_LISTENERS = eINSTANCE.getEntityListeners_EntityListeners(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityListener <em>Entity Listener</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityListener <em>Entity Listener</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityListener - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityListener() + * @see org.eclipse.jpt.core.resource.orm.EntityListener + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityListener() * @generated */ public static final EClass ENTITY_LISTENER = eINSTANCE.getEntityListener(); @@ -12041,11 +12041,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ENTITY_LISTENER__POST_LOAD = eINSTANCE.getEntityListener_PostLoad(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EntityResult <em>Entity Result</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EntityResult <em>Entity Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EntityResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntityResult() + * @see org.eclipse.jpt.core.resource.orm.EntityResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntityResult() * @generated */ public static final EClass ENTITY_RESULT = eINSTANCE.getEntityResult(); @@ -12075,11 +12075,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ENTITY_RESULT__FIELD_RESULTS = eINSTANCE.getEntityResult_FieldResults(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.FieldResult <em>Field Result</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.FieldResult <em>Field Result</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.FieldResult - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFieldResult() + * @see org.eclipse.jpt.core.resource.orm.FieldResult + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFieldResult() * @generated */ public static final EClass FIELD_RESULT = eINSTANCE.getFieldResult(); @@ -12101,11 +12101,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute FIELD_RESULT__COLUMN = eINSTANCE.getFieldResult_Column(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue <em>Generated Value</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue <em>Generated Value</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValue - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue() + * @see org.eclipse.jpt.core.resource.orm.XmlGeneratedValue + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue() * @generated */ public static final EClass GENERATED_VALUE = eINSTANCE.getGeneratedValue(); @@ -12127,21 +12127,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute GENERATED_VALUE__STRATEGY = eINSTANCE.getGeneratedValue_Strategy(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.GeneratedValueImpl <em>Generated Value Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GeneratedValueImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValueImpl() + * @see org.eclipse.jpt.core.resource.orm.GeneratedValueImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValueImpl() * @generated */ public static final EClass GENERATED_VALUE_IMPL = eINSTANCE.getGeneratedValueImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.IdClass <em>Id Class</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.IdClass <em>Id Class</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.IdClass - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getIdClass() + * @see org.eclipse.jpt.core.resource.orm.IdClass + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getIdClass() * @generated */ public static final EClass ID_CLASS = eINSTANCE.getIdClass(); @@ -12155,11 +12155,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute ID_CLASS__CLASS_NAME = eINSTANCE.getIdClass_ClassName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Inheritance <em>Inheritance</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Inheritance <em>Inheritance</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Inheritance - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritance() + * @see org.eclipse.jpt.core.resource.orm.Inheritance + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritance() * @generated */ public static final EClass INHERITANCE = eINSTANCE.getInheritance(); @@ -12173,11 +12173,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute INHERITANCE__STRATEGY = eINSTANCE.getInheritance_Strategy(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn <em>Join Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn <em>Join Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumn() * @generated */ public static final EClass JOIN_COLUMN = eINSTANCE.getJoinColumn(); @@ -12191,21 +12191,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getJoinColumn_ReferencedColumnName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.JoinColumnImpl <em>Join Column Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinColumnImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumnImpl() + * @see org.eclipse.jpt.core.resource.orm.JoinColumnImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumnImpl() * @generated */ public static final EClass JOIN_COLUMN_IMPL = eINSTANCE.getJoinColumnImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable <em>Join Table</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable <em>Join Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable() + * @see org.eclipse.jpt.core.resource.orm.XmlJoinTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable() * @generated */ public static final EClass JOIN_TABLE = eINSTANCE.getJoinTable(); @@ -12227,31 +12227,31 @@ public class OrmPackage extends EPackageImpl public static final EReference JOIN_TABLE__INVERSE_JOIN_COLUMNS = eINSTANCE.getJoinTable_InverseJoinColumns(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl <em>Join Table Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.JoinTableImpl <em>Join Table Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.JoinTableImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTableImpl() + * @see org.eclipse.jpt.core.resource.orm.JoinTableImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTableImpl() * @generated */ public static final EClass JOIN_TABLE_IMPL = eINSTANCE.getJoinTableImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Lob <em>Lob</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.Lob <em>Lob</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Lob - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getLob() + * @see org.eclipse.jpt.core.resource.orm.Lob + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getLob() * @generated */ public static final EClass LOB = eINSTANCE.getLob(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKey <em>Map Key</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.MapKey <em>Map Key</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MapKey - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKey() + * @see org.eclipse.jpt.core.resource.orm.MapKey + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKey() * @generated */ public static final EClass MAP_KEY = eINSTANCE.getMapKey(); @@ -12265,21 +12265,21 @@ public class OrmPackage extends EPackageImpl public static final EAttribute MAP_KEY__NAME = eINSTANCE.getMapKey_Name(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.MapKeyImpl <em>Map Key Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.MapKeyImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMapKeyImpl() + * @see org.eclipse.jpt.core.resource.orm.MapKeyImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMapKeyImpl() * @generated */ public static final EClass MAP_KEY_IMPL = eINSTANCE.getMapKeyImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Query <em>Query</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery <em>Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Query - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery() * @generated */ public static final EClass QUERY = eINSTANCE.getQuery(); @@ -12309,11 +12309,11 @@ public class OrmPackage extends EPackageImpl public static final EReference QUERY__HINTS = eINSTANCE.getQuery_Hints(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EventMethod <em>Event Method</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EventMethod <em>Event Method</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EventMethod - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEventMethod() + * @see org.eclipse.jpt.core.resource.orm.EventMethod + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEventMethod() * @generated */ public static final EClass EVENT_METHOD = eINSTANCE.getEventMethod(); @@ -12327,11 +12327,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute EVENT_METHOD__METHOD_NAME = eINSTANCE.getEventMethod_MethodName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery <em>Named Native Query</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery <em>Named Native Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedNativeQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedNativeQuery() * @generated */ public static final EClass NAMED_NATIVE_QUERY = eINSTANCE.getNamedNativeQuery(); @@ -12353,91 +12353,91 @@ public class OrmPackage extends EPackageImpl public static final EAttribute NAMED_NATIVE_QUERY__RESULT_SET_MAPPING = eINSTANCE.getNamedNativeQuery_ResultSetMapping(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery <em>Named Query</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery <em>Named Query</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.NamedQuery - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedQuery() + * @see org.eclipse.jpt.core.resource.orm.XmlNamedQuery + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedQuery() * @generated */ public static final EClass NAMED_QUERY = eINSTANCE.getNamedQuery(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostLoad <em>Post Load</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostLoad <em>Post Load</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostLoad - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.PostLoad + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad() * @generated */ public static final EClass POST_LOAD = eINSTANCE.getPostLoad(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostPersist <em>Post Persist</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostPersist <em>Post Persist</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostPersist - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.PostPersist + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist() * @generated */ public static final EClass POST_PERSIST = eINSTANCE.getPostPersist(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostRemove <em>Post Remove</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostRemove <em>Post Remove</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostRemove - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.PostRemove + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove() * @generated */ public static final EClass POST_REMOVE = eINSTANCE.getPostRemove(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PostUpdate <em>Post Update</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PostUpdate <em>Post Update</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PostUpdate - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.PostUpdate + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate() * @generated */ public static final EClass POST_UPDATE = eINSTANCE.getPostUpdate(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PrePersist <em>Pre Persist</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PrePersist <em>Pre Persist</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PrePersist - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.PrePersist + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist() * @generated */ public static final EClass PRE_PERSIST = eINSTANCE.getPrePersist(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PreRemove <em>Pre Remove</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PreRemove <em>Pre Remove</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PreRemove - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.PreRemove + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove() * @generated */ public static final EClass PRE_REMOVE = eINSTANCE.getPreRemove(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PreUpdate <em>Pre Update</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.PreUpdate <em>Pre Update</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PreUpdate - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.PreUpdate + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate() * @generated */ public static final EClass PRE_UPDATE = eINSTANCE.getPreUpdate(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint <em>Query Hint</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint <em>Query Hint</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.QueryHint - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQueryHint() + * @see org.eclipse.jpt.core.resource.orm.XmlQueryHint + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQueryHint() * @generated */ public static final EClass QUERY_HINT = eINSTANCE.getQueryHint(); @@ -12459,11 +12459,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute QUERY_HINT__VALUE = eINSTANCE.getQueryHint_Value(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable <em>Abstract Table</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable <em>Abstract Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AbstractTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable() + * @see org.eclipse.jpt.core.resource.orm.XmlAbstractTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable() * @generated */ public static final EClass ABSTRACT_TABLE = eINSTANCE.getAbstractTable(); @@ -12501,11 +12501,11 @@ public class OrmPackage extends EPackageImpl public static final EReference ABSTRACT_TABLE__UNIQUE_CONSTRAINTS = eINSTANCE.getAbstractTable_UniqueConstraints(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping <em>Sql Result Set Mapping</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping() + * @see org.eclipse.jpt.core.resource.orm.SqlResultSetMapping + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping() * @generated */ public static final EClass SQL_RESULT_SET_MAPPING = eINSTANCE.getSqlResultSetMapping(); @@ -12535,11 +12535,11 @@ public class OrmPackage extends EPackageImpl public static final EReference SQL_RESULT_SET_MAPPING__COLUMN_RESULTS = eINSTANCE.getSqlResultSetMapping_ColumnResults(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn <em>Primary Key Join Column</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn <em>Primary Key Join Column</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() * @generated */ public static final EClass PRIMARY_KEY_JOIN_COLUMN = eINSTANCE.getPrimaryKeyJoinColumn(); @@ -12553,11 +12553,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute PRIMARY_KEY_JOIN_COLUMN__REFERENCED_COLUMN_NAME = eINSTANCE.getPrimaryKeyJoinColumn_ReferencedColumnName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable <em>Secondary Table</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable <em>Secondary Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SecondaryTable - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSecondaryTable() + * @see org.eclipse.jpt.core.resource.orm.XmlSecondaryTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSecondaryTable() * @generated */ public static final EClass SECONDARY_TABLE = eINSTANCE.getSecondaryTable(); @@ -12571,11 +12571,11 @@ public class OrmPackage extends EPackageImpl public static final EReference SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS = eINSTANCE.getSecondaryTable_PrimaryKeyJoinColumns(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Generator <em>Generator</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator <em>Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Generator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator() * @generated */ public static final EClass GENERATOR = eINSTANCE.getGenerator(); @@ -12605,11 +12605,11 @@ public class OrmPackage extends EPackageImpl public static final EAttribute GENERATOR__ALLOCATION_SIZE = eINSTANCE.getGenerator_AllocationSize(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator <em>Sequence Generator</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator <em>Sequence Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGenerator() * @generated */ public static final EClass SEQUENCE_GENERATOR = eINSTANCE.getSequenceGenerator(); @@ -12623,31 +12623,31 @@ public class OrmPackage extends EPackageImpl public static final EAttribute SEQUENCE_GENERATOR__SEQUENCE_NAME = eINSTANCE.getSequenceGenerator_SequenceName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl <em>Sequence Generator Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGeneratorImpl() * @generated */ public static final EClass SEQUENCE_GENERATOR_IMPL = eINSTANCE.getSequenceGeneratorImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.Table <em>Table</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTable <em>Table</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.Table - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTable() + * @see org.eclipse.jpt.core.resource.orm.XmlTable + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTable() * @generated */ public static final EClass TABLE = eINSTANCE.getTable(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator <em>Table Generator</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator <em>Table Generator</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TableGenerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator() + * @see org.eclipse.jpt.core.resource.orm.XmlTableGenerator + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator() * @generated */ public static final EClass TABLE_GENERATOR = eINSTANCE.getTableGenerator(); @@ -12709,21 +12709,21 @@ public class OrmPackage extends EPackageImpl public static final EReference TABLE_GENERATOR__UNIQUE_CONSTRAINTS = eINSTANCE.getTableGenerator_UniqueConstraints(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl <em>Table Generator Impl</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.TableGeneratorImpl + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGeneratorImpl() * @generated */ public static final EClass TABLE_GENERATOR_IMPL = eINSTANCE.getTableGeneratorImpl(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint <em>Unique Constraint</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.UniqueConstraint <em>Unique Constraint</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getUniqueConstraint() + * @see org.eclipse.jpt.core.resource.orm.UniqueConstraint + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getUniqueConstraint() * @generated */ public static final EClass UNIQUE_CONSTRAINT = eINSTANCE.getUniqueConstraint(); @@ -12737,71 +12737,71 @@ public class OrmPackage extends EPackageImpl public static final EAttribute UNIQUE_CONSTRAINT__COLUMN_NAMES = eINSTANCE.getUniqueConstraint_ColumnNames(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.AccessType <em>Access Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.AccessType <em>Access Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAccessType() + * @see org.eclipse.jpt.core.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAccessType() * @generated */ public static final EEnum ACCESS_TYPE = eINSTANCE.getAccessType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.DiscriminatorType <em>Discriminator Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorType() + * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorType() * @generated */ public static final EEnum DISCRIMINATOR_TYPE = eINSTANCE.getDiscriminatorType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.EnumType <em>Enum Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.EnumType <em>Enum Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEnumType() + * @see org.eclipse.jpt.core.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumType() * @generated */ public static final EEnum ENUM_TYPE = eINSTANCE.getEnumType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.FetchType <em>Fetch Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.FetchType <em>Fetch Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getFetchType() + * @see org.eclipse.jpt.core.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getFetchType() * @generated */ public static final EEnum FETCH_TYPE = eINSTANCE.getFetchType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.GenerationType <em>Generation Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.GenerationType <em>Generation Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerationType() + * @see org.eclipse.jpt.core.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerationType() * @generated */ public static final EEnum GENERATION_TYPE = eINSTANCE.getGenerationType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.InheritanceType <em>Inheritance Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.InheritanceType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getInheritanceType() + * @see org.eclipse.jpt.core.resource.orm.InheritanceType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getInheritanceType() * @generated */ public static final EEnum INHERITANCE_TYPE = eINSTANCE.getInheritanceType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.orm.TemporalType <em>Temporal Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.TemporalType <em>Temporal Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTemporalType() + * @see org.eclipse.jpt.core.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType() * @generated */ public static final EEnum TEMPORAL_TYPE = eINSTANCE.getTemporalType(); @@ -12811,7 +12811,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorValue() * @generated */ public static final EDataType DISCRIMINATOR_VALUE = eINSTANCE.getDiscriminatorValue(); @@ -12821,7 +12821,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.common.util.Enumerator - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEnumerated() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEnumerated() * @generated */ public static final EDataType ENUMERATED = eINSTANCE.getEnumerated(); @@ -12831,7 +12831,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOrderBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOrderBy() * @generated */ public static final EDataType ORDER_BY = eINSTANCE.getOrderBy(); @@ -12841,7 +12841,7 @@ public class OrmPackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersionType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionType() * @generated */ public static final EDataType VERSION_TYPE = eINSTANCE.getVersionType(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResource.java index 1c8c31423e..df864a7c9d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResource.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.URI; import org.eclipse.jdt.core.ElementChangedEvent; -import org.eclipse.jpt.core.internal.resource.common.JpaXmlResource; import org.eclipse.jpt.core.internal.resource.orm.translators.EntityMappingsTranslator; +import org.eclipse.jpt.core.resource.common.JpaXmlResource; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceFactory.java index 5a0aeca135..21c111c8fb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceFactory.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.URI; import org.eclipse.wst.common.internal.emf.resource.Renderer; @@ -33,6 +33,7 @@ public class OrmResourceFactory extends TranslatorResourceFactory /** * @see TranslatorResourceFactory#createResource(URI, Renderer) */ + @Override protected TranslatorResource createResource(URI uri, Renderer renderer) { return new OrmResource(uri, renderer); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java index 64d2445907..1fea5fb3c7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OrmResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java @@ -8,12 +8,12 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.resource.common.JpaXmlResourceModel; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.resource.common.JpaXmlResourceModel; public class OrmResourceModel extends JpaXmlResourceModel { @@ -23,10 +23,10 @@ public class OrmResourceModel extends JpaXmlResourceModel /** - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ public String getResourceType() { - return IResourceModel.ORM_RESOURCE_TYPE; + return ResourceModel.ORM_RESOURCE_TYPE; } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PersistenceUnitDefaults.java index 3bb964f965..8a7a15a2c2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PersistenceUnitDefaults.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,20 +25,20 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults() * @model kind="class" * @extends IJpaEObject * @generated */ -public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject +public class PersistenceUnitDefaults extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getSchema() <em>Schema</em>}' attribute. @@ -157,7 +157,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -167,7 +167,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -192,7 +192,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -202,7 +202,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -220,7 +220,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Access</b></em>' attribute. * The default value is <code>"PROPERTY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.AccessType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.AccessType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Access</em>' attribute isn't clear, @@ -228,9 +228,9 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #setAccess(AccessType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults_Access() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults_Access() * @model default="PROPERTY" * @generated */ @@ -240,11 +240,11 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getAccess <em>Access</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Access</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.AccessType + * @see org.eclipse.jpt.core.resource.orm.AccessType * @see #getAccess() * @generated */ @@ -266,7 +266,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Cascade Persist</em>' attribute. * @see #setCascadePersist(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults_CascadePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults_CascadePersist() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -276,7 +276,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#isCascadePersist <em>Cascade Persist</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade Persist</em>' attribute. @@ -301,7 +301,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Entity Listeners</em>' containment reference. * @see #setEntityListeners(EntityListeners) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitDefaults_EntityListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitDefaults_EntityListeners() * @model containment="true" * @generated */ @@ -328,7 +328,7 @@ public class PersistenceUnitDefaults extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitDefaults#getEntityListeners <em>Entity Listeners</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Entity Listeners</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PersistenceUnitMetadata.java index 18a57e5ce9..a2fc9275ba 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PersistenceUnitMetadata.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,17 +25,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitMetadata() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitMetadata() * @model kind="class" * @extends IJpaEObject * @generated */ -public class PersistenceUnitMetadata extends JpaEObject implements IJpaEObject +public class PersistenceUnitMetadata extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #isXmlMappingMetadataComplete() <em>Xml Mapping Metadata Complete</em>}' attribute. @@ -98,7 +98,7 @@ public class PersistenceUnitMetadata extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Xml Mapping Metadata Complete</em>' attribute. * @see #setXmlMappingMetadataComplete(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitMetadata_XmlMappingMetadataComplete() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitMetadata_XmlMappingMetadataComplete() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -108,7 +108,7 @@ public class PersistenceUnitMetadata extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#isXmlMappingMetadataComplete <em>Xml Mapping Metadata Complete</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Xml Mapping Metadata Complete</em>' attribute. @@ -133,7 +133,7 @@ public class PersistenceUnitMetadata extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Persistence Unit Defaults</em>' containment reference. * @see #setPersistenceUnitDefaults(PersistenceUnitDefaults) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPersistenceUnitMetadata_PersistenceUnitDefaults() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPersistenceUnitMetadata_PersistenceUnitDefaults() * @model containment="true" * @generated */ @@ -160,7 +160,7 @@ public class PersistenceUnitMetadata extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.PersistenceUnitMetadata#getPersistenceUnitDefaults <em>Persistence Unit Defaults</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Persistence Unit Defaults</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostLoad.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostLoad.java index 503262f677..08cdb8d38e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostLoad.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostLoad.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostLoad() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostLoad() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostPersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostPersist.java index 8c8538a9d0..228f63e936 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostPersist.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostPersist.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostPersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostPersist() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostRemove.java index 3e83059d86..37812f252b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostRemove.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostRemove.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostRemove() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostUpdate.java index 2c01b79ce2..a8e37a220b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PostUpdate.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PostUpdate.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPostUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPostUpdate() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PrePersist.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PrePersist.java index 7d55062ff4..f89278143c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PrePersist.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PrePersist.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrePersist() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PreRemove.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreRemove.java index 83fc876d28..55639e0fff 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PreRemove.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreRemove.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreRemove() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PreUpdate.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreUpdate.java index ea6e163b50..249a3071f3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PreUpdate.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/PreUpdate.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPreUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPreUpdate() * @model kind="class" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SequenceGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SequenceGeneratorImpl.java index cedfc52039..672a0e2251 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SequenceGeneratorImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SequenceGeneratorImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGeneratorImpl() * @model kind="class" * @generated */ -public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerator +public class SequenceGeneratorImpl extends AbstractJpaEObject implements XmlSequenceGenerator { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -137,7 +137,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -147,7 +147,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -172,7 +172,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat * <!-- end-user-doc --> * @return the value of the '<em>Sequence Name</em>' attribute. * @see #setSequenceName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGenerator_SequenceName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGenerator_SequenceName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -182,7 +182,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl#getSequenceName <em>Sequence Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl#getSequenceName <em>Sequence Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Sequence Name</em>' attribute. @@ -207,7 +207,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat * <!-- end-user-doc --> * @return the value of the '<em>Initial Value</em>' attribute. * @see #setInitialValue(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_InitialValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_InitialValue() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -217,7 +217,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Initial Value</em>' attribute. @@ -242,7 +242,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat * <!-- end-user-doc --> * @return the value of the '<em>Allocation Size</em>' attribute. * @see #setAllocationSize(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_AllocationSize() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_AllocationSize() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -252,7 +252,7 @@ public class SequenceGeneratorImpl extends JpaEObject implements SequenceGenerat } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SequenceGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Allocation Size</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SqlResultSetMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SqlResultSetMapping.java index bbd244cbf7..c7159cd753 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SqlResultSetMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/SqlResultSetMapping.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,18 +29,18 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getEntityResults <em>Entity Results</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getColumnResults <em>Column Results</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping() * @model kind="class" * @extends IJpaEObject * @generated */ -public class SqlResultSetMapping extends JpaEObject implements IJpaEObject +public class SqlResultSetMapping extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -113,7 +113,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -123,7 +123,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -140,7 +140,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Entity Results</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.EntityResult}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.EntityResult}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Entity Results</em>' containment reference list isn't clear, @@ -148,7 +148,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Entity Results</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping_EntityResults() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping_EntityResults() * @model containment="true" * @generated */ @@ -163,7 +163,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Column Results</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.ColumnResult}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.ColumnResult}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Column Results</em>' containment reference list isn't clear, @@ -171,7 +171,7 @@ public class SqlResultSetMapping extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column Results</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSqlResultSetMapping_ColumnResults() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSqlResultSetMapping_ColumnResults() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TableGeneratorImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TableGeneratorImpl.java index 6c7c8e42bf..ba56fd5356 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TableGeneratorImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TableGeneratorImpl.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGeneratorImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGeneratorImpl() * @model kind="class" * @generated */ -public class TableGeneratorImpl extends JpaEObject implements TableGenerator +public class TableGeneratorImpl extends AbstractJpaEObject implements XmlTableGenerator { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -253,7 +253,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -263,7 +263,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -288,7 +288,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' attribute. * @see #setTable(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Table() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Table() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -298,7 +298,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getTable <em>Table</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getTable <em>Table</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' attribute. @@ -323,7 +323,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -333,7 +333,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -358,7 +358,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -368,7 +368,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -393,7 +393,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Pk Column Name</em>' attribute. * @see #setPkColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_PkColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_PkColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -403,7 +403,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getPkColumnName <em>Pk Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getPkColumnName <em>Pk Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pk Column Name</em>' attribute. @@ -428,7 +428,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Value Column Name</em>' attribute. * @see #setValueColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_ValueColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_ValueColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -438,7 +438,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getValueColumnName <em>Value Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getValueColumnName <em>Value Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value Column Name</em>' attribute. @@ -463,7 +463,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Pk Column Value</em>' attribute. * @see #setPkColumnValue(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_PkColumnValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_PkColumnValue() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -473,7 +473,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getPkColumnValue <em>Pk Column Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getPkColumnValue <em>Pk Column Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pk Column Value</em>' attribute. @@ -498,7 +498,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Initial Value</em>' attribute. * @see #setInitialValue(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_InitialValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_InitialValue() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -508,7 +508,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getInitialValue <em>Initial Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Initial Value</em>' attribute. @@ -533,7 +533,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * <!-- end-user-doc --> * @return the value of the '<em>Allocation Size</em>' attribute. * @see #setAllocationSize(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_AllocationSize() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_AllocationSize() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -543,7 +543,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TableGeneratorImpl#getAllocationSize <em>Allocation Size</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Allocation Size</em>' attribute. @@ -560,7 +560,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -568,7 +568,7 @@ public class TableGeneratorImpl extends JpaEObject implements TableGenerator * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_UniqueConstraints() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TemporalType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TemporalType.java index c3e72596b1..caf6d59c92 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TemporalType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TemporalType.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Arrays; import java.util.Collections; @@ -19,7 +19,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Temporal Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTemporalType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTemporalType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TransientImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TransientImpl.java index 1bd58a8d57..8c26d3667f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TransientImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/TransientImpl.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -20,11 +20,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransientImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransientImpl() * @model kind="class" * @generated */ -public class TransientImpl extends JpaEObject implements Transient +public class TransientImpl extends AbstractJpaEObject implements XmlTransient { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -77,7 +77,7 @@ public class TransientImpl extends JpaEObject implements Transient * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -87,7 +87,7 @@ public class TransientImpl extends JpaEObject implements Transient } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TransientImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.TransientImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/UniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/UniqueConstraint.java index ec4a1e19cb..cd46b14ab7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/UniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/UniqueConstraint.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.util.EDataTypeEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -24,16 +24,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint#getColumnNames <em>Column Names</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.UniqueConstraint#getColumnNames <em>Column Names</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getUniqueConstraint() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getUniqueConstraint() * @model kind="class" * @extends IJpaEObject * @generated */ -public class UniqueConstraint extends JpaEObject implements IJpaEObject +public class UniqueConstraint extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getColumnNames() <em>Column Names</em>}' attribute list. @@ -76,7 +76,7 @@ public class UniqueConstraint extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column Names</em>' attribute list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getUniqueConstraint_ColumnNames() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getUniqueConstraint_ColumnNames() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VersionImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/VersionImpl.java index 391371fac1..3d6ddbfd09 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/VersionImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/VersionImpl.java @@ -7,14 +7,14 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,11 +22,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersionImpl() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersionImpl() * @model kind="class" * @generated */ -public class VersionImpl extends JpaEObject implements Version +public class VersionImpl extends AbstractJpaEObject implements XmlVersion { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -56,7 +56,7 @@ public class VersionImpl extends JpaEObject implements Version * @generated * @ordered */ - protected Column column; + protected XmlColumn column; /** * changed this to null and removed the generated flag so emf won't generate over it @@ -105,7 +105,7 @@ public class VersionImpl extends JpaEObject implements Version * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -115,7 +115,7 @@ public class VersionImpl extends JpaEObject implements Version } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.VersionImpl#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -139,12 +139,12 @@ public class VersionImpl extends JpaEObject implements Version * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumnMapping_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumnMapping_Column() * @model containment="true" * @generated */ - public Column getColumn() + public XmlColumn getColumn() { return column; } @@ -154,9 +154,9 @@ public class VersionImpl extends JpaEObject implements Version * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetColumn(Column newColumn, NotificationChain msgs) + public NotificationChain basicSetColumn(XmlColumn newColumn, NotificationChain msgs) { - Column oldColumn = column; + XmlColumn oldColumn = column; column = newColumn; if (eNotificationRequired()) { @@ -167,14 +167,14 @@ public class VersionImpl extends JpaEObject implements Version } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.VersionImpl#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - public void setColumn(Column newColumn) + public void setColumn(XmlColumn newColumn) { if (newColumn != column) { @@ -192,7 +192,7 @@ public class VersionImpl extends JpaEObject implements Version /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -200,9 +200,9 @@ public class VersionImpl extends JpaEObject implements Version * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersion_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersion_Temporal() * @model * @generated */ @@ -212,11 +212,11 @@ public class VersionImpl extends JpaEObject implements Version } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.VersionImpl#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.VersionImpl#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ @@ -278,7 +278,7 @@ public class VersionImpl extends JpaEObject implements Version setName((String)newValue); return; case OrmPackage.VERSION_IMPL__COLUMN: - setColumn((Column)newValue); + setColumn((XmlColumn)newValue); return; case OrmPackage.VERSION_IMPL__TEMPORAL: setTemporal((TemporalType)newValue); @@ -301,7 +301,7 @@ public class VersionImpl extends JpaEObject implements Version setName(NAME_EDEFAULT); return; case OrmPackage.VERSION_IMPL__COLUMN: - setColumn((Column)null); + setColumn((XmlColumn)null); return; case OrmPackage.VERSION_IMPL__TEMPORAL: setTemporal(TEMPORAL_EDEFAULT); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AbstractColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractColumn.java index 7830e660e6..7f73558e4b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AbstractColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractColumn.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,19 +18,19 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getInsertable <em>Insertable</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getNullable <em>Nullable</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getTable <em>Table</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUnique <em>Unique</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUpdatable <em>Updatable</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface AbstractColumn extends NamedColumn +public interface XmlAbstractColumn extends XmlNamedColumn { /** * Returns the value of the '<em><b>Insertable</b></em>' attribute. @@ -42,14 +42,14 @@ public interface AbstractColumn extends NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Insertable</em>' attribute. * @see #setInsertable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Insertable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Insertable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getInsertable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getInsertable <em>Insertable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getInsertable <em>Insertable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Insertable</em>' attribute. @@ -68,14 +68,14 @@ public interface AbstractColumn extends NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Nullable</em>' attribute. * @see #setNullable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Nullable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Nullable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getNullable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getNullable <em>Nullable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getNullable <em>Nullable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Nullable</em>' attribute. @@ -94,14 +94,14 @@ public interface AbstractColumn extends NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' attribute. * @see #setTable(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Table() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Table() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getTable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getTable <em>Table</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getTable <em>Table</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' attribute. @@ -120,14 +120,14 @@ public interface AbstractColumn extends NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Unique</em>' attribute. * @see #setUnique(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Unique() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Unique() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getUnique(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUnique <em>Unique</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUnique <em>Unique</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Unique</em>' attribute. @@ -146,14 +146,14 @@ public interface AbstractColumn extends NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Updatable</em>' attribute. * @see #setUpdatable(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractColumn_Updatable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractColumn_Updatable() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getUpdatable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractColumn#getUpdatable <em>Updatable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractColumn#getUpdatable <em>Updatable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Updatable</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AbstractTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractTable.java index 77ee3f346f..ebbdd3885f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AbstractTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAbstractTable.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -21,19 +21,19 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getCatalog <em>Catalog</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getSchema <em>Schema</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getUniqueConstraints <em>Unique Constraints</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getCatalog <em>Catalog</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getSchema <em>Schema</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getUniqueConstraints <em>Unique Constraints</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable() * @model kind="class" interface="true" abstract="true" - * @extends IJpaEObject + * @extends {@link JpaEObject} * @generated */ -public interface AbstractTable extends IJpaEObject +public interface XmlAbstractTable extends JpaEObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -45,14 +45,14 @@ public interface AbstractTable extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -71,14 +71,14 @@ public interface AbstractTable extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getCatalog(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -97,14 +97,14 @@ public interface AbstractTable extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getSchema(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AbstractTable#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAbstractTable#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -115,7 +115,7 @@ public interface AbstractTable extends IJpaEObject /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -123,7 +123,7 @@ public interface AbstractTable extends IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverride.java index 44dccb6c8c..9a74412a53 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAssociationOverride.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,17 +29,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getJoinColumns <em>Join Columns</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getJoinColumns <em>Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAssociationOverride() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAssociationOverride() * @model kind="class" * @extends IJpaEObject * @generated */ -public class AssociationOverride extends JpaEObject implements IJpaEObject +public class XmlAssociationOverride extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getJoinColumns() <em>Join Columns</em>}' containment reference list. @@ -49,7 +49,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject * @generated * @ordered */ - protected EList<JoinColumn> joinColumns; + protected EList<XmlJoinColumn> joinColumns; /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -76,7 +76,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @generated */ - protected AssociationOverride() + protected XmlAssociationOverride() { super(); } @@ -94,7 +94,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -102,15 +102,15 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAssociationOverride_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAssociationOverride_JoinColumns() * @model containment="true" required="true" * @generated */ - public EList<JoinColumn> getJoinColumns() + public EList<XmlJoinColumn> getJoinColumns() { if (joinColumns == null) { - joinColumns = new EObjectContainmentEList<JoinColumn>(JoinColumn.class, this, OrmPackage.ASSOCIATION_OVERRIDE__JOIN_COLUMNS); + joinColumns = new EObjectContainmentEList<XmlJoinColumn>(XmlJoinColumn.class, this, OrmPackage.ASSOCIATION_OVERRIDE__JOIN_COLUMNS); } return joinColumns; } @@ -125,7 +125,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAssociationOverride_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAssociationOverride_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -135,7 +135,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -197,7 +197,7 @@ public class AssociationOverride extends JpaEObject implements IJpaEObject { case OrmPackage.ASSOCIATION_OVERRIDE__JOIN_COLUMNS: getJoinColumns().clear(); - getJoinColumns().addAll((Collection<? extends JoinColumn>)newValue); + getJoinColumns().addAll((Collection<? extends XmlJoinColumn>)newValue); return; case OrmPackage.ASSOCIATION_OVERRIDE__NAME: setName((String)newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeMapping.java index d59a56ac21..ac9bfad896 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeMapping.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,16 +19,16 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface AttributeMapping extends IJpaEObject +public interface XmlAttributeMapping extends JpaEObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -40,14 +40,14 @@ public interface AttributeMapping extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeMapping_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeMapping_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeMapping#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeMapping#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverride.java index c7d755f1e4..ff320d5033 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/AttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlAttributeOverride.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,17 +19,17 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getColumn <em>Column</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface AttributeOverride extends IJpaEObject +public interface XmlAttributeOverride extends JpaEObject { /** * Returns the value of the '<em><b>Column</b></em>' containment reference. @@ -40,22 +40,22 @@ public interface AttributeOverride extends IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Column</em>' containment reference. - * @see #setColumn(Column) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride_Column() + * @see #setColumn(XmlColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride_Column() * @model containment="true" required="true" * @generated */ - Column getColumn(); + XmlColumn getColumn(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getColumn <em>Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getColumn <em>Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column</em>' containment reference. * @see #getColumn() * @generated */ - void setColumn(Column value); + void setColumn(XmlColumn value); /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -67,14 +67,14 @@ public interface AttributeOverride extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAttributeOverride_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAttributeOverride_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Basic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasic.java index 39d0f78fb7..d1f2919c7c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Basic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlBasic.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,24 +18,24 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getFetch <em>Fetch</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getOptional <em>Optional</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Basic#isLob <em>Lob</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getTemporal <em>Temporal</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getEnumerated <em>Enumerated</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Basic extends AttributeMapping, ColumnMapping +public interface XmlBasic extends XmlAttributeMapping, ColumnMapping { /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -43,20 +43,20 @@ public interface Basic extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Fetch() * @model default="LAZY" * @generated */ FetchType getFetch(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -72,14 +72,14 @@ public interface Basic extends AttributeMapping, ColumnMapping * <!-- end-user-doc --> * @return the value of the '<em>Optional</em>' attribute. * @see #setOptional(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Optional() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Optional() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getOptional(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getOptional <em>Optional</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getOptional <em>Optional</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Optional</em>' attribute. @@ -98,14 +98,14 @@ public interface Basic extends AttributeMapping, ColumnMapping * <!-- end-user-doc --> * @return the value of the '<em>Lob</em>' attribute. * @see #setLob(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Lob() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Lob() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ boolean isLob(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#isLob <em>Lob</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#isLob <em>Lob</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Lob</em>' attribute. @@ -116,7 +116,7 @@ public interface Basic extends AttributeMapping, ColumnMapping /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -124,20 +124,20 @@ public interface Basic extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Temporal() * @model * @generated */ TemporalType getTemporal(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ @@ -145,7 +145,7 @@ public interface Basic extends AttributeMapping, ColumnMapping /** * Returns the value of the '<em><b>Enumerated</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.EnumType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.EnumType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Enumerated</em>' attribute isn't clear, @@ -153,20 +153,20 @@ public interface Basic extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Enumerated</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.EnumType * @see #setEnumerated(EnumType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getBasic_Enumerated() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getBasic_Enumerated() * @model * @generated */ EnumType getEnumerated(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Basic#getEnumerated <em>Enumerated</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlBasic#getEnumerated <em>Enumerated</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Enumerated</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.EnumType + * @see org.eclipse.jpt.core.resource.orm.EnumType * @see #getEnumerated() * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Column.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumn.java index eaa1311fd6..3d7afe6fed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Column.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlColumn.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,17 +18,17 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Column#getLength <em>Length</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Column#getPrecision <em>Precision</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Column#getScale <em>Scale</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getLength <em>Length</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Column extends AbstractColumn +public interface XmlColumn extends XmlAbstractColumn { /** * Returns the value of the '<em><b>Length</b></em>' attribute. @@ -40,14 +40,14 @@ public interface Column extends AbstractColumn * <!-- end-user-doc --> * @return the value of the '<em>Length</em>' attribute. * @see #setLength(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Length() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Length() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ Integer getLength(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getLength <em>Length</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getLength <em>Length</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Length</em>' attribute. @@ -66,14 +66,14 @@ public interface Column extends AbstractColumn * <!-- end-user-doc --> * @return the value of the '<em>Precision</em>' attribute. * @see #setPrecision(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Precision() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Precision() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ Integer getPrecision(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getPrecision <em>Precision</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getPrecision <em>Precision</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Precision</em>' attribute. @@ -92,14 +92,14 @@ public interface Column extends AbstractColumn * <!-- end-user-doc --> * @return the value of the '<em>Scale</em>' attribute. * @see #setScale(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getColumn_Scale() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getColumn_Scale() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ Integer getScale(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Column#getScale <em>Scale</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlColumn#getScale <em>Scale</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Scale</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/DiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlDiscriminatorColumn.java index 363a4f004b..7fe33bbb5e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/DiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlDiscriminatorColumn.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,16 +22,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getLength <em>Length</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorColumn() * @model kind="class" * @generated */ -public class DiscriminatorColumn extends JpaEObject implements NamedColumn +public class XmlDiscriminatorColumn extends AbstractJpaEObject implements XmlNamedColumn { /** * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute. @@ -114,7 +114,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @generated */ - protected DiscriminatorColumn() + protected XmlDiscriminatorColumn() { super(); } @@ -140,7 +140,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Column Definition</em>' attribute. * @see #setColumnDefinition(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -150,7 +150,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getColumnDefinition <em>Column Definition</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getColumnDefinition <em>Column Definition</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column Definition</em>' attribute. @@ -168,7 +168,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn /** * Returns the value of the '<em><b>Discriminator Type</b></em>' attribute. * The default value is <code>"STRING"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.DiscriminatorType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Discriminator Type</em>' attribute isn't clear, @@ -176,9 +176,9 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn * </p> * <!-- end-user-doc --> * @return the value of the '<em>Discriminator Type</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType + * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType * @see #setDiscriminatorType(DiscriminatorType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorColumn_DiscriminatorType() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorColumn_DiscriminatorType() * @model default="STRING" * @generated */ @@ -188,11 +188,11 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getDiscriminatorType <em>Discriminator Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Discriminator Type</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.DiscriminatorType + * @see org.eclipse.jpt.core.resource.orm.DiscriminatorType * @see #getDiscriminatorType() * @generated */ @@ -214,7 +214,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Length</em>' attribute. * @see #setLength(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getDiscriminatorColumn_Length() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getDiscriminatorColumn_Length() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ @@ -224,7 +224,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getLength <em>Length</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getLength <em>Length</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Length</em>' attribute. @@ -249,7 +249,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -259,7 +259,7 @@ public class DiscriminatorColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.DiscriminatorColumn#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlDiscriminatorColumn#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Embeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddable.java index 90062b0821..dd3c0d6124 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Embeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddable.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.ecore.EClass; @@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EClass; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddable() * @model kind="class" * @generated */ -public class Embeddable extends TypeMapping +public class XmlEmbeddable extends AbstractTypeMapping { /** * changed this to null and removed the generated flag so emf won't generate over it @@ -34,7 +34,7 @@ public class Embeddable extends TypeMapping * <!-- end-user-doc --> * @generated */ - protected Embeddable() + protected XmlEmbeddable() { super(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Embedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbedded.java index b17c7fe4b8..521876e815 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Embedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbedded.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,19 +19,19 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Embedded#getAttributeOverrides <em>Attribute Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEmbedded#getAttributeOverrides <em>Attribute Overrides</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbedded() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbedded() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Embedded extends AttributeMapping +public interface XmlEmbedded extends XmlAttributeMapping { /** * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear, @@ -39,10 +39,10 @@ public interface Embedded extends AttributeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbedded_AttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbedded_AttributeOverrides() * @model containment="true" * @generated */ - EList<AttributeOverride> getAttributeOverrides(); + EList<XmlAttributeOverride> getAttributeOverrides(); } // Embedded diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedId.java index f69d0c4582..5b4b009f48 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/EmbeddedId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEmbeddedId.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,19 +19,19 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.EmbeddedId#getAttributeOverrides <em>Attribute Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEmbeddedId#getAttributeOverrides <em>Attribute Overrides</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedId() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedId() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface EmbeddedId extends AttributeMapping +public interface XmlEmbeddedId extends XmlAttributeMapping { /** * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear, @@ -39,10 +39,10 @@ public interface EmbeddedId extends AttributeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEmbeddedId_AttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEmbeddedId_AttributeOverrides() * @model containment="true" * @generated */ - EList<AttributeOverride> getAttributeOverrides(); + EList<XmlAttributeOverride> getAttributeOverrides(); } // EmbeddedId diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Entity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java index bdfdcdf2bf..24476d6820 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Entity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -27,39 +27,39 @@ import org.eclipse.emf.ecore.util.InternalEList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTable <em>Table</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSecondaryTables <em>Secondary Tables</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getIdClass <em>Id Class</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getInheritance <em>Inheritance</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorValue <em>Discriminator Value</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorColumn <em>Discriminator Column</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSequenceGenerator <em>Sequence Generator</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTableGenerator <em>Table Generator</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedQueries <em>Named Queries</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getNamedNativeQueries <em>Named Native Queries</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getEntityListeners <em>Entity Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPrePersist <em>Pre Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostPersist <em>Post Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreRemove <em>Pre Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostRemove <em>Post Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreUpdate <em>Pre Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostUpdate <em>Post Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostLoad <em>Post Load</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getAttributeOverrides <em>Attribute Overrides</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getAssociationOverrides <em>Association Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSecondaryTables <em>Secondary Tables</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSequenceGenerator <em>Sequence Generator</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTableGenerator <em>Table Generator</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedQueries <em>Named Queries</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getNamedNativeQueries <em>Named Native Queries</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSqlResultSetMappings <em>Sql Result Set Mappings</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAttributeOverrides <em>Attribute Overrides</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getAssociationOverrides <em>Association Overrides</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity() * @model kind="class" * @generated */ -public class Entity extends TypeMapping +public class XmlEntity extends AbstractTypeMapping { /** * changed this to null and removed the generated flag so emf won't generate over it @@ -95,7 +95,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected Table table; + protected XmlTable table; /** * The cached value of the '{@link #getSecondaryTables() <em>Secondary Tables</em>}' containment reference list. @@ -105,7 +105,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<SecondaryTable> secondaryTables; + protected EList<XmlSecondaryTable> secondaryTables; /** * The cached value of the '{@link #getPrimaryKeyJoinColumns() <em>Primary Key Join Columns</em>}' containment reference list. @@ -115,7 +115,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<PrimaryKeyJoinColumn> primaryKeyJoinColumns; + protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns; /** * The cached value of the '{@link #getIdClass() <em>Id Class</em>}' containment reference. @@ -165,7 +165,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected DiscriminatorColumn discriminatorColumn; + protected XmlDiscriminatorColumn discriminatorColumn; /** * The cached value of the '{@link #getSequenceGenerator() <em>Sequence Generator</em>}' containment reference. @@ -175,7 +175,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected SequenceGenerator sequenceGenerator; + protected XmlSequenceGenerator sequenceGenerator; /** * The cached value of the '{@link #getTableGenerator() <em>Table Generator</em>}' containment reference. @@ -185,7 +185,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected TableGenerator tableGenerator; + protected XmlTableGenerator tableGenerator; /** * The cached value of the '{@link #getNamedQueries() <em>Named Queries</em>}' containment reference list. @@ -195,7 +195,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<NamedQuery> namedQueries; + protected EList<XmlNamedQuery> namedQueries; /** * The cached value of the '{@link #getNamedNativeQueries() <em>Named Native Queries</em>}' containment reference list. @@ -205,7 +205,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<NamedNativeQuery> namedNativeQueries; + protected EList<XmlNamedNativeQuery> namedNativeQueries; /** * The cached value of the '{@link #getSqlResultSetMappings() <em>Sql Result Set Mappings</em>}' containment reference list. @@ -345,7 +345,7 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<AttributeOverride> attributeOverrides; + protected EList<XmlAttributeOverride> attributeOverrides; /** * The cached value of the '{@link #getAssociationOverrides() <em>Association Overrides</em>}' containment reference list. @@ -355,14 +355,14 @@ public class Entity extends TypeMapping * @generated * @ordered */ - protected EList<AssociationOverride> associationOverrides; + protected EList<XmlAssociationOverride> associationOverrides; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected Entity() + protected XmlEntity() { super(); } @@ -392,7 +392,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -402,7 +402,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -426,12 +426,12 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' containment reference. - * @see #setTable(Table) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_Table() + * @see #setTable(XmlTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_Table() * @model containment="true" * @generated */ - public Table getTable() + public XmlTable getTable() { return table; } @@ -441,9 +441,9 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetTable(Table newTable, NotificationChain msgs) + public NotificationChain basicSetTable(XmlTable newTable, NotificationChain msgs) { - Table oldTable = table; + XmlTable oldTable = table; table = newTable; if (eNotificationRequired()) { @@ -454,14 +454,14 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTable <em>Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTable <em>Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' containment reference. * @see #getTable() * @generated */ - public void setTable(Table newTable) + public void setTable(XmlTable newTable) { if (newTable != table) { @@ -479,7 +479,7 @@ public class Entity extends TypeMapping /** * Returns the value of the '<em><b>Secondary Tables</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Secondary Tables</em>' containment reference list isn't clear, @@ -487,22 +487,22 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Secondary Tables</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_SecondaryTables() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_SecondaryTables() * @model containment="true" * @generated */ - public EList<SecondaryTable> getSecondaryTables() + public EList<XmlSecondaryTable> getSecondaryTables() { if (secondaryTables == null) { - secondaryTables = new EObjectContainmentEList<SecondaryTable>(SecondaryTable.class, this, OrmPackage.ENTITY__SECONDARY_TABLES); + secondaryTables = new EObjectContainmentEList<XmlSecondaryTable>(XmlSecondaryTable.class, this, OrmPackage.ENTITY__SECONDARY_TABLES); } return secondaryTables; } /** * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Primary Key Join Columns</em>' containment reference list isn't clear, @@ -510,15 +510,15 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PrimaryKeyJoinColumns() * @model containment="true" * @generated */ - public EList<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() + public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() { if (primaryKeyJoinColumns == null) { - primaryKeyJoinColumns = new EObjectContainmentEList<PrimaryKeyJoinColumn>(PrimaryKeyJoinColumn.class, this, OrmPackage.ENTITY__PRIMARY_KEY_JOIN_COLUMNS); + primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.ENTITY__PRIMARY_KEY_JOIN_COLUMNS); } return primaryKeyJoinColumns; } @@ -533,7 +533,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Id Class</em>' containment reference. * @see #setIdClass(IdClass) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_IdClass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_IdClass() * @model containment="true" * @generated */ @@ -560,7 +560,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getIdClass <em>Id Class</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getIdClass <em>Id Class</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id Class</em>' containment reference. @@ -593,7 +593,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Inheritance</em>' containment reference. * @see #setInheritance(Inheritance) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_Inheritance() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_Inheritance() * @model containment="true" * @generated */ @@ -620,7 +620,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getInheritance <em>Inheritance</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getInheritance <em>Inheritance</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Inheritance</em>' containment reference. @@ -653,7 +653,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Discriminator Value</em>' attribute. * @see #setDiscriminatorValue(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_DiscriminatorValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_DiscriminatorValue() * @model dataType="org.eclipse.jpt.core.internal.resource.orm.DiscriminatorValue" * @generated */ @@ -663,7 +663,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorValue <em>Discriminator Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorValue <em>Discriminator Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Discriminator Value</em>' attribute. @@ -687,12 +687,12 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Discriminator Column</em>' containment reference. - * @see #setDiscriminatorColumn(DiscriminatorColumn) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_DiscriminatorColumn() + * @see #setDiscriminatorColumn(XmlDiscriminatorColumn) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_DiscriminatorColumn() * @model containment="true" * @generated */ - public DiscriminatorColumn getDiscriminatorColumn() + public XmlDiscriminatorColumn getDiscriminatorColumn() { return discriminatorColumn; } @@ -702,9 +702,9 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetDiscriminatorColumn(DiscriminatorColumn newDiscriminatorColumn, NotificationChain msgs) + public NotificationChain basicSetDiscriminatorColumn(XmlDiscriminatorColumn newDiscriminatorColumn, NotificationChain msgs) { - DiscriminatorColumn oldDiscriminatorColumn = discriminatorColumn; + XmlDiscriminatorColumn oldDiscriminatorColumn = discriminatorColumn; discriminatorColumn = newDiscriminatorColumn; if (eNotificationRequired()) { @@ -715,14 +715,14 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getDiscriminatorColumn <em>Discriminator Column</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getDiscriminatorColumn <em>Discriminator Column</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Discriminator Column</em>' containment reference. * @see #getDiscriminatorColumn() * @generated */ - public void setDiscriminatorColumn(DiscriminatorColumn newDiscriminatorColumn) + public void setDiscriminatorColumn(XmlDiscriminatorColumn newDiscriminatorColumn) { if (newDiscriminatorColumn != discriminatorColumn) { @@ -747,12 +747,12 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sequence Generator</em>' containment reference. - * @see #setSequenceGenerator(SequenceGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_SequenceGenerator() + * @see #setSequenceGenerator(XmlSequenceGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_SequenceGenerator() * @model containment="true" * @generated */ - public SequenceGenerator getSequenceGenerator() + public XmlSequenceGenerator getSequenceGenerator() { return sequenceGenerator; } @@ -762,9 +762,9 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetSequenceGenerator(SequenceGenerator newSequenceGenerator, NotificationChain msgs) + public NotificationChain basicSetSequenceGenerator(XmlSequenceGenerator newSequenceGenerator, NotificationChain msgs) { - SequenceGenerator oldSequenceGenerator = sequenceGenerator; + XmlSequenceGenerator oldSequenceGenerator = sequenceGenerator; sequenceGenerator = newSequenceGenerator; if (eNotificationRequired()) { @@ -775,14 +775,14 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Sequence Generator</em>' containment reference. * @see #getSequenceGenerator() * @generated */ - public void setSequenceGenerator(SequenceGenerator newSequenceGenerator) + public void setSequenceGenerator(XmlSequenceGenerator newSequenceGenerator) { if (newSequenceGenerator != sequenceGenerator) { @@ -807,12 +807,12 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Table Generator</em>' containment reference. - * @see #setTableGenerator(TableGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_TableGenerator() + * @see #setTableGenerator(XmlTableGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_TableGenerator() * @model containment="true" * @generated */ - public TableGenerator getTableGenerator() + public XmlTableGenerator getTableGenerator() { return tableGenerator; } @@ -822,9 +822,9 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @generated */ - public NotificationChain basicSetTableGenerator(TableGenerator newTableGenerator, NotificationChain msgs) + public NotificationChain basicSetTableGenerator(XmlTableGenerator newTableGenerator, NotificationChain msgs) { - TableGenerator oldTableGenerator = tableGenerator; + XmlTableGenerator oldTableGenerator = tableGenerator; tableGenerator = newTableGenerator; if (eNotificationRequired()) { @@ -835,14 +835,14 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getTableGenerator <em>Table Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getTableGenerator <em>Table Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table Generator</em>' containment reference. * @see #getTableGenerator() * @generated */ - public void setTableGenerator(TableGenerator newTableGenerator) + public void setTableGenerator(XmlTableGenerator newTableGenerator) { if (newTableGenerator != tableGenerator) { @@ -860,7 +860,7 @@ public class Entity extends TypeMapping /** * Returns the value of the '<em><b>Named Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Queries</em>' containment reference list isn't clear, @@ -868,22 +868,22 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Named Queries</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_NamedQueries() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_NamedQueries() * @model containment="true" * @generated */ - public EList<NamedQuery> getNamedQueries() + public EList<XmlNamedQuery> getNamedQueries() { if (namedQueries == null) { - namedQueries = new EObjectContainmentEList<NamedQuery>(NamedQuery.class, this, OrmPackage.ENTITY__NAMED_QUERIES); + namedQueries = new EObjectContainmentEList<XmlNamedQuery>(XmlNamedQuery.class, this, OrmPackage.ENTITY__NAMED_QUERIES); } return namedQueries; } /** * Returns the value of the '<em><b>Named Native Queries</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Named Native Queries</em>' containment reference list isn't clear, @@ -891,22 +891,22 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Named Native Queries</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_NamedNativeQueries() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_NamedNativeQueries() * @model containment="true" * @generated */ - public EList<NamedNativeQuery> getNamedNativeQueries() + public EList<XmlNamedNativeQuery> getNamedNativeQueries() { if (namedNativeQueries == null) { - namedNativeQueries = new EObjectContainmentEList<NamedNativeQuery>(NamedNativeQuery.class, this, OrmPackage.ENTITY__NAMED_NATIVE_QUERIES); + namedNativeQueries = new EObjectContainmentEList<XmlNamedNativeQuery>(XmlNamedNativeQuery.class, this, OrmPackage.ENTITY__NAMED_NATIVE_QUERIES); } return namedNativeQueries; } /** * Returns the value of the '<em><b>Sql Result Set Mappings</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.SqlResultSetMapping}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.SqlResultSetMapping}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Sql Result Set Mappings</em>' containment reference list isn't clear, @@ -914,7 +914,7 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sql Result Set Mappings</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_SqlResultSetMappings() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_SqlResultSetMappings() * @model containment="true" * @generated */ @@ -937,7 +937,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Exclude Default Listeners</em>' attribute. * @see #setExcludeDefaultListeners(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_ExcludeDefaultListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_ExcludeDefaultListeners() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -947,7 +947,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Exclude Default Listeners</em>' attribute. @@ -972,7 +972,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Exclude Superclass Listeners</em>' attribute. * @see #setExcludeSuperclassListeners(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_ExcludeSuperclassListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_ExcludeSuperclassListeners() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -982,7 +982,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Exclude Superclass Listeners</em>' attribute. @@ -1007,7 +1007,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Entity Listeners</em>' containment reference. * @see #setEntityListeners(EntityListeners) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_EntityListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_EntityListeners() * @model containment="true" * @generated */ @@ -1034,7 +1034,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getEntityListeners <em>Entity Listeners</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getEntityListeners <em>Entity Listeners</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Entity Listeners</em>' containment reference. @@ -1067,7 +1067,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Persist</em>' containment reference. * @see #setPrePersist(PrePersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PrePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PrePersist() * @model containment="true" * @generated */ @@ -1094,7 +1094,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPrePersist <em>Pre Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPrePersist <em>Pre Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Persist</em>' containment reference. @@ -1127,7 +1127,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Persist</em>' containment reference. * @see #setPostPersist(PostPersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PostPersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PostPersist() * @model containment="true" * @generated */ @@ -1154,7 +1154,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostPersist <em>Post Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostPersist <em>Post Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Persist</em>' containment reference. @@ -1187,7 +1187,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Remove</em>' containment reference. * @see #setPreRemove(PreRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PreRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PreRemove() * @model containment="true" * @generated */ @@ -1214,7 +1214,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreRemove <em>Pre Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreRemove <em>Pre Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Remove</em>' containment reference. @@ -1247,7 +1247,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Remove</em>' containment reference. * @see #setPostRemove(PostRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PostRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PostRemove() * @model containment="true" * @generated */ @@ -1274,7 +1274,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostRemove <em>Post Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostRemove <em>Post Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Remove</em>' containment reference. @@ -1307,7 +1307,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Update</em>' containment reference. * @see #setPreUpdate(PreUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PreUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PreUpdate() * @model containment="true" * @generated */ @@ -1334,7 +1334,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPreUpdate <em>Pre Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPreUpdate <em>Pre Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Update</em>' containment reference. @@ -1367,7 +1367,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Update</em>' containment reference. * @see #setPostUpdate(PostUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PostUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PostUpdate() * @model containment="true" * @generated */ @@ -1394,7 +1394,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostUpdate <em>Post Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostUpdate <em>Post Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Update</em>' containment reference. @@ -1427,7 +1427,7 @@ public class Entity extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Load</em>' containment reference. * @see #setPostLoad(PostLoad) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_PostLoad() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_PostLoad() * @model containment="true" * @generated */ @@ -1454,7 +1454,7 @@ public class Entity extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Entity#getPostLoad <em>Post Load</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlEntity#getPostLoad <em>Post Load</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Load</em>' containment reference. @@ -1479,7 +1479,7 @@ public class Entity extends TypeMapping /** * Returns the value of the '<em><b>Attribute Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AttributeOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAttributeOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attribute Overrides</em>' containment reference list isn't clear, @@ -1487,22 +1487,22 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attribute Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_AttributeOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_AttributeOverrides() * @model containment="true" * @generated */ - public EList<AttributeOverride> getAttributeOverrides() + public EList<XmlAttributeOverride> getAttributeOverrides() { if (attributeOverrides == null) { - attributeOverrides = new EObjectContainmentEList<AttributeOverride>(AttributeOverride.class, this, OrmPackage.ENTITY__ATTRIBUTE_OVERRIDES); + attributeOverrides = new EObjectContainmentEList<XmlAttributeOverride>(XmlAttributeOverride.class, this, OrmPackage.ENTITY__ATTRIBUTE_OVERRIDES); } return attributeOverrides; } /** * Returns the value of the '<em><b>Association Overrides</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.AssociationOverride}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlAssociationOverride}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Association Overrides</em>' containment reference list isn't clear, @@ -1510,15 +1510,15 @@ public class Entity extends TypeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Association Overrides</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getEntity_AssociationOverrides() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getEntity_AssociationOverrides() * @model containment="true" * @generated */ - public EList<AssociationOverride> getAssociationOverrides() + public EList<XmlAssociationOverride> getAssociationOverrides() { if (associationOverrides == null) { - associationOverrides = new EObjectContainmentEList<AssociationOverride>(AssociationOverride.class, this, OrmPackage.ENTITY__ASSOCIATION_OVERRIDES); + associationOverrides = new EObjectContainmentEList<XmlAssociationOverride>(XmlAssociationOverride.class, this, OrmPackage.ENTITY__ASSOCIATION_OVERRIDES); } return associationOverrides; } @@ -1658,15 +1658,15 @@ public class Entity extends TypeMapping setName((String)newValue); return; case OrmPackage.ENTITY__TABLE: - setTable((Table)newValue); + setTable((XmlTable)newValue); return; case OrmPackage.ENTITY__SECONDARY_TABLES: getSecondaryTables().clear(); - getSecondaryTables().addAll((Collection<? extends SecondaryTable>)newValue); + getSecondaryTables().addAll((Collection<? extends XmlSecondaryTable>)newValue); return; case OrmPackage.ENTITY__PRIMARY_KEY_JOIN_COLUMNS: getPrimaryKeyJoinColumns().clear(); - getPrimaryKeyJoinColumns().addAll((Collection<? extends PrimaryKeyJoinColumn>)newValue); + getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue); return; case OrmPackage.ENTITY__ID_CLASS: setIdClass((IdClass)newValue); @@ -1678,21 +1678,21 @@ public class Entity extends TypeMapping setDiscriminatorValue((String)newValue); return; case OrmPackage.ENTITY__DISCRIMINATOR_COLUMN: - setDiscriminatorColumn((DiscriminatorColumn)newValue); + setDiscriminatorColumn((XmlDiscriminatorColumn)newValue); return; case OrmPackage.ENTITY__SEQUENCE_GENERATOR: - setSequenceGenerator((SequenceGenerator)newValue); + setSequenceGenerator((XmlSequenceGenerator)newValue); return; case OrmPackage.ENTITY__TABLE_GENERATOR: - setTableGenerator((TableGenerator)newValue); + setTableGenerator((XmlTableGenerator)newValue); return; case OrmPackage.ENTITY__NAMED_QUERIES: getNamedQueries().clear(); - getNamedQueries().addAll((Collection<? extends NamedQuery>)newValue); + getNamedQueries().addAll((Collection<? extends XmlNamedQuery>)newValue); return; case OrmPackage.ENTITY__NAMED_NATIVE_QUERIES: getNamedNativeQueries().clear(); - getNamedNativeQueries().addAll((Collection<? extends NamedNativeQuery>)newValue); + getNamedNativeQueries().addAll((Collection<? extends XmlNamedNativeQuery>)newValue); return; case OrmPackage.ENTITY__SQL_RESULT_SET_MAPPINGS: getSqlResultSetMappings().clear(); @@ -1730,11 +1730,11 @@ public class Entity extends TypeMapping return; case OrmPackage.ENTITY__ATTRIBUTE_OVERRIDES: getAttributeOverrides().clear(); - getAttributeOverrides().addAll((Collection<? extends AttributeOverride>)newValue); + getAttributeOverrides().addAll((Collection<? extends XmlAttributeOverride>)newValue); return; case OrmPackage.ENTITY__ASSOCIATION_OVERRIDES: getAssociationOverrides().clear(); - getAssociationOverrides().addAll((Collection<? extends AssociationOverride>)newValue); + getAssociationOverrides().addAll((Collection<? extends XmlAssociationOverride>)newValue); return; } super.eSet(featureID, newValue); @@ -1754,7 +1754,7 @@ public class Entity extends TypeMapping setName(NAME_EDEFAULT); return; case OrmPackage.ENTITY__TABLE: - setTable((Table)null); + setTable((XmlTable)null); return; case OrmPackage.ENTITY__SECONDARY_TABLES: getSecondaryTables().clear(); @@ -1772,13 +1772,13 @@ public class Entity extends TypeMapping setDiscriminatorValue(DISCRIMINATOR_VALUE_EDEFAULT); return; case OrmPackage.ENTITY__DISCRIMINATOR_COLUMN: - setDiscriminatorColumn((DiscriminatorColumn)null); + setDiscriminatorColumn((XmlDiscriminatorColumn)null); return; case OrmPackage.ENTITY__SEQUENCE_GENERATOR: - setSequenceGenerator((SequenceGenerator)null); + setSequenceGenerator((XmlSequenceGenerator)null); return; case OrmPackage.ENTITY__TABLE_GENERATOR: - setTableGenerator((TableGenerator)null); + setTableGenerator((XmlTableGenerator)null); return; case OrmPackage.ENTITY__NAMED_QUERIES: getNamedQueries().clear(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValue.java index eb9d051d52..0c11cc2859 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/GeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGeneratedValue.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,17 +19,17 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getGenerator <em>Generator</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getStrategy <em>Strategy</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface GeneratedValue extends IJpaEObject +public interface XmlGeneratedValue extends JpaEObject { /** * Returns the value of the '<em><b>Generator</b></em>' attribute. @@ -41,14 +41,14 @@ public interface GeneratedValue extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Generator</em>' attribute. * @see #setGenerator(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue_Generator() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue_Generator() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getGenerator(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getGenerator <em>Generator</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getGenerator <em>Generator</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Generator</em>' attribute. @@ -60,7 +60,7 @@ public interface GeneratedValue extends IJpaEObject /** * Returns the value of the '<em><b>Strategy</b></em>' attribute. * The default value is <code>"TABLE"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.GenerationType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.GenerationType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Strategy</em>' attribute isn't clear, @@ -68,20 +68,20 @@ public interface GeneratedValue extends IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.GenerationType * @see #setStrategy(GenerationType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGeneratedValue_Strategy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGeneratedValue_Strategy() * @model default="TABLE" * @generated */ GenerationType getStrategy(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.GeneratedValue#getStrategy <em>Strategy</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGeneratedValue#getStrategy <em>Strategy</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Strategy</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.GenerationType + * @see org.eclipse.jpt.core.resource.orm.GenerationType * @see #getStrategy() * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Generator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGenerator.java index b52445fb45..e2ed0974db 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Generator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlGenerator.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,18 +19,18 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getInitialValue <em>Initial Value</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getAllocationSize <em>Allocation Size</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface Generator extends IJpaEObject +public interface XmlGenerator extends JpaEObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -42,14 +42,14 @@ public interface Generator extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -68,14 +68,14 @@ public interface Generator extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Initial Value</em>' attribute. * @see #setInitialValue(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_InitialValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_InitialValue() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ Integer getInitialValue(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getInitialValue <em>Initial Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getInitialValue <em>Initial Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Initial Value</em>' attribute. @@ -94,14 +94,14 @@ public interface Generator extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Allocation Size</em>' attribute. * @see #setAllocationSize(Integer) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getGenerator_AllocationSize() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getGenerator_AllocationSize() * @model dataType="org.eclipse.emf.ecore.xml.type.IntObject" * @generated */ Integer getAllocationSize(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Generator#getAllocationSize <em>Allocation Size</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlGenerator#getAllocationSize <em>Allocation Size</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Allocation Size</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Id.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlId.java index 1defecb7bf..eee091f8f4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Id.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlId.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,18 +18,18 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Id#getGeneratedValue <em>Generated Value</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTemporal <em>Temporal</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTableGenerator <em>Table Generator</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Id#getSequenceGenerator <em>Sequence Generator</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getGeneratedValue <em>Generated Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getTableGenerator <em>Table Generator</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlId#getSequenceGenerator <em>Sequence Generator</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Id extends AttributeMapping, ColumnMapping +public interface XmlId extends XmlAttributeMapping, ColumnMapping { /** * Returns the value of the '<em><b>Generated Value</b></em>' containment reference. @@ -40,26 +40,26 @@ public interface Id extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Generated Value</em>' containment reference. - * @see #setGeneratedValue(GeneratedValue) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_GeneratedValue() + * @see #setGeneratedValue(XmlGeneratedValue) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_GeneratedValue() * @model containment="true" * @generated */ - GeneratedValue getGeneratedValue(); + XmlGeneratedValue getGeneratedValue(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getGeneratedValue <em>Generated Value</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#getGeneratedValue <em>Generated Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Generated Value</em>' containment reference. * @see #getGeneratedValue() * @generated */ - void setGeneratedValue(GeneratedValue value); + void setGeneratedValue(XmlGeneratedValue value); /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -67,20 +67,20 @@ public interface Id extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_Temporal() * @model * @generated */ TemporalType getTemporal(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ @@ -95,22 +95,22 @@ public interface Id extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Table Generator</em>' containment reference. - * @see #setTableGenerator(TableGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_TableGenerator() + * @see #setTableGenerator(XmlTableGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_TableGenerator() * @model containment="true" * @generated */ - TableGenerator getTableGenerator(); + XmlTableGenerator getTableGenerator(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getTableGenerator <em>Table Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#getTableGenerator <em>Table Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table Generator</em>' containment reference. * @see #getTableGenerator() * @generated */ - void setTableGenerator(TableGenerator value); + void setTableGenerator(XmlTableGenerator value); /** * Returns the value of the '<em><b>Sequence Generator</b></em>' containment reference. @@ -121,21 +121,21 @@ public interface Id extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Sequence Generator</em>' containment reference. - * @see #setSequenceGenerator(SequenceGenerator) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getId_SequenceGenerator() + * @see #setSequenceGenerator(XmlSequenceGenerator) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getId_SequenceGenerator() * @model containment="true" * @generated */ - SequenceGenerator getSequenceGenerator(); + XmlSequenceGenerator getSequenceGenerator(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Id#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlId#getSequenceGenerator <em>Sequence Generator</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Sequence Generator</em>' containment reference. * @see #getSequenceGenerator() * @generated */ - void setSequenceGenerator(SequenceGenerator value); + void setSequenceGenerator(XmlSequenceGenerator value); } // Id diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumn.java index 06bb70e48b..4f27079894 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinColumn.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,15 +18,15 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumn() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface JoinColumn extends AbstractColumn +public interface XmlJoinColumn extends XmlAbstractColumn { /** * Returns the value of the '<em><b>Referenced Column Name</b></em>' attribute. @@ -38,14 +38,14 @@ public interface JoinColumn extends AbstractColumn * <!-- end-user-doc --> * @return the value of the '<em>Referenced Column Name</em>' attribute. * @see #setReferencedColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinColumn_ReferencedColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinColumn_ReferencedColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getReferencedColumnName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Referenced Column Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTable.java index af658b163a..c224496d4c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/JoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlJoinTable.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,20 +19,20 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable#getJoinColumns <em>Join Columns</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.JoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getJoinColumns <em>Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlJoinTable#getInverseJoinColumns <em>Inverse Join Columns</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface JoinTable extends AbstractTable +public interface XmlJoinTable extends XmlAbstractTable { /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -40,15 +40,15 @@ public interface JoinTable extends AbstractTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable_JoinColumns() * @model containment="true" * @generated */ - EList<JoinColumn> getJoinColumns(); + EList<XmlJoinColumn> getJoinColumns(); /** * Returns the value of the '<em><b>Inverse Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Inverse Join Columns</em>' containment reference list isn't clear, @@ -56,10 +56,10 @@ public interface JoinTable extends AbstractTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Inverse Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getJoinTable_InverseJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getJoinTable_InverseJoinColumns() * @model containment="true" * @generated */ - EList<JoinColumn> getInverseJoinColumns(); + EList<XmlJoinColumn> getInverseJoinColumns(); } // JoinTable diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java index 7d0eed9e93..3fb4109d86 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToMany.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -16,10 +16,10 @@ package org.eclipse.jpt.core.internal.resource.orm; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToMany() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToMany() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface ManyToMany extends MultiRelationshipMapping +public interface XmlManyToMany extends XmlMultiRelationshipMapping { } // ManyToMany diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOne.java index ce170d76fe..9da8cdf1ec 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/ManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlManyToOne.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -16,10 +16,10 @@ package org.eclipse.jpt.core.internal.resource.orm; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getManyToOne() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getManyToOne() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface ManyToOne extends SingleRelationshipMapping +public interface XmlManyToOne extends XmlSingleRelationshipMapping { } // ManyToOne diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java index 3ef74c5d21..cba80dce6d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMappedSuperclass.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; @@ -23,25 +23,25 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getIdClass <em>Id Class</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getEntityListeners <em>Entity Listeners</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPrePersist <em>Pre Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostPersist <em>Post Persist</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreRemove <em>Pre Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostRemove <em>Post Remove</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreUpdate <em>Pre Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostUpdate <em>Post Update</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostLoad <em>Post Load</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass() * @model kind="class" * @generated */ -public class MappedSuperclass extends TypeMapping +public class XmlMappedSuperclass extends AbstractTypeMapping { /** * changed this to null and removed the generated flag so emf won't generate over it @@ -184,7 +184,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @generated */ - protected MappedSuperclass() + protected XmlMappedSuperclass() { super(); } @@ -214,7 +214,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Id Class</em>' containment reference. * @see #setIdClass(IdClass) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_IdClass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_IdClass() * @model containment="true" * @generated */ @@ -241,7 +241,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getIdClass <em>Id Class</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getIdClass <em>Id Class</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id Class</em>' containment reference. @@ -274,7 +274,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Exclude Default Listeners</em>' attribute. * @see #setExcludeDefaultListeners(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_ExcludeDefaultListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_ExcludeDefaultListeners() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -284,7 +284,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeDefaultListeners <em>Exclude Default Listeners</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Exclude Default Listeners</em>' attribute. @@ -309,7 +309,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Exclude Superclass Listeners</em>' attribute. * @see #setExcludeSuperclassListeners(boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_ExcludeSuperclassListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_ExcludeSuperclassListeners() * @model dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -319,7 +319,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#isExcludeSuperclassListeners <em>Exclude Superclass Listeners</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Exclude Superclass Listeners</em>' attribute. @@ -344,7 +344,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Entity Listeners</em>' containment reference. * @see #setEntityListeners(EntityListeners) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_EntityListeners() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_EntityListeners() * @model containment="true" * @generated */ @@ -371,7 +371,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getEntityListeners <em>Entity Listeners</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getEntityListeners <em>Entity Listeners</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Entity Listeners</em>' containment reference. @@ -404,7 +404,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Persist</em>' containment reference. * @see #setPrePersist(PrePersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PrePersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PrePersist() * @model containment="true" * @generated */ @@ -431,7 +431,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPrePersist <em>Pre Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPrePersist <em>Pre Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Persist</em>' containment reference. @@ -464,7 +464,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Persist</em>' containment reference. * @see #setPostPersist(PostPersist) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PostPersist() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PostPersist() * @model containment="true" * @generated */ @@ -491,7 +491,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostPersist <em>Post Persist</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostPersist <em>Post Persist</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Persist</em>' containment reference. @@ -524,7 +524,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Remove</em>' containment reference. * @see #setPreRemove(PreRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PreRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PreRemove() * @model containment="true" * @generated */ @@ -551,7 +551,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreRemove <em>Pre Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreRemove <em>Pre Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Remove</em>' containment reference. @@ -584,7 +584,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Remove</em>' containment reference. * @see #setPostRemove(PostRemove) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PostRemove() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PostRemove() * @model containment="true" * @generated */ @@ -611,7 +611,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostRemove <em>Post Remove</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostRemove <em>Post Remove</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Remove</em>' containment reference. @@ -644,7 +644,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Pre Update</em>' containment reference. * @see #setPreUpdate(PreUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PreUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PreUpdate() * @model containment="true" * @generated */ @@ -671,7 +671,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPreUpdate <em>Pre Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPreUpdate <em>Pre Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pre Update</em>' containment reference. @@ -704,7 +704,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Update</em>' containment reference. * @see #setPostUpdate(PostUpdate) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PostUpdate() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PostUpdate() * @model containment="true" * @generated */ @@ -731,7 +731,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostUpdate <em>Post Update</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostUpdate <em>Post Update</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Update</em>' containment reference. @@ -764,7 +764,7 @@ public class MappedSuperclass extends TypeMapping * <!-- end-user-doc --> * @return the value of the '<em>Post Load</em>' containment reference. * @see #setPostLoad(PostLoad) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMappedSuperclass_PostLoad() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMappedSuperclass_PostLoad() * @model containment="true" * @generated */ @@ -791,7 +791,7 @@ public class MappedSuperclass extends TypeMapping } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MappedSuperclass#getPostLoad <em>Post Load</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMappedSuperclass#getPostLoad <em>Post Load</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Post Load</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMultiRelationshipMapping.java index d367a2fb98..cbe4f36895 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/MultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlMultiRelationshipMapping.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,17 +18,17 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMappedBy <em>Mapped By</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getOrderBy <em>Order By</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMapKey <em>Map Key</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface MultiRelationshipMapping extends RelationshipMapping +public interface XmlMultiRelationshipMapping extends XmlRelationshipMapping { /** * Returns the value of the '<em><b>Order By</b></em>' attribute. @@ -40,14 +40,14 @@ public interface MultiRelationshipMapping extends RelationshipMapping * <!-- end-user-doc --> * @return the value of the '<em>Order By</em>' attribute. * @see #setOrderBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_OrderBy() * @model dataType="org.eclipse.jpt.core.internal.resource.orm.OrderBy" * @generated */ String getOrderBy(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getOrderBy <em>Order By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getOrderBy <em>Order By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Order By</em>' attribute. @@ -66,14 +66,14 @@ public interface MultiRelationshipMapping extends RelationshipMapping * <!-- end-user-doc --> * @return the value of the '<em>Map Key</em>' containment reference. * @see #setMapKey(MapKey) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MapKey() * @model containment="true" * @generated */ MapKey getMapKey(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMapKey <em>Map Key</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMapKey <em>Map Key</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Map Key</em>' containment reference. @@ -92,14 +92,14 @@ public interface MultiRelationshipMapping extends RelationshipMapping * <!-- end-user-doc --> * @return the value of the '<em>Mapped By</em>' attribute. * @see #setMappedBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getMultiRelationshipMapping_MappedBy() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getMappedBy(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.MultiRelationshipMapping#getMappedBy <em>Mapped By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlMultiRelationshipMapping#getMappedBy <em>Mapped By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Mapped By</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedColumn.java index 0f6e8e1fa3..5d662791f2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedColumn.java @@ -7,9 +7,9 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -19,17 +19,17 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getColumnDefinition <em>Column Definition</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName <em>Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface NamedColumn extends IJpaEObject +public interface XmlNamedColumn extends JpaEObject { /** * Returns the value of the '<em><b>Column Definition</b></em>' attribute. @@ -41,14 +41,14 @@ public interface NamedColumn extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Column Definition</em>' attribute. * @see #setColumnDefinition(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getColumnDefinition(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getColumnDefinition <em>Column Definition</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getColumnDefinition <em>Column Definition</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column Definition</em>' attribute. @@ -67,14 +67,14 @@ public interface NamedColumn extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedColumn#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedColumn#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedNativeQuery.java index 3d90888339..888ec9f8f3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedNativeQuery.java @@ -8,7 +8,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,16 +29,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultClass <em>Result Class</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedNativeQuery() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedNativeQuery() * @model kind="class" * @generated */ -public class NamedNativeQuery extends JpaEObject implements Query +public class XmlNamedNativeQuery extends AbstractJpaEObject implements XmlQuery { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -88,7 +88,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * @generated * @ordered */ - protected EList<QueryHint> hints; + protected EList<XmlQueryHint> hints; /** * The default value of the '{@link #getResultClass() <em>Result Class</em>}' attribute. @@ -135,7 +135,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @generated */ - protected NamedNativeQuery() + protected XmlNamedNativeQuery() { super(); } @@ -161,7 +161,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -171,7 +171,7 @@ public class NamedNativeQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -196,7 +196,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Result Class</em>' attribute. * @see #setResultClass(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedNativeQuery_ResultClass() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedNativeQuery_ResultClass() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -206,7 +206,7 @@ public class NamedNativeQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultClass <em>Result Class</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultClass <em>Result Class</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Result Class</em>' attribute. @@ -231,7 +231,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Result Set Mapping</em>' attribute. * @see #setResultSetMapping(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedNativeQuery_ResultSetMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedNativeQuery_ResultSetMapping() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -241,7 +241,7 @@ public class NamedNativeQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getResultSetMapping <em>Result Set Mapping</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Result Set Mapping</em>' attribute. @@ -266,7 +266,7 @@ public class NamedNativeQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Query</em>' attribute. * @see #setQuery(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Query() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Query() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -276,7 +276,7 @@ public class NamedNativeQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedNativeQuery#getQuery <em>Query</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery#getQuery <em>Query</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Query</em>' attribute. @@ -293,7 +293,7 @@ public class NamedNativeQuery extends JpaEObject implements Query /** * Returns the value of the '<em><b>Hints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.QueryHint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlQueryHint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Hints</em>' containment reference list isn't clear, @@ -301,15 +301,15 @@ public class NamedNativeQuery extends JpaEObject implements Query * </p> * <!-- end-user-doc --> * @return the value of the '<em>Hints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Hints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Hints() * @model containment="true" * @generated */ - public EList<QueryHint> getHints() + public EList<XmlQueryHint> getHints() { if (hints == null) { - hints = new EObjectContainmentEList<QueryHint>(QueryHint.class, this, OrmPackage.NAMED_NATIVE_QUERY__HINTS); + hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, OrmPackage.NAMED_NATIVE_QUERY__HINTS); } return hints; } @@ -373,7 +373,7 @@ public class NamedNativeQuery extends JpaEObject implements Query return; case OrmPackage.NAMED_NATIVE_QUERY__HINTS: getHints().clear(); - getHints().addAll((Collection<? extends QueryHint>)newValue); + getHints().addAll((Collection<? extends XmlQueryHint>)newValue); return; case OrmPackage.NAMED_NATIVE_QUERY__RESULT_CLASS: setResultClass((String)newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedQuery.java index 5a99792c69..fcc1040f99 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/NamedQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlNamedQuery.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedQuery() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedQuery() * @model kind="class" * @generated */ -public class NamedQuery extends JpaEObject implements Query +public class XmlNamedQuery extends AbstractJpaEObject implements XmlQuery { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -80,14 +80,14 @@ public class NamedQuery extends JpaEObject implements Query * @generated * @ordered */ - protected EList<QueryHint> hints; + protected EList<XmlQueryHint> hints; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected NamedQuery() + protected XmlNamedQuery() { super(); } @@ -113,7 +113,7 @@ public class NamedQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -123,7 +123,7 @@ public class NamedQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -148,7 +148,7 @@ public class NamedQuery extends JpaEObject implements Query * <!-- end-user-doc --> * @return the value of the '<em>Query</em>' attribute. * @see #setQuery(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Query() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Query() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -158,7 +158,7 @@ public class NamedQuery extends JpaEObject implements Query } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.NamedQuery#getQuery <em>Query</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlNamedQuery#getQuery <em>Query</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Query</em>' attribute. @@ -175,7 +175,7 @@ public class NamedQuery extends JpaEObject implements Query /** * Returns the value of the '<em><b>Hints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.QueryHint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlQueryHint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Hints</em>' containment reference list isn't clear, @@ -183,15 +183,15 @@ public class NamedQuery extends JpaEObject implements Query * </p> * <!-- end-user-doc --> * @return the value of the '<em>Hints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Hints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Hints() * @model containment="true" * @generated */ - public EList<QueryHint> getHints() + public EList<XmlQueryHint> getHints() { if (hints == null) { - hints = new EObjectContainmentEList<QueryHint>(QueryHint.class, this, OrmPackage.NAMED_QUERY__HINTS); + hints = new EObjectContainmentEList<XmlQueryHint>(XmlQueryHint.class, this, OrmPackage.NAMED_QUERY__HINTS); } return hints; } @@ -251,7 +251,7 @@ public class NamedQuery extends JpaEObject implements Query return; case OrmPackage.NAMED_QUERY__HINTS: getHints().clear(); - getHints().addAll((Collection<? extends QueryHint>)newValue); + getHints().addAll((Collection<? extends XmlQueryHint>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java index c18b416372..a7e2027e72 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,19 +19,19 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.OneToMany#getJoinColumns <em>Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToMany#getJoinColumns <em>Join Columns</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToMany() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToMany() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface OneToMany extends MultiRelationshipMapping +public interface XmlOneToMany extends XmlMultiRelationshipMapping { /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -39,10 +39,10 @@ public interface OneToMany extends MultiRelationshipMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToMany_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToMany_JoinColumns() * @model containment="true" * @generated */ - EList<JoinColumn> getJoinColumns(); + EList<XmlJoinColumn> getJoinColumns(); } // OneToMany diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java index 3be21cc861..64206bfdde 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/OneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,16 +19,16 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne#getMappedBy <em>Mapped By</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface OneToOne extends SingleRelationshipMapping +public interface XmlOneToOne extends XmlSingleRelationshipMapping { /** * Returns the value of the '<em><b>Mapped By</b></em>' attribute. @@ -40,14 +40,14 @@ public interface OneToOne extends SingleRelationshipMapping * <!-- end-user-doc --> * @return the value of the '<em>Mapped By</em>' attribute. * @see #setMappedBy(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne_MappedBy() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne_MappedBy() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getMappedBy(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.OneToOne#getMappedBy <em>Mapped By</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlOneToOne#getMappedBy <em>Mapped By</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Mapped By</em>' attribute. @@ -58,7 +58,7 @@ public interface OneToOne extends SingleRelationshipMapping /** * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Primary Key Join Columns</em>' containment reference list isn't clear, @@ -66,10 +66,10 @@ public interface OneToOne extends SingleRelationshipMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getOneToOne_PrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getOneToOne_PrimaryKeyJoinColumns() * @model containment="true" * @generated */ - EList<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumns(); + EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns(); } // OneToOne diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumn.java index 8ba82f2a41..ae8c77571b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/PrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlPrimaryKeyJoinColumn.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -22,15 +22,15 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrimaryKeyJoinColumn() * @model kind="class" * @generated */ -public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn +public class XmlPrimaryKeyJoinColumn extends AbstractJpaEObject implements XmlNamedColumn { /** * The default value of the '{@link #getColumnDefinition() <em>Column Definition</em>}' attribute. @@ -97,7 +97,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @generated */ - protected PrimaryKeyJoinColumn() + protected XmlPrimaryKeyJoinColumn() { super(); } @@ -123,7 +123,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -133,7 +133,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -158,7 +158,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Referenced Column Name</em>' attribute. * @see #setReferencedColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getPrimaryKeyJoinColumn_ReferencedColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getPrimaryKeyJoinColumn_ReferencedColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -168,7 +168,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getReferencedColumnName <em>Referenced Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Referenced Column Name</em>' attribute. @@ -193,7 +193,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn * <!-- end-user-doc --> * @return the value of the '<em>Column Definition</em>' attribute. * @see #setColumnDefinition(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getNamedColumn_ColumnDefinition() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -203,7 +203,7 @@ public class PrimaryKeyJoinColumn extends JpaEObject implements NamedColumn } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn#getColumnDefinition <em>Column Definition</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn#getColumnDefinition <em>Column Definition</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Column Definition</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Query.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQuery.java index cd5c29a58e..49792411dc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Query.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQuery.java @@ -7,11 +7,11 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; /** * <!-- begin-user-doc --> @@ -21,18 +21,18 @@ import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Query#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Query#getQuery <em>Query</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Query#getHints <em>Hints</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getHints <em>Hints</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery() * @model kind="class" interface="true" abstract="true" * @extends IJpaEObject * @generated */ -public interface Query extends IJpaEObject +public interface XmlQuery extends JpaEObject { /** * Returns the value of the '<em><b>Name</b></em>' attribute. @@ -44,14 +44,14 @@ public interface Query extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Query#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -70,14 +70,14 @@ public interface Query extends IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Query</em>' attribute. * @see #setQuery(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Query() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Query() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ String getQuery(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Query#getQuery <em>Query</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQuery#getQuery <em>Query</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Query</em>' attribute. @@ -88,7 +88,7 @@ public interface Query extends IJpaEObject /** * Returns the value of the '<em><b>Hints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.QueryHint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlQueryHint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Hints</em>' containment reference list isn't clear, @@ -96,10 +96,10 @@ public interface Query extends IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Hints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQuery_Hints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQuery_Hints() * @model containment="true" * @generated */ - EList<QueryHint> getHints(); + EList<XmlQueryHint> getHints(); } // Query diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/QueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQueryHint.java index 3b4c728cf8..f083934374 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/QueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlQueryHint.java @@ -7,13 +7,13 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -23,17 +23,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue <em>Value</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQueryHint() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQueryHint() * @model kind="class" * @extends IJpaEObject * @generated */ -public class QueryHint extends JpaEObject implements IJpaEObject +public class XmlQueryHint extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -80,7 +80,7 @@ public class QueryHint extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @generated */ - protected QueryHint() + protected XmlQueryHint() { super(); } @@ -106,7 +106,7 @@ public class QueryHint extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQueryHint_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQueryHint_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -116,7 +116,7 @@ public class QueryHint extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -141,7 +141,7 @@ public class QueryHint extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' attribute. * @see #setValue(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getQueryHint_Value() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getQueryHint_Value() * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -151,7 +151,7 @@ public class QueryHint extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.QueryHint#getValue <em>Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlQueryHint#getValue <em>Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/RelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlRelationshipMapping.java index c7ce04ac90..60a6429810 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/RelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlRelationshipMapping.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,18 +18,18 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getTargetEntity <em>Target Entity</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getFetch <em>Fetch</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getJoinTable <em>Join Table</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getCascade <em>Cascade</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface RelationshipMapping extends AttributeMapping +public interface XmlRelationshipMapping extends XmlAttributeMapping { /** * Returns the value of the '<em><b>Target Entity</b></em>' attribute. @@ -41,14 +41,14 @@ public interface RelationshipMapping extends AttributeMapping * <!-- end-user-doc --> * @return the value of the '<em>Target Entity</em>' attribute. * @see #setTargetEntity(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_TargetEntity() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getTargetEntity(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getTargetEntity <em>Target Entity</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getTargetEntity <em>Target Entity</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Target Entity</em>' attribute. @@ -60,7 +60,7 @@ public interface RelationshipMapping extends AttributeMapping /** * Returns the value of the '<em><b>Fetch</b></em>' attribute. * The default value is <code>"LAZY"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.FetchType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.FetchType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Fetch</em>' attribute isn't clear, @@ -68,20 +68,20 @@ public interface RelationshipMapping extends AttributeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #setFetch(FetchType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Fetch() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Fetch() * @model default="LAZY" * @generated */ FetchType getFetch(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getFetch <em>Fetch</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getFetch <em>Fetch</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Fetch</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.FetchType + * @see org.eclipse.jpt.core.resource.orm.FetchType * @see #getFetch() * @generated */ @@ -97,14 +97,14 @@ public interface RelationshipMapping extends AttributeMapping * <!-- end-user-doc --> * @return the value of the '<em>Cascade</em>' containment reference. * @see #setCascade(CascadeType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_Cascade() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_Cascade() * @model containment="true" * @generated */ CascadeType getCascade(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getCascade <em>Cascade</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getCascade <em>Cascade</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Cascade</em>' containment reference. @@ -122,21 +122,21 @@ public interface RelationshipMapping extends AttributeMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Table</em>' containment reference. - * @see #setJoinTable(JoinTable) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() + * @see #setJoinTable(XmlJoinTable) + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getRelationshipMapping_JoinTable() * @model containment="true" * @generated */ - JoinTable getJoinTable(); + XmlJoinTable getJoinTable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.RelationshipMapping#getJoinTable <em>Join Table</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlRelationshipMapping#getJoinTable <em>Join Table</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Join Table</em>' containment reference. * @see #getJoinTable() * @generated */ - void setJoinTable(JoinTable value); + void setJoinTable(XmlJoinTable value); } // RelationshipMapping diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTable.java index e385a7e849..97180a6689 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSecondaryTable.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -28,15 +28,15 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getPrimaryKeyJoinColumns <em>Primary Key Join Columns</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSecondaryTable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSecondaryTable() * @model kind="class" * @generated */ -public class SecondaryTable extends JpaEObject implements AbstractTable +public class XmlSecondaryTable extends AbstractJpaEObject implements XmlAbstractTable { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -109,14 +109,14 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * @generated * @ordered */ - protected EList<PrimaryKeyJoinColumn> primaryKeyJoinColumns; + protected EList<XmlPrimaryKeyJoinColumn> primaryKeyJoinColumns; /** * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated */ - protected SecondaryTable() + protected XmlSecondaryTable() { super(); } @@ -142,7 +142,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -152,7 +152,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -177,7 +177,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -187,7 +187,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -212,7 +212,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -222,7 +222,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SecondaryTable#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSecondaryTable#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -239,7 +239,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -247,7 +247,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() * @model containment="true" * @generated */ @@ -262,7 +262,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable /** * Returns the value of the '<em><b>Primary Key Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.PrimaryKeyJoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Primary Key Join Columns</em>' containment reference list isn't clear, @@ -270,15 +270,15 @@ public class SecondaryTable extends JpaEObject implements AbstractTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Primary Key Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSecondaryTable_PrimaryKeyJoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSecondaryTable_PrimaryKeyJoinColumns() * @model containment="true" * @generated */ - public EList<PrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() + public EList<XmlPrimaryKeyJoinColumn> getPrimaryKeyJoinColumns() { if (primaryKeyJoinColumns == null) { - primaryKeyJoinColumns = new EObjectContainmentEList<PrimaryKeyJoinColumn>(PrimaryKeyJoinColumn.class, this, OrmPackage.SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS); + primaryKeyJoinColumns = new EObjectContainmentEList<XmlPrimaryKeyJoinColumn>(XmlPrimaryKeyJoinColumn.class, this, OrmPackage.SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS); } return primaryKeyJoinColumns; } @@ -351,7 +351,7 @@ public class SecondaryTable extends JpaEObject implements AbstractTable return; case OrmPackage.SECONDARY_TABLE__PRIMARY_KEY_JOIN_COLUMNS: getPrimaryKeyJoinColumns().clear(); - getPrimaryKeyJoinColumns().addAll((Collection<? extends PrimaryKeyJoinColumn>)newValue); + getPrimaryKeyJoinColumns().addAll((Collection<? extends XmlPrimaryKeyJoinColumn>)newValue); return; } super.eSet(featureID, newValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGenerator.java index 135eff7806..e9ba668ce4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSequenceGenerator.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,15 +18,15 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator#getSequenceName <em>Sequence Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGenerator() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGenerator() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface SequenceGenerator extends Generator +public interface XmlSequenceGenerator extends XmlGenerator { /** * Returns the value of the '<em><b>Sequence Name</b></em>' attribute. @@ -38,14 +38,14 @@ public interface SequenceGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Sequence Name</em>' attribute. * @see #setSequenceName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSequenceGenerator_SequenceName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSequenceGenerator_SequenceName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getSequenceName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SequenceGenerator#getSequenceName <em>Sequence Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSequenceGenerator#getSequenceName <em>Sequence Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Sequence Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSingleRelationshipMapping.java index 4c880a77e3..4c9f1b130d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/SingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlSingleRelationshipMapping.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,16 +19,16 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getOptional <em>Optional</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getJoinColumns <em>Join Columns</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface SingleRelationshipMapping extends RelationshipMapping +public interface XmlSingleRelationshipMapping extends XmlRelationshipMapping { /** * Returns the value of the '<em><b>Optional</b></em>' attribute. @@ -40,14 +40,14 @@ public interface SingleRelationshipMapping extends RelationshipMapping * <!-- end-user-doc --> * @return the value of the '<em>Optional</em>' attribute. * @see #setOptional(Boolean) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_Optional() * @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject" * @generated */ Boolean getOptional(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.SingleRelationshipMapping#getOptional <em>Optional</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlSingleRelationshipMapping#getOptional <em>Optional</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Optional</em>' attribute. @@ -58,7 +58,7 @@ public interface SingleRelationshipMapping extends RelationshipMapping /** * Returns the value of the '<em><b>Join Columns</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.JoinColumn}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.XmlJoinColumn}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Join Columns</em>' containment reference list isn't clear, @@ -66,10 +66,10 @@ public interface SingleRelationshipMapping extends RelationshipMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Join Columns</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getSingleRelationshipMapping_JoinColumns() * @model containment="true" * @generated */ - EList<JoinColumn> getJoinColumns(); + EList<XmlJoinColumn> getJoinColumns(); } // SingleRelationshipMapping diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Table.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTable.java index b5f563a29b..a2cb00fc95 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Table.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTable.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -26,11 +26,11 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTable() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTable() * @model kind="class" * @generated */ -public class Table extends JpaEObject implements AbstractTable +public class XmlTable extends AbstractJpaEObject implements XmlAbstractTable { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -101,7 +101,7 @@ public class Table extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @generated */ - protected Table() + protected XmlTable() { super(); } @@ -127,7 +127,7 @@ public class Table extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Name() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Name() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -137,7 +137,7 @@ public class Table extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Table#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTable#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -162,7 +162,7 @@ public class Table extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -172,7 +172,7 @@ public class Table extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Table#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTable#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -197,7 +197,7 @@ public class Table extends JpaEObject implements AbstractTable * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -207,7 +207,7 @@ public class Table extends JpaEObject implements AbstractTable } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Table#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTable#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -224,7 +224,7 @@ public class Table extends JpaEObject implements AbstractTable /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -232,7 +232,7 @@ public class Table extends JpaEObject implements AbstractTable * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getAbstractTable_UniqueConstraints() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGenerator.java index c62d8b0b23..0ce5430693 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/TableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTableGenerator.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; import org.eclipse.emf.common.util.EList; @@ -19,21 +19,21 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getTable <em>Table</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getCatalog <em>Catalog</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getSchema <em>Schema</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnName <em>Pk Column Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getValueColumnName <em>Value Column Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnValue <em>Pk Column Value</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getUniqueConstraints <em>Unique Constraints</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getUniqueConstraints <em>Unique Constraints</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface TableGenerator extends Generator +public interface XmlTableGenerator extends XmlGenerator { /** * Returns the value of the '<em><b>Table</b></em>' attribute. @@ -45,14 +45,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Table</em>' attribute. * @see #setTable(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Table() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Table() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getTable(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getTable <em>Table</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getTable <em>Table</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Table</em>' attribute. @@ -71,14 +71,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Catalog</em>' attribute. * @see #setCatalog(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Catalog() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Catalog() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getCatalog(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getCatalog <em>Catalog</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getCatalog <em>Catalog</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Catalog</em>' attribute. @@ -97,14 +97,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Schema</em>' attribute. * @see #setSchema(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_Schema() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_Schema() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getSchema(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getSchema <em>Schema</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getSchema <em>Schema</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Schema</em>' attribute. @@ -123,14 +123,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Pk Column Name</em>' attribute. * @see #setPkColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_PkColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_PkColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getPkColumnName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnName <em>Pk Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnName <em>Pk Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pk Column Name</em>' attribute. @@ -149,14 +149,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Value Column Name</em>' attribute. * @see #setValueColumnName(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_ValueColumnName() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_ValueColumnName() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getValueColumnName(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getValueColumnName <em>Value Column Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getValueColumnName <em>Value Column Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value Column Name</em>' attribute. @@ -175,14 +175,14 @@ public interface TableGenerator extends Generator * <!-- end-user-doc --> * @return the value of the '<em>Pk Column Value</em>' attribute. * @see #setPkColumnValue(String) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_PkColumnValue() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_PkColumnValue() * @model dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ String getPkColumnValue(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.TableGenerator#getPkColumnValue <em>Pk Column Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlTableGenerator#getPkColumnValue <em>Pk Column Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Pk Column Value</em>' attribute. @@ -193,7 +193,7 @@ public interface TableGenerator extends Generator /** * Returns the value of the '<em><b>Unique Constraints</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.orm.UniqueConstraint}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.orm.UniqueConstraint}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Unique Constraints</em>' containment reference list isn't clear, @@ -201,7 +201,7 @@ public interface TableGenerator extends Generator * </p> * <!-- end-user-doc --> * @return the value of the '<em>Unique Constraints</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTableGenerator_UniqueConstraints() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTableGenerator_UniqueConstraints() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Transient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransient.java index 73fd7e8cac..975d328687 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Transient.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlTransient.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -16,10 +16,10 @@ package org.eclipse.jpt.core.internal.resource.orm; * <!-- end-user-doc --> * * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getTransient() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getTransient() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Transient extends AttributeMapping +public interface XmlTransient extends XmlAttributeMapping { } // Transient diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Version.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersion.java index 4c7a8988fc..3e41862f66 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/orm/Version.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlVersion.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.orm; +package org.eclipse.jpt.core.resource.orm; /** @@ -18,19 +18,19 @@ package org.eclipse.jpt.core.internal.resource.orm; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.orm.Version#getTemporal <em>Temporal</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersion() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersion() * @model kind="class" interface="true" abstract="true" * @generated */ -public interface Version extends AttributeMapping, ColumnMapping +public interface XmlVersion extends XmlAttributeMapping, ColumnMapping { /** * Returns the value of the '<em><b>Temporal</b></em>' attribute. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.orm.TemporalType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.orm.TemporalType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Temporal</em>' attribute isn't clear, @@ -38,20 +38,20 @@ public interface Version extends AttributeMapping, ColumnMapping * </p> * <!-- end-user-doc --> * @return the value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #setTemporal(TemporalType) - * @see org.eclipse.jpt.core.internal.resource.orm.OrmPackage#getVersion_Temporal() + * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getVersion_Temporal() * @model * @generated */ TemporalType getTemporal(); /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.orm.Version#getTemporal <em>Temporal</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.XmlVersion#getTemporal <em>Temporal</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Temporal</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.orm.TemporalType + * @see org.eclipse.jpt.core.resource.orm.TemporalType * @see #getTemporal() * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceArtifactEdit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceArtifactEdit.java index 2ea1653fb5..fc56fb3941 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceArtifactEdit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceArtifactEdit.java @@ -8,14 +8,14 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import java.io.IOException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.emf.common.util.URI; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.resource.common.JpaArtifactEdit; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.resource.common.JpaArtifactEdit; public class PersistenceArtifactEdit extends JpaArtifactEdit { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java index 51bccc6bb4..85271f49b0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceFactory.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.util.Enumerator; import org.eclipse.emf.ecore.EClass; @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage * @generated */ public class PersistenceFactory extends EFactoryImpl diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistencePackage.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java index b221e37e32..cda22fe152 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistencePackage.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistencePackage.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.util.Enumerator; import org.eclipse.emf.ecore.EAttribute; @@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.jpt.core.internal.resource.orm.OrmPackage; +import org.eclipse.jpt.core.resource.orm.OrmPackage; /** * <!-- begin-user-doc --> @@ -34,7 +34,7 @@ import org.eclipse.jpt.core.internal.resource.orm.OrmPackage; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistenceFactory + * @see org.eclipse.jpt.core.resource.persistence.PersistenceFactory * @model kind="package" * @generated */ @@ -70,14 +70,14 @@ public class PersistencePackage extends EPackageImpl * <!-- end-user-doc --> * @generated */ - public static final PersistencePackage eINSTANCE = org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage.init(); + public static final PersistencePackage eINSTANCE = org.eclipse.jpt.core.resource.persistence.PersistencePackage.init(); /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistence() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence() * @generated */ public static final int XML_PERSISTENCE = 0; @@ -110,11 +110,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_PERSISTENCE_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit() * @generated */ public static final int XML_PERSISTENCE_UNIT = 1; @@ -228,11 +228,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_PERSISTENCE_UNIT_FEATURE_COUNT = 11; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlMappingFileRef() + * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef() * @generated */ public static final int XML_MAPPING_FILE_REF = 2; @@ -256,11 +256,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_MAPPING_FILE_REF_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlJavaClassRef() + * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef() * @generated */ public static final int XML_JAVA_CLASS_REF = 3; @@ -284,11 +284,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_JAVA_CLASS_REF_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties <em>Xml Properties</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperties - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperties() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperties + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties() * @generated */ public static final int XML_PROPERTIES = 4; @@ -312,11 +312,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_PROPERTIES_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty <em>Xml Property</em>}' class. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperty() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperty + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty() * @generated */ public static final int XML_PROPERTY = 5; @@ -349,11 +349,11 @@ public class PersistencePackage extends EPackageImpl public static final int XML_PROPERTY_FEATURE_COUNT = 2; /** - * The meta object id for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum. + * The meta object id for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() * @generated */ public static final int XML_PERSISTENCE_UNIT_TRANSACTION_TYPE = 6; @@ -363,7 +363,7 @@ public class PersistencePackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.common.util.Enumerator - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject() * @generated */ public static final int XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT = 7; @@ -373,7 +373,7 @@ public class PersistencePackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlVersion() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlVersion() * @generated */ public static final int XML_VERSION = 8; @@ -452,7 +452,7 @@ public class PersistencePackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#eNS_URI + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#eNS_URI * @see #init() * @generated */ @@ -522,11 +522,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Persistence</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence * @generated */ public EClass getXmlPersistence() @@ -536,11 +536,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Persistence Units</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getPersistenceUnits() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence#getPersistenceUnits() * @see #getXmlPersistence() * @generated */ @@ -551,11 +551,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getVersion <em>Version</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Version</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getVersion() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion() * @see #getXmlPersistence() * @generated */ @@ -566,11 +566,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Persistence Unit</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit * @generated */ public EClass getXmlPersistenceUnit() @@ -580,11 +580,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getDescription() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription() * @see #getXmlPersistenceUnit() * @generated */ @@ -595,11 +595,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Provider</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProvider() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider() * @see #getXmlPersistenceUnit() * @generated */ @@ -610,11 +610,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Jta Data Source</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJtaDataSource() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource() * @see #getXmlPersistenceUnit() * @generated */ @@ -625,11 +625,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Non Jta Data Source</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource() * @see #getXmlPersistenceUnit() * @generated */ @@ -640,11 +640,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Mapping Files</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getMappingFiles() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles() * @see #getXmlPersistenceUnit() * @generated */ @@ -655,11 +655,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}'. + * Returns the meta object for the attribute list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Jar Files</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJarFiles() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles() * @see #getXmlPersistenceUnit() * @generated */ @@ -670,11 +670,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Classes</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getClasses() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses() * @see #getXmlPersistenceUnit() * @generated */ @@ -685,11 +685,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Exclude Unlisted Classes</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses() * @see #getXmlPersistenceUnit() * @generated */ @@ -700,11 +700,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Properties</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProperties() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties() * @see #getXmlPersistenceUnit() * @generated */ @@ -715,11 +715,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getName() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName() * @see #getXmlPersistenceUnit() * @generated */ @@ -730,11 +730,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Transaction Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType() * @see #getXmlPersistenceUnit() * @generated */ @@ -745,11 +745,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Mapping File Ref</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef + * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef * @generated */ public EClass getXmlMappingFileRef() @@ -759,11 +759,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>File Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef#getFileName() + * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName() * @see #getXmlMappingFileRef() * @generated */ @@ -774,11 +774,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Java Class Ref</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef + * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef * @generated */ public EClass getXmlJavaClassRef() @@ -788,11 +788,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Java Class</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef#getJavaClass() + * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass() * @see #getXmlJavaClassRef() * @generated */ @@ -803,11 +803,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties <em>Xml Properties</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Properties</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperties + * @see org.eclipse.jpt.core.resource.persistence.XmlProperties * @generated */ public EClass getXmlProperties() @@ -817,11 +817,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties#getProperties <em>Properties</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Properties</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperties#getProperties() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperties#getProperties() * @see #getXmlProperties() * @generated */ @@ -832,11 +832,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for class '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty <em>Xml Property</em>}'. + * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Xml Property</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty + * @see org.eclipse.jpt.core.resource.persistence.XmlProperty * @generated */ public EClass getXmlProperty() @@ -846,11 +846,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getName() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperty#getName() * @see #getXmlProperty() * @generated */ @@ -861,11 +861,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getValue() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperty#getValue() * @see #getXmlProperty() * @generated */ @@ -876,11 +876,11 @@ public class PersistencePackage extends EPackageImpl /** - * Returns the meta object for enum '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>Xml Persistence Unit Transaction Type</em>'. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType * @generated */ public EEnum getXmlPersistenceUnitTransactionType() @@ -1082,11 +1082,11 @@ public class PersistencePackage extends EPackageImpl public interface Literals { /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence <em>Xml Persistence</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistence() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistence + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence() * @generated */ public static final EClass XML_PERSISTENCE = eINSTANCE.getXmlPersistence(); @@ -1108,11 +1108,11 @@ public class PersistencePackage extends EPackageImpl public static final EAttribute XML_PERSISTENCE__VERSION = eINSTANCE.getXmlPersistence_Version(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit <em>Xml Persistence Unit</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit() * @generated */ public static final EClass XML_PERSISTENCE_UNIT = eINSTANCE.getXmlPersistenceUnit(); @@ -1206,11 +1206,11 @@ public class PersistencePackage extends EPackageImpl public static final EAttribute XML_PERSISTENCE_UNIT__TRANSACTION_TYPE = eINSTANCE.getXmlPersistenceUnit_TransactionType(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef <em>Xml Mapping File Ref</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlMappingFileRef() + * @see org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef() * @generated */ public static final EClass XML_MAPPING_FILE_REF = eINSTANCE.getXmlMappingFileRef(); @@ -1224,11 +1224,11 @@ public class PersistencePackage extends EPackageImpl public static final EAttribute XML_MAPPING_FILE_REF__FILE_NAME = eINSTANCE.getXmlMappingFileRef_FileName(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef <em>Xml Java Class Ref</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlJavaClassRef() + * @see org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef() * @generated */ public static final EClass XML_JAVA_CLASS_REF = eINSTANCE.getXmlJavaClassRef(); @@ -1242,11 +1242,11 @@ public class PersistencePackage extends EPackageImpl public static final EAttribute XML_JAVA_CLASS_REF__JAVA_CLASS = eINSTANCE.getXmlJavaClassRef_JavaClass(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties <em>Xml Properties</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperties <em>Xml Properties</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperties - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperties() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperties + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties() * @generated */ public static final EClass XML_PROPERTIES = eINSTANCE.getXmlProperties(); @@ -1260,11 +1260,11 @@ public class PersistencePackage extends EPackageImpl public static final EReference XML_PROPERTIES__PROPERTIES = eINSTANCE.getXmlProperties_Properties(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty <em>Xml Property</em>}' class. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty <em>Xml Property</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlProperty - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperty() + * @see org.eclipse.jpt.core.resource.persistence.XmlProperty + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty() * @generated */ public static final EClass XML_PROPERTY = eINSTANCE.getXmlProperty(); @@ -1286,11 +1286,11 @@ public class PersistencePackage extends EPackageImpl public static final EAttribute XML_PROPERTY__VALUE = eINSTANCE.getXmlProperty_Value(); /** - * The meta object literal for the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType <em>Xml Persistence Unit Transaction Type</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() * @generated */ public static final EEnum XML_PERSISTENCE_UNIT_TRANSACTION_TYPE = eINSTANCE.getXmlPersistenceUnitTransactionType(); @@ -1300,7 +1300,7 @@ public class PersistencePackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.common.util.Enumerator - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionTypeObject() * @generated */ public static final EDataType XML_PERSISTENCE_UNIT_TRANSACTION_TYPE_OBJECT = eINSTANCE.getXmlPersistenceUnitTransactionTypeObject(); @@ -1310,7 +1310,7 @@ public class PersistencePackage extends EPackageImpl * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see java.lang.String - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlVersion() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlVersion() * @generated */ public static final EDataType XML_VERSION = eINSTANCE.getXmlVersion(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResource.java index a44faa9c07..55476346f0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResource.java @@ -7,12 +7,12 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.util.URI; import org.eclipse.jdt.core.ElementChangedEvent; -import org.eclipse.jpt.core.internal.resource.common.JpaXmlResource; import org.eclipse.jpt.core.internal.resource.persistence.translators.PersistenceTranslator; +import org.eclipse.jpt.core.resource.common.JpaXmlResource; import org.eclipse.wst.common.internal.emf.resource.Renderer; import org.eclipse.wst.common.internal.emf.resource.Translator; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceFactory.java index 39e6698a09..3407157fc9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceFactory.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.util.URI; import org.eclipse.wst.common.internal.emf.resource.Renderer; diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java index a9d6a86614..3c007efd9f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/PersistenceResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java @@ -8,12 +8,12 @@ * Contributors: * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.resource.common.JpaXmlResourceModel; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.resource.common.JpaXmlResourceModel; public class PersistenceResourceModel extends JpaXmlResourceModel { @@ -23,10 +23,10 @@ public class PersistenceResourceModel extends JpaXmlResourceModel /** - * @see IResourceModel#getResourceType() + * @see ResourceModel#getResourceType() */ public String getResourceType() { - return IResourceModel.PERSISTENCE_RESOURCE_TYPE; + return ResourceModel.PERSISTENCE_RESOURCE_TYPE; } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlJavaClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJavaClassRef.java index a75c4cd91a..36fa1bab3b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlJavaClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlJavaClassRef.java @@ -9,13 +9,13 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,16 +25,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlJavaClassRef() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlJavaClassRef extends JpaEObject implements IJpaEObject +public class XmlJavaClassRef extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute. @@ -87,7 +87,7 @@ public class XmlJavaClassRef extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Java Class</em>' attribute. * @see #setJavaClass(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlJavaClassRef_JavaClass() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlJavaClassRef_JavaClass() * @model unique="false" ordered="false" * @generated */ @@ -97,7 +97,7 @@ public class XmlJavaClassRef extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef#getJavaClass <em>Java Class</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Class</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlMappingFileRef.java index d72b15ff16..83abef4cb4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlMappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlMappingFileRef.java @@ -9,13 +9,13 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -25,16 +25,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlMappingFileRef() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlMappingFileRef extends JpaEObject implements IJpaEObject +public class XmlMappingFileRef extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute. @@ -88,7 +88,7 @@ public class XmlMappingFileRef extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>File Name</em>' attribute. * @see #setFileName(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlMappingFileRef_FileName() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlMappingFileRef_FileName() * @model default="" unique="false" ordered="false" * @generated */ @@ -98,7 +98,7 @@ public class XmlMappingFileRef extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef#getFileName <em>File Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>File Name</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistence.java index 2267dcb3bc..e3b5dddc35 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistence.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistence.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -20,8 +20,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -31,17 +31,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getVersion <em>Version</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getPersistenceUnits <em>Persistence Units</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistence() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlPersistence extends JpaEObject implements IJpaEObject +public class XmlPersistence extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getPersistenceUnits() <em>Persistence Units</em>}' containment reference list. @@ -104,7 +104,7 @@ public class XmlPersistence extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Version</em>' attribute. * @see #setVersion(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistence_Version() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence_Version() * @model unique="false" dataType="org.eclipse.jpt.core.internal.resource.persistence.XmlVersion" required="true" * @generated */ @@ -114,7 +114,7 @@ public class XmlPersistence extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistence#getVersion <em>Version</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistence#getVersion <em>Version</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Version</em>' attribute. @@ -131,7 +131,7 @@ public class XmlPersistence extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Persistence Units</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>XmlPersistence Units</em>' containment reference list isn't clear, @@ -139,7 +139,7 @@ public class XmlPersistence extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Persistence Units</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistence_PersistenceUnits() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistence_PersistenceUnits() * @model containment="true" * @generated */ @@ -267,7 +267,7 @@ public class XmlPersistence extends JpaEObject implements IJpaEObject } @Override - public IJpaEObject root() { + public JpaEObject root() { return this; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnit.java index b7c1b871d2..e04daf4ed1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnit.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import java.util.Collection; import org.eclipse.emf.common.notify.Notification; @@ -21,8 +21,8 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EDataTypeEList; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -32,26 +32,26 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getMappingFiles <em>Mapping Files</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJarFiles <em>Jar Files</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getClasses <em>Classes</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject +public class XmlPersistenceUnit extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getDescription() <em>Description</em>}' attribute. @@ -278,7 +278,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Name() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Name() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -288,7 +288,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -306,7 +306,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Transaction Type</b></em>' attribute. * The default value is <code>"JTA"</code>. - * The literals are from the enumeration {@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType}. + * The literals are from the enumeration {@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Transaction Type</em>' attribute isn't clear, @@ -314,11 +314,11 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Transaction Type</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType * @see #isSetTransactionType() * @see #unsetTransactionType() * @see #setTransactionType(XmlPersistenceUnitTransactionType) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_TransactionType() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_TransactionType() * @model default="JTA" unique="false" unsettable="true" * @generated */ @@ -328,11 +328,11 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Transaction Type</em>' attribute. - * @see org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnitTransactionType + * @see org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransactionType * @see #isSetTransactionType() * @see #unsetTransactionType() * @see #getTransactionType() @@ -349,7 +349,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Unsets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute. + * Unsets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #isSetTransactionType() @@ -368,7 +368,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Returns whether the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute is set. + * Returns whether the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getTransactionType <em>Transaction Type</em>}' attribute is set. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return whether the value of the '<em>Transaction Type</em>' attribute is set. @@ -392,7 +392,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Description() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Description() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -402,7 +402,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getDescription <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Description</em>' attribute. @@ -427,7 +427,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Provider</em>' attribute. * @see #setProvider(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Provider() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Provider() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -437,7 +437,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProvider <em>Provider</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Provider</em>' attribute. @@ -462,7 +462,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Jta Data Source</em>' attribute. * @see #setJtaDataSource(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JtaDataSource() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JtaDataSource() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -472,7 +472,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getJtaDataSource <em>Jta Data Source</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Jta Data Source</em>' attribute. @@ -497,7 +497,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Non Jta Data Source</em>' attribute. * @see #setNonJtaDataSource(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_NonJtaDataSource() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_NonJtaDataSource() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -507,7 +507,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getNonJtaDataSource <em>Non Jta Data Source</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Non Jta Data Source</em>' attribute. @@ -524,7 +524,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Mapping Files</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.persistence.XmlMappingFileRef}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Mapping Files</em>' containment reference list isn't clear, @@ -532,7 +532,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Mapping Files</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_MappingFiles() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_MappingFiles() * @model containment="true" * @generated */ @@ -555,7 +555,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Jar Files</em>' attribute list. - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JarFiles() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_JarFiles() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" * @generated */ @@ -570,7 +570,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Classes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.persistence.XmlJavaClassRef}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Classes</em>' containment reference list isn't clear, @@ -578,7 +578,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Classes</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Classes() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Classes() * @model containment="true" * @generated */ @@ -604,7 +604,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * @see #isSetExcludeUnlistedClasses() * @see #unsetExcludeUnlistedClasses() * @see #setExcludeUnlistedClasses(boolean) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_ExcludeUnlistedClasses() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_ExcludeUnlistedClasses() * @model default="false" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean" * @generated */ @@ -614,7 +614,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Exclude Unlisted Classes</em>' attribute. @@ -634,7 +634,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Unsets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute. + * Unsets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see #isSetExcludeUnlistedClasses() @@ -653,7 +653,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Returns whether the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute is set. + * Returns whether the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#isExcludeUnlistedClasses <em>Exclude Unlisted Classes</em>}' attribute is set. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return whether the value of the '<em>Exclude Unlisted Classes</em>' attribute is set. @@ -677,7 +677,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Properties</em>' containment reference. * @see #setProperties(XmlProperties) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Properties() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnit_Properties() * @model containment="true" * @generated */ @@ -704,7 +704,7 @@ public class XmlPersistenceUnit extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit#getProperties <em>Properties</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Properties</em>' containment reference. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistenceUnitTransactionType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnitTransactionType.java index 326632231d..d1c39a208f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlPersistenceUnitTransactionType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlPersistenceUnitTransactionType.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import java.util.Arrays; import java.util.Collections; @@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.Enumerator; * A representation of the literals of the enumeration '<em><b>Unit Transaction Type</b></em>', * and utility methods for working with them. * <!-- end-user-doc --> - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlPersistenceUnitTransactionType() * @model * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlProperties.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperties.java index 670f910dd4..a430fa33e6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlProperties.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperties.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import java.util.Collection; import org.eclipse.emf.common.notify.NotificationChain; @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -29,16 +29,16 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperties#getProperties <em>Properties</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlProperties#getProperties <em>Properties</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperties() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlProperties extends JpaEObject implements IJpaEObject +public class XmlProperties extends AbstractJpaEObject implements JpaEObject { /** * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list. @@ -73,7 +73,7 @@ public class XmlProperties extends JpaEObject implements IJpaEObject /** * Returns the value of the '<em><b>Properties</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty}. + * The list contents are of type {@link org.eclipse.jpt.core.resource.persistence.XmlProperty}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>XmlProperties</em>' containment reference list isn't clear, @@ -81,7 +81,7 @@ public class XmlProperties extends JpaEObject implements IJpaEObject * </p> * <!-- end-user-doc --> * @return the value of the '<em>Properties</em>' containment reference list. - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperties_Properties() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperties_Properties() * @model containment="true" * @generated */ diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperty.java index bdbef8069c..011034190c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/persistence/XmlProperty.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/XmlProperty.java @@ -8,13 +8,13 @@ * Oracle - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.core.internal.resource.persistence; +package org.eclipse.jpt.core.resource.persistence; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jpt.core.internal.resource.common.IJpaEObject; -import org.eclipse.jpt.core.internal.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.JpaEObject; +import org.eclipse.jpt.core.resource.common.AbstractJpaEObject; /** * <!-- begin-user-doc --> @@ -24,17 +24,17 @@ import org.eclipse.jpt.core.internal.resource.common.JpaEObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getName <em>Name</em>}</li> - * <li>{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getName <em>Name</em>}</li> + * <li>{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getValue <em>Value</em>}</li> * </ul> * </p> * - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperty() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty() * @model kind="class" * @extends IJpaEObject * @generated */ -public class XmlProperty extends JpaEObject implements IJpaEObject +public class XmlProperty extends AbstractJpaEObject implements JpaEObject { /** * The default value of the '{@link #getName() <em>Name</em>}' attribute. @@ -107,7 +107,7 @@ public class XmlProperty extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Name</em>' attribute. * @see #setName(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperty_Name() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty_Name() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -117,7 +117,7 @@ public class XmlProperty extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. @@ -142,7 +142,7 @@ public class XmlProperty extends JpaEObject implements IJpaEObject * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' attribute. * @see #setValue(String) - * @see org.eclipse.jpt.core.internal.resource.persistence.PersistencePackage#getXmlProperty_Value() + * @see org.eclipse.jpt.core.resource.persistence.PersistencePackage#getXmlProperty_Value() * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String" required="true" * @generated */ @@ -152,7 +152,7 @@ public class XmlProperty extends JpaEObject implements IJpaEObject } /** - * Sets the value of the '{@link org.eclipse.jpt.core.internal.resource.persistence.XmlProperty#getValue <em>Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jpt.core.resource.persistence.XmlProperty#getValue <em>Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value</em>' attribute. diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java index 6e38a8d2b9..cebd829fe4 100644 --- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal/EntityGenerator.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jdt.core.IJavaModelStatusConstants; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jpt.core.internal.resource.java.JPA; +import org.eclipse.jpt.core.resource.java.JPA; import org.eclipse.jpt.db.internal.Column; import org.eclipse.jpt.db.internal.ForeignKey; import org.eclipse.jpt.db.internal.Table; diff --git a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF index b378b04895..66d17318bc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.ui;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.jpt.ui.internal.JptUiPlugin +Bundle-Activator: org.eclipse.jpt.ui.JptUiPlugin Bundle-ClassPath: . Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, @@ -33,18 +33,21 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.wst.web.ui, org.eclipse.ui.navigator Eclipse-LazyStart: true -Export-Package: org.eclipse.jpt.ui.internal;x-internal:=true, +Export-Package: org.eclipse.jpt.ui, + org.eclipse.jpt.ui.details, + org.eclipse.jpt.ui.internal;x-internal:=true, org.eclipse.jpt.ui.internal.actions;x-internal:=true, org.eclipse.jpt.ui.internal.details;x-internal:=true, org.eclipse.jpt.ui.internal.dialogs;x-internal:=true, org.eclipse.jpt.ui.internal.java.details;x-internal:=true, - org.eclipse.jpt.ui.internal.java.mappings.properties;x-internal:=true, org.eclipse.jpt.ui.internal.jface;x-internal:=true, org.eclipse.jpt.ui.internal.listeners;x-internal:=true, org.eclipse.jpt.ui.internal.mappings;x-internal:=true, org.eclipse.jpt.ui.internal.mappings.db;x-internal:=true, org.eclipse.jpt.ui.internal.mappings.details;x-internal:=true, org.eclipse.jpt.ui.internal.navigator;x-internal:=true, + org.eclipse.jpt.ui.internal.orm;x-internal:=true, + org.eclipse.jpt.ui.internal.orm.details;x-internal:=true, org.eclipse.jpt.ui.internal.perspective;x-internal:=true, org.eclipse.jpt.ui.internal.platform;x-internal:=true, org.eclipse.jpt.ui.internal.platform.base;x-internal:=true, @@ -59,6 +62,5 @@ Export-Package: org.eclipse.jpt.ui.internal;x-internal:=true, org.eclipse.jpt.ui.internal.views.structure;x-internal:=true, org.eclipse.jpt.ui.internal.widgets;x-internal:=true, org.eclipse.jpt.ui.internal.wizards;x-internal:=true, - org.eclipse.jpt.ui.internal.xml;x-internal:=true, - org.eclipse.jpt.ui.internal.xml.details;x-internal:=true + org.eclipse.jpt.ui.java.details Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml index f284c05cf9..76449c2cb6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml +++ b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml @@ -14,24 +14,24 @@ <factory adaptableType="org.eclipse.ui.IWorkbenchPart" class="org.eclipse.jpt.ui.internal.selection.SelectionParticipantFactory"> - <adapter type="org.eclipse.jpt.ui.internal.selection.IJpaSelectionParticipant"/> + <adapter type="org.eclipse.jpt.ui.internal.selection.JpaSelectionParticipant"/> </factory> <factory adaptableType="org.eclipse.ui.IEditorPart" class="org.eclipse.jpt.ui.internal.JpaFileAdapterFactory"> - <adapter type="org.eclipse.jpt.core.internal.IJpaFile"/> + <adapter type="org.eclipse.jpt.core.JpaFile"/> </factory> <factory - adaptableType="org.eclipse.jpt.core.internal.context.base.IPersistentAttribute" + adaptableType="org.eclipse.jpt.core.context.PersistentAttribute" class="org.eclipse.jpt.ui.internal.actions.PersistentAttributeActionFilter$Factory"> <adapter type="org.eclipse.ui.IActionFilter"/> </factory> <factory - adaptableType="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute" + adaptableType="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute" class="org.eclipse.jpt.ui.internal.actions.XmlPersistentAttributeActionFilter$Factory"> <adapter type="org.eclipse.ui.IActionFilter"/> @@ -194,7 +194,7 @@ <objectContribution id="org.eclipse.jpt.ui.entityMappingsActions" - objectClass="org.eclipse.jpt.core.internal.context.orm.EntityMappings"> + objectClass="org.eclipse.jpt.core.context.orm.EntityMappings"> <action id="org.eclipse.jpt.ui.addPersistentClass" class="org.eclipse.jpt.ui.internal.actions.AddPersistentClassAction" @@ -204,7 +204,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentTypeActions" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentType"> + objectClass="org.eclipse.jpt.core.context.orm.OrmPersistentType"> <action id="org.eclipse.jpt.ui.removePersistentClass" class="org.eclipse.jpt.ui.internal.actions.RemovePersistentClassAction" @@ -213,7 +213,7 @@ </objectContribution>
<objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions1" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.addPersistentAttributeToXml" @@ -235,7 +235,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions2" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.addPersistentAttributeToXmlAndMap" @@ -258,7 +258,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions3" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.removePersistentAttributeFromXml" diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_xml.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_orm.properties index 2632bc3949..e9f0f962e7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_xml.properties +++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_orm.properties @@ -17,31 +17,25 @@ PersistenceUnitMetadataSection_CatalogDefault=Default PersistentAttributePage_javaAttributeLabel=Java Attribute: -XmlEntityMappingsDetailsPage_package=Package: - -XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox=XML Mapping Metadata Complete -XMLEntityMappingsPage_CascadePersistCheckBox=Cascade Persist -XMLEntityMappingsPage_PersistenceUnitSection=Persistence Unit -XMLEntityMappingsPage_SchemaDefault=Default ({0}) -XMLEntityMappingsPage_SchemaNoDefaultSpecified=Default -XMLEntityMappingsPage_CatalogDefault=Default ({0}) -XMLEntityMappingsPage_CatalogNoDefaultSpecified=Default - -XmlSchemaChooser_SchemaChooser=Schema: -XmlCatalogChooser_CatalogChooser=Catalog: - -XmlJavaClassChooser_browse=Browse... -XmlJavaClassChooser_XmlJavaClassDialog_title=Class Selection -XmlJavaClassChooser_XmlJavaClassDialog_message=Choose a type: - -XmlPackageChooser_PackageDialog_title=Package Selection -XmlPackageChooser_PackageDialog_message=Choose a folder: - +EntityMappingsDetailsPage_package=Package: +EntityMappingsPage_XmlMappingMetadataCompleteCheckBox=XML Mapping Metadata Complete +EntityMappingsPage_CascadePersistCheckBox=Cascade Persist +EntityMappingsPage_PersistenceUnitSection=Persistence Unit +EntityMappingsPage_SchemaDefault=Default ({0}) +EntityMappingsPage_SchemaNoDefaultSpecified=Default +EntityMappingsPage_CatalogDefault=Default ({0}) +EntityMappingsPage_CatalogNoDefaultSpecified=Default +OrmSchemaChooser_SchemaChooser=Schema: +OrmCatalogChooser_CatalogChooser=Catalog: +OrmJavaClassChooser_browse=Browse... +OrmJavaClassChooser_XmlJavaClassDialog_title=Class Selection +OrmJavaClassChooser_XmlJavaClassDialog_message=Choose a type: +OrmPackageChooser_PackageDialog_title=Package Selection +OrmPackageChooser_PackageDialog_message=Choose a folder: AccessTypeComposite_field=Field AccessTypeComposite_property=Property -XmlEntityMappingsDetailsPage_field=Field -XmlEntityMappingsDetailsPage_property=Property - +EntityMappingsDetailsPage_field=Field +EntityMappingsDetailsPage_property=Property PersistenceUnitMetadataComposite_field=Field PersistenceUnitMetadataComposite_property=Property diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaPlatformUi.java index c572c5cb77..39329e90ab 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaPlatformUi.java @@ -7,22 +7,22 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal; +package org.eclipse.jpt.ui; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.ui.navigator.ICommonContentProvider; import org.eclipse.ui.navigator.ICommonLabelProvider; /** * This interface is to be implemented by a JPA vendor to provide extensions to * JPA UI functionality. This is intended to work in conjunction with a core - * JPA platform ({@link IJpaPlatform}) implementation with the same ID. + * JPA platform ({@link JpaPlatform}) implementation with the same ID. * <p> * Any implementation should be <i>stateless</i> in nature. * <p> @@ -31,7 +31,7 @@ import org.eclipse.ui.navigator.ICommonLabelProvider; * * @see the org.eclipse.jpt.ui.jpaPlatform extension point */ -public interface IJpaPlatformUi +public interface JpaPlatformUi { /** * Return a *new* navigator content provider. There will be (at most) one @@ -49,11 +49,11 @@ public interface IJpaPlatformUi * Return a *new* structure provider for the given JPA file */ // TODO - binary java type support - IJpaStructureProvider buildStructureProvider(IJpaFile jpaFile); + JpaStructureProvider buildStructureProvider(JpaFile jpaFile); - IJpaDetailsProvider detailsProvider(IJpaStructureNode contextNode); + JpaDetailsProvider detailsProvider(JpaStructureNode contextNode); - void generateDDL(IJpaProject project, IStructuredSelection selection); + void generateDDL(JpaProject project, IStructuredSelection selection); - void generateEntities(IJpaProject project, IStructuredSelection selection); + void generateEntities(JpaProject project, IStructuredSelection selection); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java new file mode 100644 index 0000000000..15c0ba385e --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2007 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; + +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.internal.BaseJpaUiFactory; +import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; + +/** + * Use {@link JpaFactory} to create any {@link JavaTypeMapping} or {@link JavaAttributeMapping}s. This is necessary + * so that platforms can extend the java model with their own annotations. + * {@link JavaTypeMappingProvider} and {@link JavaAttributeMappingProvider} use this factory. + * See {@link JpaPlatform#javaTypeMappingProviders()} and {@link JpaPlatform#javaAttributeMappingProviders() + * for creating new mappings types. + * @see BaseJpaUiFactory + */ +public interface JpaUiFactory +{ + JpaComposite<BasicMapping> createBasicMappingComposite(PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<Embeddable> createEmbeddableComposite(PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<EmbeddedIdMapping> createEmbeddedIdMappingComposite(PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<EmbeddedMapping> createEmbeddedMappingComposite(PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<Entity> createEntityComposite(PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<IdMapping> createIdMappingComposite(PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<ManyToManyMapping> createManyToManyMappingComposite(PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<ManyToOneMapping> createManyToOneMappingComposite(PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<MappedSuperclass> createMappedSuperclassComposite(PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<OneToManyMapping> createOneToManyMappingComposite(PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<OneToOneMapping> createOneToOneMappingComposite(PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<TransientMapping> createTransientMappingComposite(PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<VersionMapping> createVersionMappingComposite(PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiPlugin.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java index 693b62143c..b5a87f6106 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiPlugin.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java @@ -6,12 +6,12 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal; +package org.eclipse.jpt.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.core.internal.IJpaPlatform; +import org.eclipse.jpt.core.JpaPlatform; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -81,7 +81,7 @@ public class JptUiPlugin extends AbstractUIPlugin /** * Return the JPA platform UI corresponding to the given JPA platform */ - public IJpaPlatformUi jpaPlatformUi(IJpaPlatform jpaPlatform) { + public JpaPlatformUi jpaPlatformUi(JpaPlatform jpaPlatform) { return JpaPlatformUiRegistry.instance().jpaPlatform(jpaPlatform.getId()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaComposite.java index 80eb8d52fd..e9673d9cf0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaComposite.java @@ -6,15 +6,16 @@ * * Contributors: Oracle. - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Link; /** - * A <code>IJpaComposite</code> defines the common behavior of the JPA related + * A {@link Link JpaComposite} defines the common behavior of the JPA related * widgets. */ -public interface IJpaComposite<T> { +public interface JpaComposite<T> { /** * Notifies this composite it should populates its widgets using the given diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsPage.java index 3a40d65399..bf53fc8d97 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsPage.java @@ -6,21 +6,21 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.swt.widgets.Control; /** * A details page is used to show the propery pane for a given context node. The - * <code>IJpaDetailsProvider</code> is responsible for creating the pane. + * {@link JpaDetailsProvider} is responsible for creating the pane. * - * @see IJpaDetailsProvider + * @see JpaDetailsProvider * * @version 2.0 * @since 2.0 */ -public interface IJpaDetailsPage<T extends IJpaStructureNode> +public interface JpaDetailsPage<T extends JpaStructureNode> { /** * Returns this details' page's widget. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsProvider.java index 946843a786..93cf1e1b74 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsProvider.java @@ -6,22 +6,22 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** - * This provider is responsible to create the <code>IJpaDetailsPage</code> + * This provider is responsible to create the {@link JpaDetailsPage} * responsible to show the information for a given content node id. * - * @see IJpaDetailsPage + * @see JpaDetailsPage * * @version 2.0 * @since 2.0 */ -public interface IJpaDetailsProvider +public interface JpaDetailsProvider { /** * Creates a new details page based on the given content node id. @@ -31,7 +31,7 @@ public interface IJpaDetailsProvider * page to create * @param widgetFactory The factory used to create various widgets */ - IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( + JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( Composite parent, Object contentNodeId, TabbedPropertySheetWidgetFactory widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java index 94cdd29f33..a5dc62e3d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java @@ -9,20 +9,21 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.details.BasicMappingComposite; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddableComposite; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddedIdMappingComposite; @@ -44,18 +45,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the UI factory required to show the information * related to a JPA mapping (type or attribute). * - * @see IJpaUiFactory + * @see JpaUiFactory * * @version 2.0 * @since 1.0 */ -public abstract class BaseJpaUiFactory implements IJpaUiFactory +public abstract class BaseJpaUiFactory implements JpaUiFactory { /* * (non-Javadoc) */ - public IJpaComposite<IBasicMapping> createBasicMappingComposite( - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> createBasicMappingComposite( + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -65,8 +66,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddable> createEmbeddableComposite( - PropertyValueModel<IEmbeddable> subjectHolder, + public JpaComposite<Embeddable> createEmbeddableComposite( + PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -76,8 +77,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddedIdMapping> createEmbeddedIdMappingComposite( - PropertyValueModel<IEmbeddedIdMapping> subjectHolder, + public JpaComposite<EmbeddedIdMapping> createEmbeddedIdMappingComposite( + PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -87,8 +88,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddedMapping> createEmbeddedMappingComposite( - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> createEmbeddedMappingComposite( + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -98,8 +99,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEntity> createEntityComposite( - PropertyValueModel<IEntity> subjectHolder, + public JpaComposite<Entity> createEntityComposite( + PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -109,8 +110,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IIdMapping> createIdMappingComposite( - PropertyValueModel<IIdMapping> subjectHolder, + public JpaComposite<IdMapping> createIdMappingComposite( + PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -120,8 +121,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IManyToManyMapping> createManyToManyMappingComposite( - PropertyValueModel<IManyToManyMapping> subjectHolder, + public JpaComposite<ManyToManyMapping> createManyToManyMappingComposite( + PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -131,8 +132,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IManyToOneMapping> createManyToOneMappingComposite( - PropertyValueModel<IManyToOneMapping> subjectHolder, + public JpaComposite<ManyToOneMapping> createManyToOneMappingComposite( + PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -142,8 +143,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IMappedSuperclass> createMappedSuperclassComposite( - PropertyValueModel<IMappedSuperclass> subjectHolder, + public JpaComposite<MappedSuperclass> createMappedSuperclassComposite( + PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -153,8 +154,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IOneToManyMapping> createOneToManyMappingComposite( - PropertyValueModel<IOneToManyMapping> subjectHolder, + public JpaComposite<OneToManyMapping> createOneToManyMappingComposite( + PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -164,8 +165,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IOneToOneMapping> createOneToOneMappingComposite( - PropertyValueModel<IOneToOneMapping> subjectHolder, + public JpaComposite<OneToOneMapping> createOneToOneMappingComposite( + PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -175,8 +176,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<ITransientMapping> createTransientMappingComposite( - PropertyValueModel<ITransientMapping> subjectHolder, + public JpaComposite<TransientMapping> createTransientMappingComposite( + PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -186,8 +187,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IVersionMapping> createVersionMappingComposite( - PropertyValueModel<IVersionMapping> subjectHolder, + public JpaComposite<VersionMapping> createVersionMappingComposite( + PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java index 734d484241..90c412f05f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java @@ -9,11 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; +import org.eclipse.jpt.ui.JpaUiFactory; + /** * The default implementation of the UI factory required to show the information * related to a JPA mapping (type or attribute). * - * @see IJpaUiFactory + * @see JpaUiFactory * * @version 1.0 * @since 1.0 diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java deleted file mode 100644 index 5f1cdeab22..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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; - -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; - -/** - * Use IJpaFactory to create any IJavaTypeMapping or IJavaAttributeMappings. This is necessary - * so that platforms can extend the java model with their own annotations. - * IJavaTypeMappingProvider and IJavaAttributeMappingProvider use this factory. - * See IJpaPlatform.javaTypeMappingProviders() and IJpaPlatform.javaAttributeMappingProviders() - * for creating new mappings types. - * @see BaseJpaUiFactory - */ -public interface IJpaUiFactory -{ - IJpaComposite<IBasicMapping> createBasicMappingComposite(PropertyValueModel<IBasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddable> createEmbeddableComposite(PropertyValueModel<IEmbeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddedIdMapping> createEmbeddedIdMappingComposite(PropertyValueModel<IEmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddedMapping> createEmbeddedMappingComposite(PropertyValueModel<IEmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEntity> createEntityComposite(PropertyValueModel<IEntity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IIdMapping> createIdMappingComposite(PropertyValueModel<IIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IManyToManyMapping> createManyToManyMappingComposite(PropertyValueModel<IManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IManyToOneMapping> createManyToOneMappingComposite(PropertyValueModel<IManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IMappedSuperclass> createMappedSuperclassComposite(PropertyValueModel<IMappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IOneToManyMapping> createOneToManyMappingComposite(PropertyValueModel<IOneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IOneToOneMapping> createOneToOneMappingComposite(PropertyValueModel<IOneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<ITransientMapping> createTransientMappingComposite(PropertyValueModel<ITransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IVersionMapping> createVersionMappingComposite(PropertyValueModel<IVersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java index 5b45d39a7b..898c07597f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; @@ -24,7 +24,7 @@ public class JpaFileAdapterFactory { @SuppressWarnings("unchecked") private static final Class[] ADAPTER_LIST = - new Class[] { IJpaFile.class }; + new Class[] { JpaFile.class }; @SuppressWarnings("unchecked") public Class[] getAdapterList() { @@ -44,7 +44,7 @@ public class JpaFileAdapterFactory } IFile file = ((IFileEditorInput) editorInput).getFile(); - IJpaProject jpaProject = JptCorePlugin.jpaProject(file.getProject()); + JpaProject jpaProject = JptCorePlugin.jpaProject(file.getProject()); if (jpaProject == null) { return null; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaHelpContextIds.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java index c7fe124c76..d41f835b44 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaHelpContextIds.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java @@ -9,6 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; +import org.eclipse.jpt.ui.JptUiPlugin; + /** * Help context ids for the Dali JPA UI. @@ -18,7 +20,7 @@ package org.eclipse.jpt.ui.internal; * </p> * */ -public interface IJpaHelpContextIds { +public interface JpaHelpContextIds { //ContextID prefix diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java index 2e546bf059..53e1918ebe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java @@ -24,9 +24,9 @@ import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer; import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.java.JavaPersistentType; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; import org.eclipse.jpt.utility.internal.Filter; @@ -67,7 +67,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa return Collections.emptyList(); } - IJpaFile jpaFile = JptCorePlugin.jpaFile((IFile) cu.getCorrespondingResource()); + JpaFile jpaFile = JptCorePlugin.jpaFile((IFile) cu.getCorrespondingResource()); if (jpaFile == null) { return Collections.emptyList(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java index 8145695deb..4ad40adb32 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java @@ -10,59 +10,60 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal; -import org.eclipse.jpt.core.internal.IMappingKeys; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.swt.graphics.Image; public class JpaMappingImageHelper { public static Image imageForTypeMapping(String mappingKey) { - if (IMappingKeys.NULL_TYPE_MAPPING_KEY == mappingKey) { + if (MappingKeys.NULL_TYPE_MAPPING_KEY == mappingKey) { return JptUiPlugin.getImage(JptUiIcons.NULL_TYPE_MAPPING); } - else if (IMappingKeys.ENTITY_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ENTITY_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ENTITY); } - else if (IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDABLE); } - else if (IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MAPPED_SUPERCLASS); } return null; } public static Image imageForAttributeMapping(String mappingKey) { - if (IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY == mappingKey) { + if (MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY == mappingKey) { return JptUiPlugin.getImage(JptUiIcons.NULL_ATTRIBUTE_MAPPING); } - else if (IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.BASIC); } - else if (IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ID); } - else if (IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.VERSION); } - else if (IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDED_ID); } - else if (IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDED); } - else if (IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ONE_TO_ONE); } - else if (IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ONE_TO_MANY); } - else if (IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MANY_TO_ONE); } - else if (IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MANY_TO_MANY); } - else if (IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.TRANSIENT); } return null; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java index 4589e13b95..3d138638e7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java @@ -9,6 +9,7 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.core.runtime.Platform; +import org.eclipse.jpt.ui.JptUiPlugin; /** * This tracing class manages to convert the string value into boolean values or diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java index 4a26ae0b84..f46b0dbf0a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.actions.ActionDelegate; public class AddPersistentAttributeToXmlAction extends ActionDelegate @@ -30,8 +30,8 @@ public class AddPersistentAttributeToXmlAction extends ActionDelegate @Override public void run(IAction action) { if (this.selection instanceof StructuredSelection) { - for (Iterator<XmlPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { - XmlPersistentAttribute xmlPersistentAttribute = i.next(); + for (Iterator<OrmPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { + OrmPersistentAttribute xmlPersistentAttribute = i.next(); xmlPersistentAttribute.setVirtual(false); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java index 2a7377678e..fdb8645c14 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.ui.internal.dialogs.AddPersistentAttributeToXmlAndMapDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IObjectActionDelegate; @@ -23,7 +23,7 @@ public class AddPersistentAttributeToXmlAndMapAction { private Shell shell; - private XmlPersistentAttribute unmappedXmlAttribute; + private OrmPersistentAttribute unmappedXmlAttribute; public AddPersistentAttributeToXmlAndMapAction() { @@ -39,7 +39,7 @@ public class AddPersistentAttributeToXmlAndMapAction } public void selectionChanged(IAction action, ISelection selection) { - unmappedXmlAttribute = (XmlPersistentAttribute) ((StructuredSelection) selection).getFirstElement(); + unmappedXmlAttribute = (OrmPersistentAttribute) ((StructuredSelection) selection).getFirstElement(); } public void setActivePart(IAction action, IWorkbenchPart targetPart) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java index 79328635fa..ad86bb7428 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java @@ -13,7 +13,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.EntityMappings; import org.eclipse.jpt.ui.internal.dialogs.AddPersistentClassDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IObjectActionDelegate; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java index 74143e1eb7..f291733d5b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.actions; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; /** * GenerateDDLAction @@ -20,7 +20,7 @@ public class GenerateDDLAction extends ProjectAction { super(); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { this.jpaPlatformUi(project).generateDDL(project, this.getCurrentSelection()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java index a6db0caea0..e1e10bb5b2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.actions; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; /** * GenerateEntitiesAction @@ -19,7 +19,7 @@ public class GenerateEntitiesAction extends ProjectAction { super(); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { this.jpaPlatformUi(project).generateEntities(project, this.getCurrentSelection()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java index 8a61c71abc..fa0329a444 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.ui.IActionFilter; public class PersistentAttributeActionFilter @@ -36,7 +36,7 @@ public class PersistentAttributeActionFilter return false; } - boolean mapped = ((IPersistentAttribute) target).mappingKey() != IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; + boolean mapped = ((PersistentAttribute) target).mappingKey() != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; return mapped == booleanValue; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java index 8189b0b7b4..d47d61e59b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java @@ -15,9 +15,9 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.ui.JpaPlatformUi; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; @@ -74,20 +74,20 @@ public abstract class ProjectAction implements IObjectActionDelegate { return null; } - protected IJpaPlatformUi jpaPlatformUi(IJpaProject project) { + protected JpaPlatformUi jpaPlatformUi(JpaProject project) { String coreJpaPlatformId = project.jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(coreJpaPlatformId); } protected void execute(IProject project) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject == null) { return; } this.execute(jpaProject); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { throw new UnsupportedOperationException(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java index 6a074289ad..a73484b57c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.actions.ActionDelegate; public class RemovePersistentAttributeFromXmlAction extends ActionDelegate @@ -29,8 +29,8 @@ public class RemovePersistentAttributeFromXmlAction extends ActionDelegate @Override public void run(IAction action) { if (this.selection instanceof StructuredSelection) { - for (Iterator<XmlPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { - XmlPersistentAttribute xmlPersistentAttribute = i.next(); + for (Iterator<OrmPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { + OrmPersistentAttribute xmlPersistentAttribute = i.next(); xmlPersistentAttribute.setVirtual(true); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java index 2ca72027cd..b8c1d7a5a3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java @@ -13,14 +13,14 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; public class RemovePersistentClassAction implements IObjectActionDelegate { - private XmlPersistentType persistentType; + private OrmPersistentType persistentType; public RemovePersistentClassAction() { @@ -28,11 +28,11 @@ public class RemovePersistentClassAction } public void run(IAction action) { - this.persistentType.entityMappings().removeXmlPersistentType(this.persistentType); + this.persistentType.entityMappings().removeOrmPersistentType(this.persistentType); } public void selectionChanged(IAction action, ISelection selection) { - this.persistentType = (XmlPersistentType) ((StructuredSelection) selection).getFirstElement(); + this.persistentType = (OrmPersistentType) ((StructuredSelection) selection).getFirstElement(); } public void setActivePart(IAction action, IWorkbenchPart targetPart) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java index 084bf44654..53f299994f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.IActionFilter; public class XmlPersistentAttributeActionFilter @@ -35,7 +35,7 @@ public class XmlPersistentAttributeActionFilter else { return false; } - return ((XmlPersistentAttribute) target).isVirtual() == booleanValue; + return ((OrmPersistentAttribute) target).isVirtual() == booleanValue; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/BaseJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java index 921f53717a..d849da9d8c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/BaseJpaDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java @@ -8,7 +8,8 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.details.JpaDetailsPage; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -18,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * The base class for the details view. * - * @see IJpaContextNode + * @see JpaContextNode * * @version 2.0 * @since 1.0 */ -public abstract class BaseJpaDetailsPage<T extends IJpaStructureNode> +public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode> extends AbstractFormPane<T> - implements IJpaDetailsPage<T> + implements JpaDetailsPage<T> { /** * Creates a new <code>BaseJpaDetailsPage</code>. @@ -33,7 +34,7 @@ public abstract class BaseJpaDetailsPage<T extends IJpaStructureNode> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - protected BaseJpaDetailsPage(Composite parent, + protected AbstractJpaDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(new SimplePropertyValueModel<T>(), parent, widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java index 915cadd851..986010a722 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java @@ -22,16 +22,17 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.model.value.FilteringPropertyValueModel; @@ -47,18 +48,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The abstract definition of the details page responsible to show the * information for an persistent attribute. * - * @see IPersistentAttribute + * @see PersistentAttribute * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttribute> extends BaseJpaDetailsPage<T> +public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribute> extends AbstractJpaDetailsPage<T> { - private IJpaComposite<IAttributeMapping> currentMappingComposite; + private JpaComposite<AttributeMapping> currentMappingComposite; private String currentMappingKey; private ComboViewer mappingCombo; - private Map<String, IJpaComposite<IAttributeMapping>> mappingComposites; + private Map<String, JpaComposite<AttributeMapping>> mappingComposites; private PageBook mappingPageBook; /** @@ -79,13 +80,13 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IPersistentAttribute.DEFAULT_MAPPING_PROPERTY); - propertyNames.add(IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY); + propertyNames.add(PersistentAttribute.DEFAULT_MAPPING_PROPERTY); + propertyNames.add(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY); } - protected IAttributeMappingUiProvider<? extends IAttributeMapping> attributeMappingUiProvider(String key) { - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> i = attributeMappingUiProviders(); i.hasNext(); ) { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = i.next(); + protected AttributeMappingUiProvider<? extends AttributeMapping> attributeMappingUiProvider(String key) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> i = attributeMappingUiProviders(); i.hasNext(); ) { + AttributeMappingUiProvider<? extends AttributeMapping> provider = i.next(); if (provider.attributeMappingKey() == key) { return provider; } @@ -93,11 +94,11 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib throw new IllegalArgumentException("Unsupported attribute mapping UI provider key: "); } - protected abstract ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> + protected abstract ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders(); - protected abstract IAttributeMappingUiProvider<? extends IAttributeMapping>[] - attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute); + protected abstract AttributeMappingUiProvider<? extends AttributeMapping>[] + attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute); private IContentProvider buildContentProvider() { return new IStructuredContentProvider() { @@ -109,7 +110,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib if (inputElement == null) { return new Object[0]; } - return attributeMappingUiProvidersFor((IPersistentAttribute) inputElement); + return attributeMappingUiProvidersFor((PersistentAttribute) inputElement); } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -118,14 +119,14 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib }; } - private PropertyAspectAdapter<IPersistentAttribute, IAttributeMapping> buildGenericMappingHolder() { - return new PropertyAspectAdapter<IPersistentAttribute, IAttributeMapping>( + private PropertyAspectAdapter<PersistentAttribute, AttributeMapping> buildGenericMappingHolder() { + return new PropertyAspectAdapter<PersistentAttribute, AttributeMapping>( getSubjectHolder(), - IPersistentAttribute.DEFAULT_MAPPING_PROPERTY, - IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY) + PersistentAttribute.DEFAULT_MAPPING_PROPERTY, + PersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { @Override - protected IAttributeMapping buildValue_() { + protected AttributeMapping buildValue_() { return subject.getMapping(); } }; @@ -135,7 +136,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return new LabelProvider() { @Override public String getText(Object element) { - return ((IAttributeMappingUiProvider<?>) element).label(); + return ((AttributeMappingUiProvider<?>) element).label(); } }; } @@ -158,10 +159,10 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib } @SuppressWarnings("unchecked") - protected IJpaComposite<IAttributeMapping> buildMappingComposite(PageBook pageBook, + protected JpaComposite<AttributeMapping> buildMappingComposite(PageBook pageBook, String key) { - IAttributeMappingUiProvider<IAttributeMapping> uiProvider = (IAttributeMappingUiProvider<IAttributeMapping>) mappingUIProvider(key); + AttributeMappingUiProvider<AttributeMapping> uiProvider = (AttributeMappingUiProvider<AttributeMapping>) mappingUIProvider(key); return uiProvider.buildAttributeMappingComposite( jpaUiFactory(), @@ -171,16 +172,16 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib ); } - private Filter<IAttributeMapping> buildMappingFilter(final String key) { - return new Filter<IAttributeMapping>() { - public boolean accept(IAttributeMapping value) { + private Filter<AttributeMapping> buildMappingFilter(final String key) { + return new Filter<AttributeMapping>() { + public boolean accept(AttributeMapping value) { return (value == null) || key.equals(value.getKey()); } }; } - private PropertyValueModel<IAttributeMapping> buildMappingHolder(final String key) { - return new FilteringPropertyValueModel<IAttributeMapping>( + private PropertyValueModel<AttributeMapping> buildMappingHolder(final String key) { + return new FilteringPropertyValueModel<AttributeMapping>( buildGenericMappingHolder(), buildMappingFilter(key) ); @@ -195,10 +196,10 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return this.mappingPageBook; } - protected abstract IAttributeMappingUiProvider<? extends IAttributeMapping> + protected abstract AttributeMappingUiProvider<? extends AttributeMapping> defaultAttributeMappingUiProvider(String key); - protected abstract ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> + protected abstract ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders(); /* @@ -241,15 +242,15 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib @Override protected void initialize() { super.initialize(); - this.mappingComposites = new HashMap<String, IJpaComposite<IAttributeMapping>>(); + this.mappingComposites = new HashMap<String, JpaComposite<AttributeMapping>>(); } - protected IJpaPlatformUi jpaPlatformUi() { + protected JpaPlatformUi jpaPlatformUi() { String platformId = subject().jpaProject().jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } - protected IJpaUiFactory jpaUiFactory() { + protected JpaUiFactory jpaUiFactory() { // TODO: Remove the type cast, used for testing return ((BaseJpaPlatformUi) jpaPlatformUi()).getJpaUiFactory(); } @@ -270,14 +271,14 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib private void mappingChanged(SelectionChangedEvent event) { if (event.getSelection() instanceof StructuredSelection) { - IAttributeMappingUiProvider<?> provider = (IAttributeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); + AttributeMappingUiProvider<?> provider = (AttributeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); String key = (CollectionTools.contains(defaultAttributeMappingUiProviders(), provider) ? null : provider.attributeMappingKey()); this.subject().setSpecifiedMappingKey(key); } } - private IJpaComposite<IAttributeMapping> mappingCompositeFor(String key) { - IJpaComposite<IAttributeMapping> composite = this.mappingComposites.get(key); + private JpaComposite<AttributeMapping> mappingCompositeFor(String key) { + JpaComposite<AttributeMapping> composite = this.mappingComposites.get(key); if (composite != null) { return composite; } @@ -291,7 +292,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return composite; } - private IAttributeMappingUiProvider<? extends IAttributeMapping> mappingUIProvider(String key) { + private AttributeMappingUiProvider<? extends AttributeMapping> mappingUIProvider(String key) { if (this.subject().getMapping() == null || this.subject().getMapping().isDefault()) { @@ -311,7 +312,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib this.mappingCombo.setSelection(new StructuredSelection(this.mappingCombo.getElementAt(0))); } else { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = attributeMappingUiProvider(this.subject().mappingKey()); + AttributeMappingUiProvider<? extends AttributeMapping> provider = attributeMappingUiProvider(this.subject().mappingKey()); if (provider != null && ! provider.equals(((StructuredSelection) this.mappingCombo.getSelection()).getFirstElement())) { this.mappingCombo.setSelection(new StructuredSelection(provider)); } @@ -403,8 +404,8 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IPersistentAttribute.DEFAULT_MAPPING_PROPERTY || - propertyName == IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { + if (propertyName == PersistentAttribute.DEFAULT_MAPPING_PROPERTY || + propertyName == PersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { populateMappingComboAndPage(); } @@ -425,7 +426,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib // } private void updateMappingPage() { - IAttributeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; + AttributeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; populateMappingPage(mapping == null ? null : mapping.getKey()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java index 76a41b3b7b..79fe8fa46c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java @@ -21,12 +21,13 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.model.value.FilteringPropertyValueModel; @@ -43,17 +44,17 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The abstract definition of the details page responsible to show the * information for an persistent type. * - * @see IPersistentType + * @see PersistentType * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public abstract class PersistentTypeDetailsPage<T extends IPersistentType> extends BaseJpaDetailsPage<T> +public abstract class PersistentTypeDetailsPage<T extends PersistentType> extends AbstractJpaDetailsPage<T> { - private IJpaComposite<ITypeMapping> currentMappingComposite; + private JpaComposite<TypeMapping> currentMappingComposite; private String currentMappingKey; - private Map<String, IJpaComposite<ITypeMapping>> mappingComposites; + private Map<String, JpaComposite<TypeMapping>> mappingComposites; private ComboViewer typeMappingCombo; private PageBook typeMappingPageBook; @@ -75,7 +76,7 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IPersistentType.MAPPING_PROPERTY); + propertyNames.add(PersistentType.MAPPING_PROPERTY); } private IContentProvider buildContentProvider() { @@ -97,10 +98,10 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten }; } - private PropertyAspectAdapter<IPersistentType, ITypeMapping> buildGenericMappingHolder() { - return new PropertyAspectAdapter<IPersistentType, ITypeMapping>(getSubjectHolder(), IPersistentType.MAPPING_PROPERTY) { + private PropertyAspectAdapter<PersistentType, TypeMapping> buildGenericMappingHolder() { + return new PropertyAspectAdapter<PersistentType, TypeMapping>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { @Override - protected ITypeMapping buildValue_() { + protected TypeMapping buildValue_() { return subject.getMapping(); } }; @@ -110,17 +111,17 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten return new LabelProvider() { @Override public String getText(Object element) { - return ((ITypeMappingUiProvider<?>) element).label(); + return ((TypeMappingUiProvider<?>) element).label(); } }; } @SuppressWarnings("unchecked") - protected IJpaComposite<ITypeMapping> buildMappingComposite(PageBook pageBook, + protected JpaComposite<TypeMapping> buildMappingComposite(PageBook pageBook, String key) { - ITypeMappingUiProvider<ITypeMapping> uiProvider = - (ITypeMappingUiProvider<ITypeMapping>) typeMappingUiProvider(key); + TypeMappingUiProvider<TypeMapping> uiProvider = + (TypeMappingUiProvider<TypeMapping>) typeMappingUiProvider(key); return uiProvider.buildPersistentTypeMappingComposite( buildMappingHolder(key), @@ -129,16 +130,16 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten ); } - private Filter<ITypeMapping> buildMappingFilter(final String key) { - return new Filter<ITypeMapping>() { - public boolean accept(ITypeMapping value) { + private Filter<TypeMapping> buildMappingFilter(final String key) { + return new Filter<TypeMapping>() { + public boolean accept(TypeMapping value) { return (value == null) || key.equals(value.getKey()); } }; } - private PropertyValueModel<ITypeMapping> buildMappingHolder(String key) { - return new FilteringPropertyValueModel<ITypeMapping>( + private PropertyValueModel<TypeMapping> buildMappingHolder(String key) { + return new FilteringPropertyValueModel<TypeMapping>( buildGenericMappingHolder(), buildMappingFilter(key) ); @@ -198,11 +199,11 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten @Override protected void initialize() { super.initialize(); - this.mappingComposites = new HashMap<String, IJpaComposite<ITypeMapping>>(); + this.mappingComposites = new HashMap<String, JpaComposite<TypeMapping>>(); } - private IJpaComposite<ITypeMapping> mappingCompositeFor(String key) { - IJpaComposite<ITypeMapping> mappingComposite = this.mappingComposites.get(key); + private JpaComposite<TypeMapping> mappingCompositeFor(String key) { + JpaComposite<TypeMapping> mappingComposite = this.mappingComposites.get(key); if (mappingComposite != null) { return mappingComposite; } @@ -225,7 +226,7 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten this.typeMappingCombo.setSelection(new StructuredSelection(this.typeMappingCombo.getElementAt(0))); } else { - ITypeMappingUiProvider<? extends ITypeMapping> provider = typeMappingUiProvider(this.subject().mappingKey()); + TypeMappingUiProvider<? extends TypeMapping> provider = typeMappingUiProvider(this.subject().mappingKey()); if (provider != null && ! provider.equals(((StructuredSelection) this.typeMappingCombo.getSelection()).getFirstElement())) { this.typeMappingCombo.setSelection(new StructuredSelection(provider)); } @@ -319,21 +320,21 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IPersistentType.MAPPING_PROPERTY) { + if (propertyName == PersistentType.MAPPING_PROPERTY) { populateMappingComboAndPage(); } } private void typeMappingChanged(SelectionChangedEvent event) { if (event.getSelection() instanceof StructuredSelection) { - ITypeMappingUiProvider<?> provider = (ITypeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); + TypeMappingUiProvider<?> provider = (TypeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); this.subject().setMappingKey(provider.mappingKey()); } } - private ITypeMappingUiProvider<? extends ITypeMapping> typeMappingUiProvider(String key) { - for (ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> iter = this.typeMappingUiProviders(); iter.hasNext();) { - ITypeMappingUiProvider<? extends ITypeMapping> provider = iter.next(); + private TypeMappingUiProvider<? extends TypeMapping> typeMappingUiProvider(String key) { + for (ListIterator<TypeMappingUiProvider<? extends TypeMapping>> iter = this.typeMappingUiProviders(); iter.hasNext();) { + TypeMappingUiProvider<? extends TypeMapping> provider = iter.next(); if (provider.mappingKey() == key) { return provider; } @@ -347,10 +348,10 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten // return typeMappingCombo.getCombo().setFocus(); // } - protected abstract ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders(); + protected abstract ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders(); private void updateMappingPage() { - ITypeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; + TypeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; populateMappingPage(mapping == null ? null : mapping.getKey()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java index 2725d9cb5d..98587d86fa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java @@ -10,20 +10,20 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -36,11 +36,11 @@ import org.eclipse.swt.widgets.Text; public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog { - private XmlPersistentAttribute unmappedPersistentAttribute; + private OrmPersistentAttribute unmappedPersistentAttribute; private Text attributeText; private ComboViewer mappingCombo; - public AddPersistentAttributeToXmlAndMapDialog(Shell parentShell, XmlPersistentAttribute unmappedPersistentAttribute) { + public AddPersistentAttributeToXmlAndMapDialog(Shell parentShell, OrmPersistentAttribute unmappedPersistentAttribute) { super(parentShell); this.unmappedPersistentAttribute = unmappedPersistentAttribute; setTitle(JptUiMessages.AddPersistentAttributeDialog_title); @@ -95,7 +95,7 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog new LabelProvider() { @Override public String getText(Object element) { - return ((IAttributeMappingUiProvider) element).label(); + return ((AttributeMappingUiProvider) element).label(); } }); mappingCombo.addSelectionChangedListener(new ISelectionChangedListener() { @@ -149,7 +149,7 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog public String getMappingKey() { StructuredSelection selection = (StructuredSelection) mappingCombo.getSelection(); - return (selection.isEmpty()) ? null : ((IAttributeMappingUiProvider) selection.getFirstElement()).attributeMappingKey(); + return (selection.isEmpty()) ? null : ((AttributeMappingUiProvider) selection.getFirstElement()).attributeMappingKey(); } private void validate() { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java index 5d74a0bc5b..188ff4952a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java @@ -27,14 +27,14 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -124,7 +124,7 @@ public class AddPersistentClassDialog extends StatusDialog new LabelProvider() { @Override public String getText(Object element) { - return ((ITypeMappingUiProvider<?>) element).label(); + return ((TypeMappingUiProvider<?>) element).label(); } }); this.mappingCombo.addSelectionChangedListener(new ISelectionChangedListener() { @@ -181,7 +181,7 @@ public class AddPersistentClassDialog extends StatusDialog return combo; } - private IJpaProject getJpaProject() { + private JpaProject getJpaProject() { return this.entityMappings.jpaProject(); } @@ -191,7 +191,7 @@ public class AddPersistentClassDialog extends StatusDialog public String getMappingKey() { StructuredSelection selection = (StructuredSelection) this.mappingCombo.getSelection(); - return (selection.isEmpty()) ? null : ((ITypeMappingUiProvider<?>) selection.getFirstElement()).mappingKey(); + return (selection.isEmpty()) ? null : ((TypeMappingUiProvider<?>) selection.getFirstElement()).mappingKey(); } protected IType chooseType() { @@ -269,7 +269,7 @@ public class AddPersistentClassDialog extends StatusDialog @Override protected void okPressed() { - this.entityMappings.addXmlPersistentType(getMappingKey(), getClassName()); + this.entityMappings.addOrmPersistentType(getMappingKey(), getClassName()); super.okPressed(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/BasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java index fc8a7ac928..763ff48dad 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/BasicMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class BasicMappingUiProvider - implements IAttributeMappingUiProvider<IBasicMapping> + implements AttributeMappingUiProvider<BasicMapping> { // singleton @@ -29,7 +29,7 @@ public class BasicMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IBasicMapping> instance() { + public static AttributeMappingUiProvider<BasicMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class BasicMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_BasicLabel; } - public IJpaComposite<IBasicMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java index e6d91b2ab2..be7deef6df 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultBasicMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class DefaultBasicMappingUiProvider - implements IAttributeMappingUiProvider<IBasicMapping> + implements AttributeMappingUiProvider<BasicMapping> { // singleton private static final DefaultBasicMappingUiProvider INSTANCE = new DefaultBasicMappingUiProvider(); @@ -29,7 +29,7 @@ public class DefaultBasicMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IBasicMapping> instance() { + public static AttributeMappingUiProvider<BasicMapping> instance() { return INSTANCE; } @@ -41,7 +41,7 @@ public class DefaultBasicMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String label() { @@ -51,8 +51,8 @@ public class DefaultBasicMappingUiProvider ); } - public IJpaComposite<IBasicMapping> buildAttributeMappingComposite(IJpaUiFactory factory, - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> buildAttributeMappingComposite(JpaUiFactory factory, + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java index 0f7f9c8146..31b898c15c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultEmbeddedMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class DefaultEmbeddedMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedMapping> + implements AttributeMappingUiProvider<EmbeddedMapping> { // singleton private static final DefaultEmbeddedMappingUiProvider INSTANCE = new DefaultEmbeddedMappingUiProvider(); @@ -29,7 +29,7 @@ public class DefaultEmbeddedMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedMapping> instance() { return INSTANCE; } @@ -41,7 +41,7 @@ public class DefaultEmbeddedMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String label() { @@ -51,9 +51,9 @@ public class DefaultEmbeddedMappingUiProvider ); } - public IJpaComposite<IEmbeddedMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java index 62dc32fa34..92308434c9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddableUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddableComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> +public class EmbeddableUiProvider implements TypeMappingUiProvider<Embeddable> { // singleton private static final EmbeddableUiProvider INSTANCE = new EmbeddableUiProvider(); @@ -27,7 +27,7 @@ public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> /** * Return the singleton. */ - public static ITypeMappingUiProvider<IEmbeddable> instance() { + public static TypeMappingUiProvider<Embeddable> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> } public String mappingKey() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_EmbeddableLabel; } - public IJpaComposite<IEmbeddable> buildPersistentTypeMappingComposite( - PropertyValueModel<IEmbeddable> subjectHolder, + public JpaComposite<Embeddable> buildPersistentTypeMappingComposite( + PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java index ea5c609e89..2d9ceb7fd4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedIdMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EmbeddedIdMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedIdMapping> + implements AttributeMappingUiProvider<EmbeddedIdMapping> { // singleton @@ -29,7 +29,7 @@ public class EmbeddedIdMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedIdMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedIdMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class EmbeddedIdMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_EmbeddedIdLabel; } - public IJpaComposite<IEmbeddedIdMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedIdMapping> subjectHolder, + public JpaComposite<EmbeddedIdMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java index 47c3688b22..f660954422 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EmbeddedMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedMapping> + implements AttributeMappingUiProvider<EmbeddedMapping> { // singleton @@ -29,7 +29,7 @@ public class EmbeddedMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class EmbeddedMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_EmbeddedLabel; } - public IJpaComposite<IEmbeddedMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java index feb4242d7d..b3a9ab698c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EntityUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.EntityComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> +public class EntityUiProvider implements TypeMappingUiProvider<Entity> { // singleton private static final EntityUiProvider INSTANCE = new EntityUiProvider(); @@ -27,7 +27,7 @@ public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> /** * Return the singleton. */ - public static ITypeMappingUiProvider<IEntity> instance() { + public static TypeMappingUiProvider<Entity> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> } public String mappingKey() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_EntityLabel; } - public IJpaComposite<IEntity> buildPersistentTypeMappingComposite( - PropertyValueModel<IEntity> subjectHolder, + public JpaComposite<Entity> buildPersistentTypeMappingComposite( + PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/IdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java index 996b1b7e08..ab1799e492 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/IdMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class IdMappingUiProvider - implements IAttributeMappingUiProvider<IIdMapping> + implements AttributeMappingUiProvider<IdMapping> { // singleton private static final IdMappingUiProvider INSTANCE = new IdMappingUiProvider(); @@ -28,7 +28,7 @@ public class IdMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IIdMapping> instance() { + public static AttributeMappingUiProvider<IdMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class IdMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_IdLabel; } - public IJpaComposite<IIdMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IIdMapping> subjectHolder, + public JpaComposite<IdMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java index 3d9ac6eb23..39dc3c5ea1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.java.IJavaStructureNodes; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.java.JavaStructureNodes; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @@ -24,7 +24,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @since 1.0 */ public class JavaDetailsProvider - implements IJpaDetailsProvider + implements JpaDetailsProvider { /** * Creates a new <code>JavaDetailsProvider</code>. @@ -36,16 +36,16 @@ public class JavaDetailsProvider /* * (non-Javadoc) */ - public IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( + public JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( Composite parent, Object contentNodeId, TabbedPropertySheetWidgetFactory widgetFactory) { - if (contentNodeId == IJavaStructureNodes.PERSISTENT_TYPE_ID) { + if (contentNodeId == JavaStructureNodes.PERSISTENT_TYPE_ID) { return new JavaPersistentTypeDetailsPage(parent, widgetFactory); } - if (contentNodeId == IJavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) { + if (contentNodeId == JavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) { return new JavaPersistentAttributeDetailsPage(parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java index 06da38a93b..1167a7fcb5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.ui.internal.java.details; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage; -import org.eclipse.jpt.ui.internal.java.mappings.properties.NullAttributeMappingUiProvider; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -27,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the Java persistent * attribute. * - * @see IPersistentAttribute + * @see PersistentAttribute * * @version 2.0 * @since 2.0 */ -public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<IJavaPersistentAttribute> +public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<JavaPersistentAttribute> { /** * Creates a new <code>JavaPersistentAttributeDetailsPage</code>. @@ -50,7 +50,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() { // TODO return ((BaseJpaPlatformUi) jpaPlatformUi()).javaAttributeMappingUiProviders(); } @@ -63,11 +63,11 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * determined by matching its key with the key of the current attributeMapping. */ @Override - protected IAttributeMappingUiProvider<? extends IAttributeMapping>[] attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute) { - IAttributeMappingUiProvider<? extends IAttributeMapping>[] providers = new IAttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1]; + protected AttributeMappingUiProvider<? extends AttributeMapping>[] attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute) { + AttributeMappingUiProvider<? extends AttributeMapping>[] providers = new AttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1]; providers[0] = defaultAttributeMappingUiProvider(persistentAttribute.defaultMappingKey()); int i = 1; - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) { providers[i++] = iterator.next(); } return providers; @@ -77,9 +77,9 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected IAttributeMappingUiProvider<? extends IAttributeMapping> defaultAttributeMappingUiProvider(String key) { - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = i.next(); + protected AttributeMappingUiProvider<? extends AttributeMapping> defaultAttributeMappingUiProvider(String key) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) { + AttributeMappingUiProvider<? extends AttributeMapping> provider = i.next(); if (provider.attributeMappingKey() == key) { return provider; } @@ -91,7 +91,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultAttributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() { // TODO // return jpaPlatformUi().defaultJavaAttributeMappingUiProviders(); return ((BaseJpaPlatformUi) jpaPlatformUi()).defaultJavaAttributeMappingUiProviders(); @@ -122,7 +122,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai mappingPane.setLayoutData(gridData); } - protected IAttributeMappingUiProvider<IAttributeMapping> nullAttributeMappingUiProvider() { + protected AttributeMappingUiProvider<AttributeMapping> nullAttributeMappingUiProvider() { return NullAttributeMappingUiProvider.instance(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java index c4237bffe5..a887137d6d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java @@ -10,12 +10,13 @@ package org.eclipse.jpt.ui.internal.java.details; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.ui.JpaPlatformUi; import org.eclipse.jpt.ui.internal.details.PersistentTypeDetailsPage; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -26,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the Java persistent * type. * - * @see IJavaPersistentType + * @see JavaPersistentType * * @version 2.0 * @since 2.0 */ -public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJavaPersistentType> +public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<JavaPersistentType> { /** * Creates a new <code>JavaPersistentTypeDetailsPage</code>. @@ -45,7 +46,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa super(parent, widgetFactory); } - protected IJpaPlatformUi jpaPlatformUi() { + protected JpaPlatformUi jpaPlatformUi() { String platformId = subject().jpaProject().jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } @@ -54,7 +55,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa * (non-Javadoc) */ @Override - protected ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders() { + protected ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() { // TODO return ((BaseJpaPlatformUi) jpaPlatformUi()).javaTypeMappingUiProviders(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java index a76292585c..f4719aed7a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToManyMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class ManyToManyMappingUiProvider - implements IAttributeMappingUiProvider<IManyToManyMapping> + implements AttributeMappingUiProvider<ManyToManyMapping> { // singleton private static final ManyToManyMappingUiProvider INSTANCE = new ManyToManyMappingUiProvider(); @@ -28,7 +28,7 @@ public class ManyToManyMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IManyToManyMapping> instance() { + public static AttributeMappingUiProvider<ManyToManyMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class ManyToManyMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_ManyToManyLabel; } - public IJpaComposite<IManyToManyMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IManyToManyMapping> subjectHolder, + public JpaComposite<ManyToManyMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java index 8c002cc4f8..d1b9408a09 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToOneMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class ManyToOneMappingUiProvider - implements IAttributeMappingUiProvider<IManyToOneMapping> + implements AttributeMappingUiProvider<ManyToOneMapping> { // singleton private static final ManyToOneMappingUiProvider INSTANCE = new ManyToOneMappingUiProvider(); @@ -28,7 +28,7 @@ public class ManyToOneMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IManyToOneMapping> instance() { + public static AttributeMappingUiProvider<ManyToOneMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class ManyToOneMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_ManyToOneLabel; } - public IJpaComposite<IManyToOneMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IManyToOneMapping> subjectHolder, + public JpaComposite<ManyToOneMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/MappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java index 13db3419e4..c95b85158d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/MappedSuperclassUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.MappedSuperclassComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappedSuperclass> +public class MappedSuperclassUiProvider implements TypeMappingUiProvider<MappedSuperclass> { // singleton private static final MappedSuperclassUiProvider INSTANCE = new MappedSuperclassUiProvider(); @@ -27,7 +27,7 @@ public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappe /** * Return the singleton. */ - public static ITypeMappingUiProvider<IMappedSuperclass> instance() { + public static TypeMappingUiProvider<MappedSuperclass> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappe } public String mappingKey() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_MappedSuperclassLabel; } - public IJpaComposite<IMappedSuperclass> buildPersistentTypeMappingComposite( - PropertyValueModel<IMappedSuperclass> subjectHolder, + public JpaComposite<MappedSuperclass> buildPersistentTypeMappingComposite( + PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java index 511e925934..1cd0a2e800 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullAttributeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @SuppressWarnings("nls") public class NullAttributeMappingUiProvider - implements IAttributeMappingUiProvider<IAttributeMapping> + implements AttributeMappingUiProvider<AttributeMapping> { // singleton @@ -29,7 +29,7 @@ public class NullAttributeMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IAttributeMapping> instance() { + public static AttributeMappingUiProvider<AttributeMapping> instance() { return INSTANCE; } @@ -58,19 +58,19 @@ public class NullAttributeMappingUiProvider /* * (non-Javadoc) */ - public IJpaComposite<IAttributeMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IAttributeMapping> subjectHolder, + public JpaComposite<AttributeMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<AttributeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { return new NullComposite(subjectHolder, parent, widgetFactory); } - public static class NullComposite extends AbstractFormPane<IAttributeMapping> - implements IJpaComposite<IAttributeMapping>{ + public static class NullComposite extends AbstractFormPane<AttributeMapping> + implements JpaComposite<AttributeMapping>{ - NullComposite(PropertyValueModel<IAttributeMapping> subjectHolder, + NullComposite(PropertyValueModel<AttributeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullTypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java index e2fd386a74..b4e84a19a2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullTypeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java @@ -7,18 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @SuppressWarnings("nls") -public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMapping> +public class NullTypeMappingUiProvider implements TypeMappingUiProvider<TypeMapping> { // singleton private static final NullTypeMappingUiProvider INSTANCE = new NullTypeMappingUiProvider(); @@ -26,7 +26,7 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa /** * Return the singleton. */ - public static ITypeMappingUiProvider<ITypeMapping> instance() { + public static TypeMappingUiProvider<TypeMapping> instance() { return INSTANCE; } @@ -45,8 +45,8 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa return ""; } - public IJpaComposite<ITypeMapping> buildPersistentTypeMappingComposite( - PropertyValueModel<ITypeMapping> subjectHolder, + public JpaComposite<TypeMapping> buildPersistentTypeMappingComposite( + PropertyValueModel<TypeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -54,10 +54,10 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa } - public static class NullComposite extends AbstractFormPane<ITypeMapping> - implements IJpaComposite<ITypeMapping> + public static class NullComposite extends AbstractFormPane<TypeMapping> + implements JpaComposite<TypeMapping> { - NullComposite(PropertyValueModel<ITypeMapping> subjectHolder, + NullComposite(PropertyValueModel<TypeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java index cc53b9ff90..587110e544 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToManyMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class OneToManyMappingUiProvider - implements IAttributeMappingUiProvider<IOneToManyMapping> + implements AttributeMappingUiProvider<OneToManyMapping> { // singleton private static final OneToManyMappingUiProvider INSTANCE = new OneToManyMappingUiProvider(); @@ -28,7 +28,7 @@ public class OneToManyMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IOneToManyMapping> instance() { + public static AttributeMappingUiProvider<OneToManyMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class OneToManyMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_OneToManyLabel; } - public IJpaComposite<IOneToManyMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IOneToManyMapping> subjectHolder, + public JpaComposite<OneToManyMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java index 5911e92c98..85fe2da2ed 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToOneMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class OneToOneMappingUiProvider - implements IAttributeMappingUiProvider<IOneToOneMapping> + implements AttributeMappingUiProvider<OneToOneMapping> { // singleton @@ -29,7 +29,7 @@ public class OneToOneMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IOneToOneMapping> instance() { + public static AttributeMappingUiProvider<OneToOneMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class OneToOneMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_OneToOneLabel; } - public IJpaComposite<IOneToOneMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IOneToOneMapping> subjectHolder, + public JpaComposite<OneToOneMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/TransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java index 12de4a399a..31f48791d9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/TransientMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class TransientMappingUiProvider - implements IAttributeMappingUiProvider<ITransientMapping> + implements AttributeMappingUiProvider<TransientMapping> { // singleton @@ -29,7 +29,7 @@ public class TransientMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<ITransientMapping> instance() { + public static AttributeMappingUiProvider<TransientMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class TransientMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_TransientLabel; } - public IJpaComposite<ITransientMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<ITransientMapping> subjectHolder, + public JpaComposite<TransientMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/VersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java index 35950bf8fe..6fdcb598fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/VersionMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class VersionMappingUiProvider - implements IAttributeMappingUiProvider<IVersionMapping> + implements AttributeMappingUiProvider<VersionMapping> { // singleton @@ -29,7 +29,7 @@ public class VersionMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IVersionMapping> instance() { + public static AttributeMappingUiProvider<VersionMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class VersionMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_VersionLabel; } - public IJpaComposite<IVersionMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IVersionMapping> subjectHolder, + public JpaComposite<VersionMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java index f1471b3148..a2fcf715fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java @@ -7,7 +7,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.graphics.Image; /** - * Implementation of {@link IItemLabelProvider} that provides updating + * Implementation of {@link ItemLabelProvider} that provides updating * label information for a Model object. * * The typical subclass will override the following methods: @@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.Image; * Other methods may be overridden, but take care to preserve the logic provided * by this class. */ -public abstract class AbstractItemLabelProvider implements IItemLabelProvider +public abstract class AbstractItemLabelProvider implements ItemLabelProvider { private DelegatingContentAndLabelProvider labelProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java index c20cfaf1bf..9efd74e945 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyCollectionValueModel import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; /** - * Implementation of {@link ITreeItemContentProvider} that provides updating + * Implementation of {@link TreeItemContentProvider} that provides updating * children information for a Model object. * * The typical subclass will override the following methods: @@ -42,7 +42,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; * by this class. */ public abstract class AbstractTreeItemContentProvider<E> - implements ITreeItemContentProvider + implements TreeItemContentProvider { private DelegatingTreeContentAndLabelProvider treeContentProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java index 35294e85ea..ea9b8afc2a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Image; /** * Implementation of {@link IStructuredContentProvider} and {@link ILabelProvider} that - * maintains a collection (Map, actually) of {@link IItemContentProvider} + * maintains a collection (Map, actually) of {@link ItemContentProvider} * delegates that perform the function of providing content and label information * for each represented item * @@ -33,35 +33,35 @@ import org.eclipse.swt.graphics.Image; public abstract class DelegatingContentAndLabelProvider extends BaseLabelProvider implements IStructuredContentProvider, ILabelProvider { - private final IItemContentProviderFactory itemContentProviderFactory; + private final ItemContentProviderFactory itemContentProviderFactory; - private final IItemLabelProviderFactory itemLabelProviderFactory; + private final ItemLabelProviderFactory itemLabelProviderFactory; - private final Map<Object, IItemContentProvider> itemContentProviders; + private final Map<Object, ItemContentProvider> itemContentProviders; - private final Map<Object, IItemLabelProvider> itemLabelProviders; + private final Map<Object, ItemLabelProvider> itemLabelProviders; private StructuredViewer viewer; protected DelegatingContentAndLabelProvider( - IItemContentProviderFactory itemContentProviderFactory) { + ItemContentProviderFactory itemContentProviderFactory) { this(itemContentProviderFactory, null); } protected DelegatingContentAndLabelProvider( - IItemContentProviderFactory itemContentProviderFactory, - IItemLabelProviderFactory itemLabelProviderFactory) { + ItemContentProviderFactory itemContentProviderFactory, + ItemLabelProviderFactory itemLabelProviderFactory) { super(); this.itemContentProviderFactory = itemContentProviderFactory; this.itemLabelProviderFactory = itemLabelProviderFactory; - this.itemContentProviders = new HashMap<Object, IItemContentProvider>(); - this.itemLabelProviders = new HashMap<Object, IItemLabelProvider>(); + this.itemContentProviders = new HashMap<Object, ItemContentProvider>(); + this.itemLabelProviders = new HashMap<Object, ItemLabelProvider>(); } - protected IItemContentProvider itemContentProvider(Object item) { - IItemContentProvider itemContentProvider = itemContentProviders.get(item); + protected ItemContentProvider itemContentProvider(Object item) { + ItemContentProvider itemContentProvider = itemContentProviders.get(item); if (itemContentProvider != null) { return itemContentProvider; } @@ -73,13 +73,13 @@ public abstract class DelegatingContentAndLabelProvider extends BaseLabelProvide return itemContentProvider; } - protected IItemLabelProvider itemLabelProvider(Object item) { + protected ItemLabelProvider itemLabelProvider(Object item) { if (viewer == null) { throw new IllegalStateException( "This provider must be used as a content" + "provider *as well as* a label provider."); } - IItemLabelProvider itemLabelProvider = itemLabelProviders.get(item); + ItemLabelProvider itemLabelProvider = itemLabelProviders.get(item); if (itemLabelProvider != null) { return itemLabelProvider; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java index b400887ccb..ae8498c934 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java @@ -20,19 +20,19 @@ public class DelegatingTreeContentAndLabelProvider extends DelegatingContentAndL implements ITreeContentProvider { public DelegatingTreeContentAndLabelProvider( - ITreeItemContentProviderFactory treeItemContentProviderFactory) { + TreeItemContentProviderFactory treeItemContentProviderFactory) { super(treeItemContentProviderFactory); } public DelegatingTreeContentAndLabelProvider( - ITreeItemContentProviderFactory treeItemContentProviderFactory, - IItemLabelProviderFactory itemLabelProviderFactory) { + TreeItemContentProviderFactory treeItemContentProviderFactory, + ItemLabelProviderFactory itemLabelProviderFactory) { super(treeItemContentProviderFactory, itemLabelProviderFactory); } - protected ITreeItemContentProvider itemContentProvider(Object item) { - return (ITreeItemContentProvider) super.itemContentProvider(item); + protected TreeItemContentProvider itemContentProvider(Object item) { + return (TreeItemContentProvider) super.itemContentProvider(item); } public Object[] getChildren(Object parentElement) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProvider.java index 06589c7da7..042775643d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProvider.java @@ -14,9 +14,9 @@ package org.eclipse.jpt.ui.internal.jface; * Marker interface used in conjunction with DelegatingContentProvider to return * content information for a particular item. * @see DelegatingContentProvider - * @see IItemContentProviderFactory + * @see ItemContentProviderFactory */ -public interface IItemContentProvider +public interface ItemContentProvider { /** * Return the elements of the represented item. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProviderFactory.java index 4237b9b707..c6154da54f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProviderFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.jface; /** - * Factory interface used to describe how to build {@link IItemContentProvider}s + * Factory interface used to describe how to build {@link ItemContentProvider}s * for a {@link DelegatingContentAndLabelProvider} */ -public interface IItemContentProviderFactory +public interface ItemContentProviderFactory { - IItemContentProvider buildItemContentProvider(Object item, + ItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProvider.java index d59afdd16e..b9b76b83c4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProvider.java @@ -16,9 +16,9 @@ import org.eclipse.swt.graphics.Image; * Interface used in conjunction with DelegatingLabelProvider to return * label information for a particular item. * @see DelegatingLabelProvider - * @see IItemLabelProviderFactory + * @see ItemLabelProviderFactory */ -public interface IItemLabelProvider +public interface ItemLabelProvider { /** * Return the image for the item diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProviderFactory.java index 4979ee32b7..bc37fb0fcc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProviderFactory.java @@ -14,8 +14,8 @@ package org.eclipse.jpt.ui.internal.jface; * Factory interface used to describe how to build IItemLabelProviders * for a DelegatingContentAndLabelProvider */ -public interface IItemLabelProviderFactory +public interface ItemLabelProviderFactory { - IItemLabelProvider buildItemLabelProvider( + ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProvider.java index 520f966ef4..2a3a2e6dc4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProvider.java @@ -14,9 +14,9 @@ package org.eclipse.jpt.ui.internal.jface; * Interface used in conjunction with DelegatingTreeContentProvider to return * tree information for a particular item. * @see DelegatingTreeContentProvider - * @see ITreeItemContentProviderFactory + * @see TreeItemContentProviderFactory */ -public interface ITreeItemContentProvider extends IItemContentProvider +public interface TreeItemContentProvider extends ItemContentProvider { /** * Return the parent of the represented item diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProviderFactory.java index 9d0b0009d0..b06d2dbfc4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProviderFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.jface; /** - * Extension of {@link IItemContentProviderFactory} that extends functionality + * Extension of {@link ItemContentProviderFactory} that extends functionality * for tree content */ -public interface ITreeItemContentProviderFactory extends IItemContentProviderFactory +public interface TreeItemContentProviderFactory extends ItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider(Object item, + public TreeItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java index f169854266..98ea13ed17 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java @@ -9,8 +9,8 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionListener; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Database; @@ -20,7 +20,7 @@ import org.eclipse.jpt.ui.internal.Tracing; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.SWTUtil; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; @@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Composite; * @since 2.0 */ @SuppressWarnings("nls") -public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends AbstractFormPane<T> +public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends AbstractFormPane<T> { /** * The main widget of this pane. @@ -95,7 +95,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab */ protected AbstractDatabaseObjectCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -254,7 +254,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab * if it could not being retrieved */ protected final ConnectionProfile connectionProfile() { - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { return jpaProject.connectionProfile(); @@ -288,7 +288,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab protected void disengageListeners(T subject) { super.disengageListeners(subject); - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { jpaProject.connectionProfile().removeConnectionListener(this.connectionListener); @@ -325,7 +325,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab protected void engageListeners(T subject) { super.engageListeners(subject); - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { jpaProject.connectionProfile().addConnectionListener(this.connectionListener); @@ -372,7 +372,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab * * @return The JPA project */ - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return subject() == null ? null : subject().jpaProject(); } @@ -525,7 +525,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab */ protected void valueChanged(String value) { - IJpaNode subject = subject(); + JpaNode subject = subject(); if ((subject == null) && !isBuildSubjectAllowed()) { return; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java index 01af8bbecc..5b0d429744 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class CatalogCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class CatalogCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>CatalogCombo</code>. @@ -47,7 +47,7 @@ public abstract class CatalogCombo<T extends IJpaNode> extends AbstractDatabaseO */ public CatalogCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java index 221602704d..1f9ab0435f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java @@ -9,10 +9,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class ColumnCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class ColumnCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>ColumnCombo</code>. @@ -60,7 +60,7 @@ public abstract class ColumnCombo<T extends IJpaNode> extends AbstractDatabaseOb */ public ColumnCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java index 1cd94e6b6b..cc17b0e473 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java @@ -9,10 +9,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class SchemaCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class SchemaCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>SchemaCombo</code>. @@ -46,7 +46,7 @@ public abstract class SchemaCombo<T extends IJpaNode> extends AbstractDatabaseOb */ public SchemaCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java index 9c88773e42..4ca92ba6e8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class SequenceCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class SequenceCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>SequenceCombo</code>. @@ -61,7 +61,7 @@ public abstract class SequenceCombo<T extends IJpaNode> extends AbstractDatabase */ public SequenceCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java index 6660f44d1d..b20480baee 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java @@ -8,10 +8,10 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.db; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class TableCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>TableCombo</code>. @@ -58,7 +58,7 @@ public abstract class TableCombo<T extends IJpaNode> extends AbstractDatabaseObj */ public TableCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java index f32b90c510..d3b8f3974b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractValidatingDialog; import org.eclipse.swt.widgets.Shell; @@ -29,7 +29,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState * Either the join column to edit or <code>null</code> if this state object * is used to create a new one. */ - private IAbstractJoinColumn joinColumn; + private AbstractJoinColumn joinColumn; /** * The owner of the join column to create or where it is located. @@ -46,7 +46,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState */ public AbstractJoinColumnDialog(Shell parent, Object owner, - IAbstractJoinColumn joinColumn) { + AbstractJoinColumn joinColumn) { super(parent); @@ -81,7 +81,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState * * @return Either the edited join column or <code>null</code> */ - public IAbstractJoinColumn getJoinColumn() { + public AbstractJoinColumn getJoinColumn() { return joinColumn; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java index 266230178f..678c08c272 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -140,7 +140,7 @@ public class AbstractJoinColumnDialogPane<T extends AbstractJoinColumnStateObjec container, JptUiMappingsMessages.JoinColumnDialog_name, buildNameComboListener(), - IJpaHelpContextIds.MAPPING_JOIN_COLUMN_NAME + JpaHelpContextIds.MAPPING_JOIN_COLUMN_NAME ); // Referenced Column Name widgets @@ -148,7 +148,7 @@ public class AbstractJoinColumnDialogPane<T extends AbstractJoinColumnStateObjec container, JptUiMappingsMessages.JoinColumnDialog_referencedColumnName, buildReferencedColumnNameComboListener(), - IJpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN + JpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java index b4ee5df324..971b932935 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.node.AbstractNode; import org.eclipse.jpt.utility.internal.node.Node; @@ -18,7 +18,7 @@ import org.eclipse.jpt.utility.internal.node.Node; * The abstract definition of a state object used to edit or create a new * join column. * - * @see IAbstractJoinColumn + * @see AbstractJoinColumn * * @version 2.0 * @since 2.0 @@ -30,7 +30,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * Either the join column is being edited or <code>null</code> the state * object is being created. */ - private IAbstractJoinColumn joinColumn; + private AbstractJoinColumn joinColumn; /** * The join column's name or <code>null</code> if not defined. @@ -70,7 +70,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * this state object is used to create a new one */ public AbstractJoinColumnStateObject(Object owner, - IAbstractJoinColumn joinColumn) { + AbstractJoinColumn joinColumn) { super(null); initialize(owner, joinColumn); } @@ -125,7 +125,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * * @return The edited join column or <code>null</code> */ - public IAbstractJoinColumn getJoinColumn() { + public AbstractJoinColumn getJoinColumn() { return this.joinColumn; } @@ -184,7 +184,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - protected void initialize(Object owner, IAbstractJoinColumn joinColumn) { + protected void initialize(Object owner, AbstractJoinColumn joinColumn) { this.owner = owner; this.joinColumn = joinColumn; @@ -233,7 +233,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * * @param joinColumn The join column to update */ - public void updateJoinColumn(IAbstractJoinColumn joinColumn) { + public void updateJoinColumn(AbstractJoinColumn joinColumn) { // Name if (valuesAreDifferent(name, joinColumn.getSpecifiedName())) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java index 8f1136631a..8327ab52ed 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -54,7 +54,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see EnumTypeComposite @@ -66,8 +66,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class BasicMappingComposite extends AbstractFormPane<IBasicMapping> - implements IJpaComposite<IBasicMapping> +public class BasicMappingComposite extends AbstractFormPane<BasicMapping> + implements JpaComposite<BasicMapping> { /** * Creates a new <code>BasicMappingComposite</code>. @@ -76,17 +76,17 @@ public class BasicMappingComposite extends AbstractFormPane<IBasicMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public BasicMappingComposite(PropertyValueModel<IBasicMapping> subjectHolder, + public BasicMappingComposite(PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IBasicMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<Column> buildColumnHolder() { + return new TransformationPropertyValueModel<BasicMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IBasicMapping value) { + protected Column transform_(BasicMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java index e5e246c0d4..2c7ccbf83f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -31,8 +31,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ICascade - * @see IRelationshipMapping + * @see Cascade + * @see RelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane @@ -41,7 +41,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class CascadeComposite extends AbstractFormPane<ICascade> +public class CascadeComposite extends AbstractFormPane<Cascade> { /** * Creates a new <code>CascadeComposite</code>. @@ -50,8 +50,8 @@ public class CascadeComposite extends AbstractFormPane<ICascade> * @param subjectHolder The holder of the subject <code>ICascade</code> * @param parent The parent container */ - public CascadeComposite(AbstractFormPane<? extends IRelationshipMapping> parentPane, - PropertyValueModel<? extends ICascade> subjectHolder, + public CascadeComposite(AbstractFormPane<? extends RelationshipMapping> parentPane, + PropertyValueModel<? extends Cascade> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent, false); @@ -64,7 +64,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public CascadeComposite(PropertyValueModel<? extends ICascade> subjectHolder, + public CascadeComposite(PropertyValueModel<? extends Cascade> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -72,7 +72,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeAllHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.ALL_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isAll(); @@ -86,7 +86,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeMergeHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.MERGE_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isMerge(); @@ -100,7 +100,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypePersistHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.PERSIST_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isPersist(); @@ -114,7 +114,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeRefreshHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.REFRESH_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isRefresh(); @@ -128,7 +128,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeRemoveHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.REMOVE_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isRemove(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java index 8c987ab3e2..708057ff6d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java @@ -10,15 +10,15 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Composite; * | | * -----------------------------------------------------------------------------</pre> * - * @see IColumn + * @see Column * @see ColumnCombo * @see TableCombo * @see BasicMappingComposite - A container of this pane @@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class ColumnComposite extends AbstractFormPane<IColumn> +public class ColumnComposite extends AbstractFormPane<Column> { private TriStateCheckBox insertableCheckBox; private TriStateCheckBox updatableCheckBox; @@ -74,7 +74,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * @param parent The parent container */ public ColumnComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IColumn> subjectHolder, + PropertyValueModel<? extends Column> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -91,7 +91,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * <code>false</code> to not align them */ public ColumnComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IColumn> subjectHolder, + PropertyValueModel<? extends Column> subjectHolder, Composite parent, boolean automaticallyAlignWidgets) { @@ -105,22 +105,22 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ColumnComposite(PropertyValueModel<? extends IColumn> subjectHolder, + public ColumnComposite(PropertyValueModel<? extends Column> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private ColumnCombo<IColumn> buildColumnCombo(Composite container) { + private ColumnCombo<Column> buildColumnCombo(Composite container) { - return new ColumnCombo<IColumn>(this, container) { + return new ColumnCombo<Column>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(INamedColumn.DEFAULT_NAME_PROPERTY); - propertyNames.add(INamedColumn.SPECIFIED_NAME_PROPERTY); + propertyNames.add(NamedColumn.DEFAULT_NAME_PROPERTY); + propertyNames.add(NamedColumn.SPECIFIED_NAME_PROPERTY); } @Override @@ -146,10 +146,10 @@ public class ColumnComposite extends AbstractFormPane<IColumn> } private WritablePropertyValueModel<Boolean> buildInsertableHolder() { - return new PropertyAspectAdapter<IColumn, Boolean>( + return new PropertyAspectAdapter<Column, Boolean>( getSubjectHolder(), - IColumn.DEFAULT_INSERTABLE_PROPERTY, - IColumn.SPECIFIED_INSERTABLE_PROPERTY) + Column.DEFAULT_INSERTABLE_PROPERTY, + Column.SPECIFIED_INSERTABLE_PROPERTY) { @Override protected Boolean buildValue_() { @@ -191,15 +191,15 @@ public class ColumnComposite extends AbstractFormPane<IColumn> }; } - private TableCombo<IColumn> buildTableCombo(Composite container) { + private TableCombo<Column> buildTableCombo(Composite container) { - return new TableCombo<IColumn>(this, container) { + return new TableCombo<Column>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IColumn.DEFAULT_TABLE_PROPERTY); - propertyNames.add(IColumn.SPECIFIED_TABLE_PROPERTY); + propertyNames.add(Column.DEFAULT_TABLE_PROPERTY); + propertyNames.add(Column.SPECIFIED_TABLE_PROPERTY); } @Override @@ -230,10 +230,10 @@ public class ColumnComposite extends AbstractFormPane<IColumn> } private WritablePropertyValueModel<Boolean> buildUpdatableHolder() { - return new PropertyAspectAdapter<IColumn, Boolean>( + return new PropertyAspectAdapter<Column, Boolean>( getSubjectHolder(), - IColumn.DEFAULT_UPDATABLE_PROPERTY, - IColumn.SPECIFIED_UPDATABLE_PROPERTY) + Column.DEFAULT_UPDATABLE_PROPERTY, + Column.SPECIFIED_UPDATABLE_PROPERTY) { @Override protected Boolean buildValue_() { @@ -302,7 +302,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> container, JptUiMappingsMessages.ColumnChooser_label, buildColumnCombo(container), - IJpaHelpContextIds.MAPPING_COLUMN + JpaHelpContextIds.MAPPING_COLUMN ); // Table widgets @@ -310,7 +310,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> container, JptUiMappingsMessages.ColumnTableChooser_label, buildTableCombo(container), - IJpaHelpContextIds.MAPPING_COLUMN_TABLE + JpaHelpContextIds.MAPPING_COLUMN_TABLE ); // Insertable widgets @@ -319,7 +319,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> JptUiMappingsMessages.ColumnComposite_insertable, buildInsertableHolder(), buildInsertableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE + JpaHelpContextIds.MAPPING_COLUMN_INSERTABLE ); // Updatable widgets @@ -328,7 +328,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> JptUiMappingsMessages.ColumnComposite_updatable, buildUpdatableHolder(), buildUpdatableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_UPDATABLE + JpaHelpContextIds.MAPPING_COLUMN_UPDATABLE ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java index 658156b652..1368f0e5d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -18,15 +18,15 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see IEmbeddable + * @see Embeddable * @see BaseJpaUiFactory - The factory creating this pane * @see EmbeddableUiProvider * * @version 2.0 * @since 2.0 */ -public class EmbeddableComposite extends AbstractFormPane<IEmbeddable> - implements IJpaComposite<IEmbeddable> +public class EmbeddableComposite extends AbstractFormPane<Embeddable> + implements JpaComposite<Embeddable> { /** * Creates a new <code>EmbeddableComposite</code>. @@ -35,7 +35,7 @@ public class EmbeddableComposite extends AbstractFormPane<IEmbeddable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddableComposite(PropertyValueModel<? extends IEmbeddable> subjectHolder, + public EmbeddableComposite(PropertyValueModel<? extends Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java index d5857bf3d4..62243bc635 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java @@ -14,17 +14,17 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -59,16 +59,16 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEmbeddedMapping + * @see EmbeddedMapping * @see EmbeddedMappingComposite - The parent container * @see ColumnComposite * * @version 2.0 * @since 1.0 */ -public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbeddedMapping> +public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<EmbeddedMapping> { - private WritablePropertyValueModel<IAttributeOverride> attributeOverrideHolder; + private WritablePropertyValueModel<AttributeOverride> attributeOverrideHolder; /** * Creates a new <code>EmbeddedAttributeOverridesComposite</code>. @@ -76,7 +76,7 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed * @param parentPane The parent container of this one * @param parent The parent container */ - public EmbeddedAttributeOverridesComposite(AbstractFormPane<? extends IEmbeddedMapping> parentPane, + public EmbeddedAttributeOverridesComposite(AbstractFormPane<? extends EmbeddedMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -89,22 +89,22 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedAttributeOverridesComposite(PropertyValueModel<? extends IEmbeddedMapping> subjectHolder, + public EmbeddedAttributeOverridesComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private WritablePropertyValueModel<IAttributeOverride> buildAttributeOverrideHolder() { - return new SimplePropertyValueModel<IAttributeOverride>(); + private WritablePropertyValueModel<AttributeOverride> buildAttributeOverrideHolder() { + return new SimplePropertyValueModel<AttributeOverride>(); } private ILabelProvider buildAttributeOverrideLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - return buildOverrideDisplayString((IAttributeOverride) element); + return buildOverrideDisplayString((AttributeOverride) element); } }; } @@ -120,36 +120,36 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed }; } - private ListValueModel<IAttributeOverride> buildAttributeOverridesListHolder() { - List<ListValueModel<IAttributeOverride>> list = new ArrayList<ListValueModel<IAttributeOverride>>(); + private ListValueModel<AttributeOverride> buildAttributeOverridesListHolder() { + List<ListValueModel<AttributeOverride>> list = new ArrayList<ListValueModel<AttributeOverride>>(); list.add(buildSpecifiedAttributeOverridesListHolder()); list.add(buildDefaultAttributeOverridesListHolder()); - return new CompositeListValueModel<ListValueModel<IAttributeOverride>, IAttributeOverride>(list); + return new CompositeListValueModel<ListValueModel<AttributeOverride>, AttributeOverride>(list); } - private ListValueModel<IAttributeOverride> buildAttributeOverridesListModel() { - return new ItemPropertyListValueModelAdapter<IAttributeOverride>( + private ListValueModel<AttributeOverride> buildAttributeOverridesListModel() { + return new ItemPropertyListValueModelAdapter<AttributeOverride>( buildAttributeOverridesListHolder(), - IOverride.NAME_PROPERTY + BaseOverride.NAME_PROPERTY ); } - private PropertyValueModel<IColumn> buildColumnHolder(WritablePropertyValueModel<IAttributeOverride> attributeOverrideHolder) { - return new TransformationPropertyValueModel<IAttributeOverride, IColumn>(attributeOverrideHolder) { + private PropertyValueModel<Column> buildColumnHolder(WritablePropertyValueModel<AttributeOverride> attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Column>(attributeOverrideHolder) { @Override - protected IColumn transform_(IAttributeOverride value) { + protected Column transform_(AttributeOverride value) { return value.getColumn(); } }; } - private ListValueModel<IAttributeOverride> buildDefaultAttributeOverridesListHolder() { - return new ListAspectAdapter<IEmbeddedMapping, IAttributeOverride>( + private ListValueModel<AttributeOverride> buildDefaultAttributeOverridesListHolder() { + return new ListAspectAdapter<EmbeddedMapping, AttributeOverride>( this.getSubjectHolder(), - IEmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) + EmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.defaultAttributeOverrides(); } @@ -161,29 +161,29 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed } private PropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideEnablerHolder() { - return new TransformationPropertyValueModel<IAttributeOverride, Boolean>(attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Boolean>(attributeOverrideHolder) { @Override - protected Boolean transform(IAttributeOverride value) { + protected Boolean transform(AttributeOverride value) { return (value != null); } }; } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAttributeOverride, Boolean>(attributeOverrideHolder) { + return new TransformationWritablePropertyValueModel<AttributeOverride, Boolean>(attributeOverrideHolder) { @Override public void setValue(Boolean value) { updateAssociationOverride(value); } @Override - protected Boolean transform_(IAttributeOverride value) { + protected Boolean transform_(AttributeOverride value) { return !value.isVirtual(); } }; } - private String buildOverrideDisplayString(IAttributeOverride override) { + private String buildOverrideDisplayString(AttributeOverride override) { String name = override.getName(); @@ -197,13 +197,13 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed return name; } - private ListValueModel<IAttributeOverride> buildSpecifiedAttributeOverridesListHolder() { - return new ListAspectAdapter<IEmbeddedMapping, IAttributeOverride>( + private ListValueModel<AttributeOverride> buildSpecifiedAttributeOverridesListHolder() { + return new ListAspectAdapter<EmbeddedMapping, AttributeOverride>( this.getSubjectHolder(), - IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) + EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.specifiedAttributeOverrides(); } @@ -223,16 +223,16 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed this.attributeOverrideHolder = buildAttributeOverrideHolder(); } - private AddRemoveListPane<IEmbeddedMapping> initializeAttributeOverridesList(Composite container) { + private AddRemoveListPane<EmbeddedMapping> initializeAttributeOverridesList(Composite container) { - return new AddRemoveListPane<IEmbeddedMapping>( + return new AddRemoveListPane<EmbeddedMapping>( this, buildSubPane(container, 8), buildAttributeOverridesAdapter(), buildAttributeOverridesListModel(), attributeOverrideHolder, buildAttributeOverrideLabelProvider(), - IJpaHelpContextIds.MAPPING_EMBEDDED_ATTRIBUTE_OVERRIDES + JpaHelpContextIds.MAPPING_EMBEDDED_ATTRIBUTE_OVERRIDES ) { @Override @@ -308,14 +308,14 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed setPopulating(true); try { - IEmbeddedMapping subject = subject(); - IAttributeOverride override = attributeOverrideHolder.value(); + EmbeddedMapping subject = subject(); + AttributeOverride override = attributeOverrideHolder.value(); // Add a new association override if (selected) { int index = this.subject().specifiedAttributeOverridesSize(); - IAttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); + AttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); attributeOverride.setName(override.getName()); attributeOverride.getColumn().setSpecifiedName(override.getColumn().getName()); @@ -327,8 +327,8 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed subject.removeSpecifiedAttributeOverride(override); // Select the default attribute override - for (Iterator<IAttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { - IAttributeOverride attributeOverride = iter.next(); + for (Iterator<AttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { + AttributeOverride attributeOverride = iter.next(); if (attributeOverride.getName().equals(name)) { attributeOverrideHolder.setValue(attributeOverride); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java index 33b424858b..13e1bfa134 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -19,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see IEmbeddedIdMapping + * @see EmbeddedIdMapping * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 1.0 */ -public class EmbeddedIdMappingComposite extends AbstractFormPane<IEmbeddedIdMapping> - implements IJpaComposite<IEmbeddedIdMapping> +public class EmbeddedIdMappingComposite extends AbstractFormPane<EmbeddedIdMapping> + implements JpaComposite<EmbeddedIdMapping> { /** * Creates a new <code>EmbeddedIdMappingComposite</code>. @@ -35,7 +35,7 @@ public class EmbeddedIdMappingComposite extends AbstractFormPane<IEmbeddedIdMapp * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedIdMappingComposite(PropertyValueModel<? extends IEmbeddedIdMapping> subjectHolder, + public EmbeddedIdMappingComposite(PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java index 2241f246fb..037dd12d68 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -27,15 +27,15 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEmbeddedMapping + * @see EmbeddedMapping * @see BaseJpaUiFactory - The factory creating this pane * @see EmbeddedAttributeOverridesComposite * * @version 2.0 * @since 1.0 */ -public class EmbeddedMappingComposite extends AbstractFormPane<IEmbeddedMapping> - implements IJpaComposite<IEmbeddedMapping> +public class EmbeddedMappingComposite extends AbstractFormPane<EmbeddedMapping> + implements JpaComposite<EmbeddedMapping> { /** * Creates a new <code>EmbeddedMappingComposite</code>. @@ -44,7 +44,7 @@ public class EmbeddedMappingComposite extends AbstractFormPane<IEmbeddedMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedMappingComposite(PropertyValueModel<? extends IEmbeddedMapping> subjectHolder, + public EmbeddedMappingComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java index 82f6fe7040..97f6e3f563 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java @@ -8,10 +8,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -56,7 +56,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see EntityNameCombo * @see InheritanceComposite @@ -69,8 +69,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class EntityComposite extends AbstractFormPane<IEntity> - implements IJpaComposite<IEntity> +public class EntityComposite extends AbstractFormPane<Entity> + implements JpaComposite<Entity> { /** * Creates a new <code>EntityComposite</code>. @@ -79,7 +79,7 @@ public class EntityComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EntityComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public EntityComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -95,10 +95,10 @@ public class EntityComposite extends AbstractFormPane<IEntity> return new EntityNameCombo(this, container); } - private PropertyValueModel<ITable> buildTableHolder() { - return new TransformationPropertyValueModel<IEntity, ITable>(getSubjectHolder()) { + private PropertyValueModel<Table> buildTableHolder() { + return new TransformationPropertyValueModel<Entity, Table>(getSubjectHolder()) { @Override - protected ITable transform_(IEntity value) { + protected Table transform_(Entity value) { return value.getTable(); } }; @@ -121,7 +121,7 @@ public class EntityComposite extends AbstractFormPane<IEntity> buildEntityContainer(container), JptUiMappingsMessages.EntityGeneralSection_name, buildEntityNameCombo(container), - IJpaHelpContextIds.ENTITY_NAME + JpaHelpContextIds.ENTITY_NAME ); // Table widgets diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java index 10a3e65c03..b2baf92904 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; +import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.StringTools; @@ -29,13 +29,13 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------ | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * * @version 2.0 * @since 1.0 */ -public class EntityNameCombo extends AbstractFormPane<IEntity> +public class EntityNameCombo extends AbstractFormPane<Entity> { private CCombo combo; @@ -45,7 +45,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> * @param parentPane The parent container of this one * @param parent The parent container */ - public EntityNameCombo(AbstractFormPane<? extends IEntity> parentPane, + public EntityNameCombo(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent); @@ -57,8 +57,8 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> @Override protected void addPropertyNames(java.util.Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_NAME_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Entity.DEFAULT_NAME_PROPERTY); + propertyNames.add(Entity.SPECIFIED_NAME_PROPERTY); } private ModifyListener buildComboModifyListener() { @@ -103,7 +103,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> */ private void populateDefaultValue() { - IEntity entity = subject(); + Entity entity = subject(); String defaultValue = (entity != null) ? entity.getDefaultName() : null; if (defaultValue != null) { @@ -124,8 +124,8 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IEntity.DEFAULT_NAME_PROPERTY || - propertyName == IEntity.SPECIFIED_NAME_PROPERTY) { + if (propertyName == Entity.DEFAULT_NAME_PROPERTY || + propertyName == Entity.SPECIFIED_NAME_PROPERTY) { updateSelectedItem(); } @@ -141,7 +141,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> */ private void updateSelectedItem() { - IEntity subject = subject(); + Entity subject = subject(); String value = (subject != null) ? subject.getSpecifiedName() : null; String defaultValue = (subject != null) ? subject.getDefaultName() : null; @@ -174,7 +174,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> private void valueChanged(String value) { - IEntity subject = subject(); + Entity subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedName() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java index 552aba3581..63a3fd6e3a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.EnumType; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.EnumType; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,13 +26,13 @@ import org.eclipse.swt.widgets.Composite; * | -------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BasicMappingComposite - A container of this widget * * @version 2.0 * @since 1.0 */ -public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> +public class EnumTypeComposite extends AbstractFormPane<BasicMapping> { /** * Creates a new <code>FetchTypeComposite</code>. @@ -40,21 +40,21 @@ public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public EnumTypeComposite(AbstractFormPane<? extends IBasicMapping> parentPane, + public EnumTypeComposite(AbstractFormPane<? extends BasicMapping> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IBasicMapping, EnumType> buildEnumTypeCombo(Composite container) { + private EnumFormComboViewer<BasicMapping, EnumType> buildEnumTypeCombo(Composite container) { - return new EnumFormComboViewer<IBasicMapping, EnumType>(this, container) { + return new EnumFormComboViewer<BasicMapping, EnumType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IBasicMapping.DEFAULT_ENUMERATED_PROPERTY); - propertyNames.add(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY); + propertyNames.add(BasicMapping.DEFAULT_ENUMERATED_PROPERTY); + propertyNames.add(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY); } @Override @@ -98,7 +98,7 @@ public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> container, JptUiMappingsMessages.BasicGeneralSection_enumeratedLabel, buildEnumTypeCombo(container), - IJpaHelpContextIds.MAPPING_ENUMERATED + JpaHelpContextIds.MAPPING_ENUMERATED ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java index 2b4d7efd06..1275243c8c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------ | * -----------------------------------------------------------------------------</pre> * - * @see IFetchable + * @see Fetchable * @see BasicMappingComposite - A container of this widget * @see ManyToManyMappingComposite - A container of this widget * @see ManyToOneMappingComposite - A container of this widget @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class FetchTypeComposite extends AbstractFormPane<IFetchable> { +public class FetchTypeComposite extends AbstractFormPane<Fetchable> { /** * Creates a new <code>FetchTypeComposite</code>. @@ -44,21 +44,21 @@ public class FetchTypeComposite extends AbstractFormPane<IFetchable> { * @param parentPane The parent container of this one * @param parent The parent container */ - public FetchTypeComposite(AbstractFormPane<? extends IFetchable> parentPane, + public FetchTypeComposite(AbstractFormPane<? extends Fetchable> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IFetchable, FetchType> buildFetchTypeCombo(Composite container) { + private EnumFormComboViewer<Fetchable, FetchType> buildFetchTypeCombo(Composite container) { - return new EnumFormComboViewer<IFetchable, FetchType>(this, container) { + return new EnumFormComboViewer<Fetchable, FetchType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IFetchable.DEFAULT_FETCH_PROPERTY); - propertyNames.add(IFetchable.SPECIFIED_FETCH_PROPERTY); + propertyNames.add(Fetchable.DEFAULT_FETCH_PROPERTY); + propertyNames.add(Fetchable.SPECIFIED_FETCH_PROPERTY); } @Override @@ -102,7 +102,7 @@ public class FetchTypeComposite extends AbstractFormPane<IFetchable> { container, JptUiMappingsMessages.BasicGeneralSection_fetchLabel, buildFetchTypeCombo(container), - IJpaHelpContextIds.MAPPING_FETCH_TYPE + JpaHelpContextIds.MAPPING_FETCH_TYPE ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java index 1f0434c582..a34dd954d7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.GenerationType; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.GenerationType; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; @@ -40,15 +40,15 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see IGeneratedValue + * @see IdMapping + * @see GeneratedValue * @see GenerationComposite - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> +public class GeneratedValueComposite extends AbstractFormPane<IdMapping> { private PropertyChangeListener generatedValuePropertyChangeListener; private CCombo generatorNameCombo; @@ -60,7 +60,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public GeneratedValueComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GeneratedValueComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -75,8 +75,8 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> private PropertyChangeListener buildGeneratedValuePropertyChangeListener_() { return new PropertyChangeListener() { public void propertyChanged(PropertyChangeEvent e) { - disengageListeners((IGeneratedValue) e.oldValue()); - engageListeners((IGeneratedValue) e.newValue()); + disengageListeners((GeneratedValue) e.oldValue()); + engageListeners((GeneratedValue) e.newValue()); if (!isPopulating()) { setPopulating(true); @@ -100,7 +100,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> } String generatorName = ((CCombo) e.getSource()).getText(); - IGeneratedValue generatedValue = subject().getGeneratedValue(); + GeneratedValue generatedValue = subject().getGeneratedValue(); if (StringTools.stringIsEmpty(generatorName)) { @@ -141,24 +141,24 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> }; } - private PropertyValueModel<IGeneratedValue> buildGeneratorValueHolder() { - return new PropertyAspectAdapter<IIdMapping, IGeneratedValue>(getSubjectHolder(), IIdMapping.GENERATED_VALUE_PROPERTY) { + private PropertyValueModel<GeneratedValue> buildGeneratorValueHolder() { + return new PropertyAspectAdapter<IdMapping, GeneratedValue>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override - protected IGeneratedValue buildValue_() { + protected GeneratedValue buildValue_() { return subject().getGeneratedValue(); } }; } - private EnumFormComboViewer<IGeneratedValue, GenerationType> buildStrategyComboViewer(Composite parent) { + private EnumFormComboViewer<GeneratedValue, GenerationType> buildStrategyComboViewer(Composite parent) { - return new EnumFormComboViewer<IGeneratedValue, GenerationType>(this, buildGeneratorValueHolder(), parent) { + return new EnumFormComboViewer<GeneratedValue, GenerationType>(this, buildGeneratorValueHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IGeneratedValue.DEFAULT_STRATEGY_PROPERTY); - propertyNames.add(IGeneratedValue.SPECIFIED_STRATEGY_PROPERTY); + propertyNames.add(GeneratedValue.DEFAULT_STRATEGY_PROPERTY); + propertyNames.add(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY); } @Override @@ -192,17 +192,17 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> }; } - private void disengageListeners(IGeneratedValue generatedValue) { + private void disengageListeners(GeneratedValue generatedValue) { if (generatedValue != null) { generatedValue.removePropertyChangeListener( - IGeneratedValue.DEFAULT_GENERATOR_PROPERTY, + GeneratedValue.DEFAULT_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); generatedValue.removePropertyChangeListener( - IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, + GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); } @@ -212,12 +212,12 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * (non-Javadoc) */ @Override - protected void disengageListeners(IIdMapping subject) { + protected void disengageListeners(IdMapping subject) { super.disengageListeners(subject); if (subject != null) { subject.removePropertyChangeListener( - IIdMapping.GENERATED_VALUE_PROPERTY, + IdMapping.GENERATED_VALUE_PROPERTY, generatedValuePropertyChangeListener ); } @@ -232,17 +232,17 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> populateGeneratorNameCombo(); } - private void engageListeners(IGeneratedValue generatedValue) { + private void engageListeners(GeneratedValue generatedValue) { if (generatedValue != null) { generatedValue.addPropertyChangeListener( - IGeneratedValue.DEFAULT_GENERATOR_PROPERTY, + GeneratedValue.DEFAULT_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); generatedValue.addPropertyChangeListener( - IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, + GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); } @@ -252,12 +252,12 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * (non-Javadoc) */ @Override - protected void engageListeners(IIdMapping subject) { + protected void engageListeners(IdMapping subject) { super.engageListeners(subject); if (subject != null) { subject.addPropertyChangeListener( - IIdMapping.GENERATED_VALUE_PROPERTY, + IdMapping.GENERATED_VALUE_PROPERTY, generatedValuePropertyChangeListener ); } @@ -285,7 +285,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.GeneratedValueComposite_strategy, buildStrategyComboViewer(container), - IJpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY + JpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY ); // Generator Name widgets @@ -293,7 +293,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.GeneratedValueComposite_generatorName, buildGeneratorNameModifyListener(), - IJpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY + JpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY ); generatorNameCombo.add(JptUiMappingsMessages.TableComposite_defaultEmpty); @@ -304,7 +304,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> this.generatorNameCombo.setText(""); } else { - IGeneratedValue generatedValue = subject().getGeneratedValue(); + GeneratedValue generatedValue = subject().getGeneratedValue(); if (generatedValue == null) { this.generatorNameCombo.setText(""); @@ -332,8 +332,8 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> populateGeneratorName(); } - private IGeneratedValue retrieveGeneratedValue() { - IGeneratedValue generatedValue = subject().getGeneratedValue(); + private GeneratedValue retrieveGeneratedValue() { + GeneratedValue generatedValue = subject().getGeneratedValue(); if (generatedValue == null) { setPopulating(true); 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 0e5e1867b7..0da777930b 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 @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping + * @see IdMapping * @see GeneratedValueComposite * @see TableGeneratorComposite * @see SequenceGeneratorComposite @@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class GenerationComposite extends AbstractFormPane<IIdMapping> +public class GenerationComposite extends AbstractFormPane<IdMapping> { private WritablePropertyValueModel<Boolean> sequenceGeneratorExpansionStateHolder; private WritablePropertyValueModel<Boolean> tableGeneratorExpansionStateHolder; @@ -75,14 +75,14 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public GenerationComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GenerationComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent, false); } private WritablePropertyValueModel<Boolean> buildPrimaryKeyGenerationHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.GENERATED_VALUE_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getGeneratedValue() != null; @@ -102,7 +102,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> } private WritablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.SEQUENCE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getSequenceGenerator() != null; @@ -113,8 +113,8 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> if (value && (subject.getSequenceGenerator() == null)) { - ISequenceGenerator sequenceGenerator = subject.addSequenceGenerator(); - IGeneratedValue generatedValue = subject.getGeneratedValue(); + SequenceGenerator sequenceGenerator = subject.addSequenceGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); if ((generatedValue != null) && (generatedValue.getGenerator() != null)) @@ -130,7 +130,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> } private WritablePropertyValueModel<Boolean> buildTableGeneratorBooleanHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.TABLE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getTableGenerator() != null; @@ -141,8 +141,8 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> if (value && (subject.getTableGenerator() == null)) { - ITableGenerator tableGenerator = subject.addTableGenerator(); - IGeneratedValue generatedValue = subject.getGeneratedValue(); + TableGenerator tableGenerator = subject.addTableGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); if ((generatedValue != null) && (generatedValue.getGenerator() != null)) @@ -197,7 +197,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration, buildPrimaryKeyGenerationHolder(), - IJpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION + JpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION ); // Generated Value widgets @@ -234,7 +234,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_sequenceGenerator, buildSequenceGeneratorBooleanHolder(), - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR ); // Sequence Generator pane @@ -257,7 +257,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_tableGenerator, buildTableGeneratorBooleanHolder(), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR + JpaHelpContextIds.MAPPING_TABLE_GENERATOR ); new TableGeneratorComposite( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java index 8903b42105..276da650cc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IGenerator; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.core.context.IdMapping; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.StringTools; @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Text; /** * This is the generic pane for a generator. * - * @see IIdMapping - * @see IGenerator + * @see IdMapping + * @see Generator * @see SequenceGeneratorComposite - A sub-pane * @see TalbeGeneratorComposite - A sub-pane * @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Text; * @since 1.0 */ @SuppressWarnings("nls") -public abstract class GeneratorComposite<T extends IGenerator> extends AbstractFormPane<IIdMapping> +public abstract class GeneratorComposite<T extends Generator> extends AbstractFormPane<IdMapping> { private PropertyChangeListener generatorChangeListener; private PropertyValueModel<T> generatorHolder; @@ -49,7 +49,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF * @param parentPane The parent container of this one * @param parent The parent container */ - public GeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -83,7 +83,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF } private PropertyValueModel<T> buildGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, T>(getSubjectHolder(), propertyName()) { + return new PropertyAspectAdapter<IdMapping, T>(getSubjectHolder(), propertyName()) { @Override protected T buildValue_() { return GeneratorComposite.this.generator(subject); @@ -190,10 +190,10 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF * @return The <code>IGenerator</code> or <code>null</code> if it doesn't * exists */ - protected abstract T generator(IIdMapping subject); + protected abstract T generator(IdMapping subject); - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return subject() == null ? null : subject().jpaProject(); } @@ -211,12 +211,12 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF protected void installListeners(T generator) { if (generator != null) { - generator.addPropertyChangeListener(IGenerator.NAME_PROPERTY, this.namePropertyChangeListener); + generator.addPropertyChangeListener(Generator.NAME_PROPERTY, this.namePropertyChangeListener); } } private void populateNameViewer() { - IGenerator generator = this.generator(); + Generator generator = this.generator(); if (generator != null) { String name = generator.getName(); @@ -273,7 +273,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF protected void uninstallListeners(T generator) { if (generator != null) { - generator.removePropertyChangeListener(IGenerator.NAME_PROPERTY, this.namePropertyChangeListener); + generator.removePropertyChangeListener(Generator.NAME_PROPERTY, this.namePropertyChangeListener); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java index a6a3fae5af..bc675fd241 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -39,7 +39,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping + * @see IdMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see TemporalTypeComposite @@ -48,8 +48,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class IdMappingComposite extends AbstractFormPane<IIdMapping> - implements IJpaComposite<IIdMapping> +public class IdMappingComposite extends AbstractFormPane<IdMapping> + implements JpaComposite<IdMapping> { /** * Creates a new <code>IdMappingComposite</code>. @@ -58,17 +58,17 @@ public class IdMappingComposite extends AbstractFormPane<IIdMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public IdMappingComposite(PropertyValueModel<? extends IIdMapping> subjectHolder, + public IdMappingComposite(PropertyValueModel<? extends IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<? extends IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IIdMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<? extends Column> buildColumnHolder() { + return new TransformationPropertyValueModel<IdMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IIdMapping value) { + protected Column transform_(IdMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java index 11ff0d0c08..dc469bc9b3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java @@ -10,18 +10,18 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.DiscriminatorType; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; +import org.eclipse.jpt.core.context.DiscriminatorType; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.InheritanceType; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * @see ColumnCombo * @see EnumComboViewer @@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public class InheritanceComposite extends AbstractFormPane<IEntity> { +public class InheritanceComposite extends AbstractFormPane<Entity> { private CCombo discriminatorValueCombo; @@ -74,7 +74,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { * @param parentPane The parent container of this one * @param parent The parent container */ - public InheritanceComposite(AbstractFormPane<? extends IEntity> parentPane, + public InheritanceComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -87,9 +87,9 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public InheritanceComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public InheritanceComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -100,13 +100,13 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY); + propertyNames.add(Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY); + propertyNames.add(Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY); } - private ColumnCombo<IDiscriminatorColumn> buildColumnCombo(Composite container) { + private ColumnCombo<DiscriminatorColumn> buildColumnCombo(Composite container) { - return new ColumnCombo<IDiscriminatorColumn>( + return new ColumnCombo<DiscriminatorColumn>( this, buildDiscriminatorColumnHolder(), container) @@ -133,18 +133,18 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { }; } - private PropertyValueModel<IDiscriminatorColumn> buildDiscriminatorColumnHolder() { - return new TransformationPropertyValueModel<IEntity, IDiscriminatorColumn>(getSubjectHolder()) { + private PropertyValueModel<DiscriminatorColumn> buildDiscriminatorColumnHolder() { + return new TransformationPropertyValueModel<Entity, DiscriminatorColumn>(getSubjectHolder()) { @Override - protected IDiscriminatorColumn transform_(IEntity value) { + protected DiscriminatorColumn transform_(Entity value) { return value.getDiscriminatorColumn(); } }; } - private EnumFormComboViewer<IDiscriminatorColumn, DiscriminatorType> buildDiscriminatorTypeCombo(Composite container) { + private EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType> buildDiscriminatorTypeCombo(Composite container) { - return new EnumFormComboViewer<IDiscriminatorColumn, DiscriminatorType>( + return new EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType>( this, buildDiscriminatorColumnHolder(), container) @@ -152,8 +152,8 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IDiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE_PROPERTY); - propertyNames.add(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY); + propertyNames.add(DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE_PROPERTY); + propertyNames.add(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY); } @Override @@ -188,7 +188,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { } private PropertyValueModel<Boolean> buildDiscriminatorValueBooleanHolder() { - return new PropertyAspectAdapter<IEntity, Boolean>(getSubjectHolder(), IEntity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY) { + return new PropertyAspectAdapter<Entity, Boolean>(getSubjectHolder(), Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isDiscriminatorValueAllowed(); @@ -207,15 +207,15 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { }; } - private EnumFormComboViewer<IEntity, InheritanceType> buildStrategyCombo(Composite container) { + private EnumFormComboViewer<Entity, InheritanceType> buildStrategyCombo(Composite container) { - return new EnumFormComboViewer<IEntity, InheritanceType>(this, container) { + return new EnumFormComboViewer<Entity, InheritanceType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_INHERITANCE_STRATEGY_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_INHERITANCE_STRATEGY_PROPERTY); + propertyNames.add(Entity.DEFAULT_INHERITANCE_STRATEGY_PROPERTY); + propertyNames.add(Entity.SPECIFIED_INHERITANCE_STRATEGY_PROPERTY); } @Override @@ -251,7 +251,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { private void discriminatorValueChanged(String value) { - IEntity subject = subject(); + Entity subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedDiscriminatorValue() : null; // Check for null value @@ -317,7 +317,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.InheritanceComposite_strategy, buildStrategyCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY + JpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY ); // Column widgets @@ -325,7 +325,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.DiscriminatorColumnComposite_column, buildColumnCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN ); // Discriminator Type widgets @@ -333,7 +333,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType, buildDiscriminatorTypeCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE ); // Discrinator Value widgets @@ -341,7 +341,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.InheritanceComposite_discriminatorValue, buildDiscriminatorValueComboSelectionListener(), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE ); installDiscriminatorValueComboEnabler(discriminatorValueCombo); @@ -362,7 +362,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { private void populateDiscriminatorValueCombo() { - IEntity subject = subject(); + Entity subject = subject(); discriminatorValueCombo.removeAll(); if (subject == null) { @@ -403,8 +403,8 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IEntity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY || - propertyName == IEntity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) + if (propertyName == Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY || + propertyName == Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) { populateDiscriminatorValueCombo(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java index 8896e5ad68..b2946fea3f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -59,7 +59,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo return; } - IJoinColumn joinColumn = subject.getJoinColumn(); + JoinColumn joinColumn = subject.getJoinColumn(); // Add the default column name if one exists String defaultName = (joinColumn != null) ? joinColumn.getDefaultName() : null; @@ -75,7 +75,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo } // Populate the combo with the column names - IJoinTable joinTable = subject.getOwner(); + JoinTable joinTable = subject.getOwner(); if (joinTable != null) { Table joinDBTable = joinTable.dbTable(); @@ -115,7 +115,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo return; } - IJoinColumn joinColumn = subject.getJoinColumn(); + JoinColumn joinColumn = subject.getJoinColumn(); // Add the default column name if one exists String defaultReferencedColumnName = (joinColumn != null) ? joinColumn.getDefaultReferencedColumnName() : null; @@ -131,8 +131,8 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo } // Populate the combo with the column names - IRelationshipMapping relationshipMapping = subject.relationshipMapping(); - IEntity targetEntity = relationshipMapping.getResolvedTargetEntity(); + RelationshipMapping relationshipMapping = subject.relationshipMapping(); + Entity targetEntity = relationshipMapping.getResolvedTargetEntity(); if (targetEntity != null) { Table referencedDbTable = targetEntity.primaryDbTable(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java index 2b8742fa3b..fd5a1bda00 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -35,8 +35,8 @@ public class InverseJoinColumnInJoinTableDialog extends AbstractJoinColumnDialog * this state object is used to create a new one */ public InverseJoinColumnInJoinTableDialog(Shell parent, - IJoinTable joinTable, - IJoinColumn joinColumn) { + JoinTable joinTable, + JoinColumn joinColumn) { super(parent, joinTable, joinColumn); } @@ -67,15 +67,15 @@ public class InverseJoinColumnInJoinTableDialog extends AbstractJoinColumnDialog * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + protected JoinTable getOwner() { + return (JoinTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java index 7f6505d521..6e04c6d3fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java @@ -9,18 +9,18 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on a join * table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see InverseJoinColumnInJoinTableDialog * * @version 2.0 @@ -35,8 +35,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - public InverseJoinColumnInJoinTableStateObject(IJoinTable joinTable, - IJoinColumn joinColumn) { + public InverseJoinColumnInJoinTableStateObject(JoinTable joinTable, + JoinColumn joinColumn) { super(joinTable, joinColumn); } @@ -45,8 +45,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -61,8 +61,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * (non-Javadoc) */ @Override - public IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + public JoinTable getOwner() { + return (JoinTable) super.getOwner(); } /* @@ -70,7 +70,7 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS */ @Override public Table getReferencedNameTable() { - IEntity targetEntity = relationshipMapping().getResolvedTargetEntity(); + Entity targetEntity = relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; @@ -84,7 +84,7 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * * @return The owner of the join column to create or to edit */ - public IRelationshipMapping relationshipMapping() { + public RelationshipMapping relationshipMapping() { return getOwner().parent(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java index 97d68cb055..4ed789be27 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java @@ -13,17 +13,17 @@ import java.util.ArrayList; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.ISingleRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.SingleRelationshipMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -57,8 +57,8 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ISingleRelationshipMapping - * @see IJoinColumn + * @see SingleRelationshipMapping + * @see JoinColumn * @see ManyToOneMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane * @see JoinColumnInRelationshipMappingDialog @@ -66,9 +66,9 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 2.0 */ -public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMapping> +public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapping> { - private WritablePropertyValueModel<IJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<JoinColumn> joinColumnHolder; /** * Creates a new <code>JoinColumnComposite</code>. @@ -76,7 +76,7 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap * @param parentPane The parent container of this one * @param parent The parent container */ - public JoinColumnComposite(AbstractFormPane<? extends ISingleRelationshipMapping> parentPane, + public JoinColumnComposite(AbstractFormPane<? extends SingleRelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -89,9 +89,9 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public JoinColumnComposite(PropertyValueModel<? extends ISingleRelationshipMapping> subjectHolder, + public JoinColumnComposite(PropertyValueModel<? extends SingleRelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -106,10 +106,10 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap private void addJoinColumn(JoinColumnInRelationshipMappingStateObject stateObject) { - ISingleRelationshipMapping subject = subject(); + SingleRelationshipMapping subject = subject(); int index = subject.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = subject.addSpecifiedJoinColumn(index); + JoinColumn joinColumn = subject.addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -123,17 +123,17 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private PropertyValueModel<IJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<ISingleRelationshipMapping, IJoinColumn>(getSubjectHolder(), ISingleRelationshipMapping.DEFAULT_JOIN_COLUMN) { + private PropertyValueModel<JoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<SingleRelationshipMapping, JoinColumn>(getSubjectHolder(), SingleRelationshipMapping.DEFAULT_JOIN_COLUMN) { @Override - protected IJoinColumn buildValue_() { + protected JoinColumn buildValue_() { return subject.getDefaultJoinColumn(); } }; } - private ListValueModel<IJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<JoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<JoinColumn>(buildDefaultJoinColumnHolder()); } private PostExecution<JoinColumnInRelationshipMappingDialog> buildEditJoinColumnPostExecution() { @@ -146,11 +146,11 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private WritablePropertyValueModel<IJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IJoinColumn>(); + private WritablePropertyValueModel<JoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<JoinColumn>(); } - private String buildJoinColumnLabel(IJoinColumn joinColumn) { + private String buildJoinColumnLabel(JoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsDefault, @@ -217,39 +217,39 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListHolder() { - java.util.List<ListValueModel<IJoinColumn>> list = new ArrayList<ListValueModel<IJoinColumn>>(); + private ListValueModel<JoinColumn> buildJoinColumnsListHolder() { + java.util.List<ListValueModel<JoinColumn>> list = new ArrayList<ListValueModel<JoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IJoinColumn>, IJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<JoinColumn>, JoinColumn>(list); } private ILabelProvider buildJoinColumnsListLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - IJoinColumn joinColumn = (IJoinColumn) element; + JoinColumn joinColumn = (JoinColumn) element; return buildJoinColumnLabel(joinColumn); } }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IJoinColumn>(buildJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); + private ListValueModel<JoinColumn> buildJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<JoinColumn>(buildJoinColumnsListHolder(), + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); } private WritablePropertyValueModel<Boolean> buildOverrideDefaultJoinColumnHolder() { return new OverrideDefaultJoinColumnHolder(); } - private ListValueModel<IJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<ISingleRelationshipMapping, IJoinColumn>(getSubjectHolder(), ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST) { + private ListValueModel<JoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<SingleRelationshipMapping, JoinColumn>(getSubjectHolder(), SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IJoinColumn> listIterator_() { + protected ListIterator<JoinColumn> listIterator_() { return subject.specifiedJoinColumns(); } @@ -262,7 +262,7 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap private void editJoinColumn(ObjectListSelectionModel listSelectionModel) { - IJoinColumn joinColumn = (IJoinColumn) listSelectionModel.selectedValue(); + JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue(); JoinColumnInRelationshipMappingDialog dialog = new JoinColumnInRelationshipMappingDialog(shell(), subject(), joinColumn); @@ -299,21 +299,21 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap ); // Join Columns list pane - AddRemoveListPane<ISingleRelationshipMapping> joinColumnsListPane = - new AddRemoveListPane<ISingleRelationshipMapping>( + AddRemoveListPane<SingleRelationshipMapping> joinColumnsListPane = + new AddRemoveListPane<SingleRelationshipMapping>( this, groupPane, buildJoinColumnsAdapter(), buildJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installJoinColumnsListPaneEnabler(joinColumnsListPane); } - private void installJoinColumnsListPaneEnabler(AddRemoveListPane<ISingleRelationshipMapping> pane) { + private void installJoinColumnsListPaneEnabler(AddRemoveListPane<SingleRelationshipMapping> pane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), pane @@ -342,19 +342,19 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap setPopulating(true); try { - ISingleRelationshipMapping subject = subject(); + SingleRelationshipMapping subject = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = subject.getDefaultJoinColumn();//TODO could be null, disable override default check box? + JoinColumn defaultJoinColumn = subject.getDefaultJoinColumn();//TODO could be null, disable override default check box? if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = subject.addSpecifiedJoinColumn(0); + JoinColumn joinColumn = subject.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java index 95c423bb53..7ccbfe2b2d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell; /** * The abstract definition of the dialog used to edit an <code>IJoinColumn</code>. * - * @see IJoinColumn + * @see JoinColumn * @see JoinColumnStateObject * @see JoinColumnDialogPane * @@ -34,7 +34,7 @@ public abstract class JoinColumnDialog<T extends JoinColumnStateObject> extends * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - public JoinColumnDialog(Shell parent, Object owner, IJoinColumn joinColumn) { + public JoinColumnDialog(Shell parent, Object owner, JoinColumn joinColumn) { super(parent, owner, joinColumn); } @@ -50,7 +50,7 @@ public abstract class JoinColumnDialog<T extends JoinColumnStateObject> extends * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java index f6afeff467..70807107f9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -223,7 +223,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum container, JptUiMappingsMessages.JoinColumnDialog_table, buildTableComboSelectionListener(), - IJpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN + JpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN ); // Insertable check box @@ -232,7 +232,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum JptUiMappingsMessages.JoinColumnDialog_insertable, buildInsertableHolder(), buildInsertableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE + JpaHelpContextIds.MAPPING_COLUMN_INSERTABLE ); // Updatable check box @@ -241,7 +241,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum JptUiMappingsMessages.JoinColumnDialog_updatable, buildUpdatableHolder(), buildUpdatableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_UPDATABLE + JpaHelpContextIds.MAPPING_COLUMN_UPDATABLE ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java index 42ddf7c522..c1ec3e43e6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.swt.widgets.Shell; /** * This dialog is used to either create or edit a joing column that is located * on an association override. * - * @see IJoinColumn - * @see IAssociationOverride + * @see JoinColumn + * @see AssociationOverride * @see JoinColumnInAssociationOverrideStateObject * @see JoinColumnDialogPane * @@ -36,8 +36,8 @@ public class JoinColumnInAssociationOverrideDialog extends JoinColumnDialog<Join * used to create a new one */ public JoinColumnInAssociationOverrideDialog(Shell parent, - IAssociationOverride associationOverride, - IJoinColumn joinColumn) { + AssociationOverride associationOverride, + JoinColumn joinColumn) { super(parent, associationOverride, joinColumn); } @@ -57,7 +57,7 @@ public class JoinColumnInAssociationOverrideDialog extends JoinColumnDialog<Join * (non-Javadoc) */ @Override - protected IAssociationOverride getOwner() { - return (IAssociationOverride) super.getOwner(); + protected AssociationOverride getOwner() { + return (AssociationOverride) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java index 21b3199eff..d549323f8a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -30,8 +30,8 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public JoinColumnInAssociationOverrideStateObject(IAssociationOverride associationOverride, - IJoinColumn joinColumn) { + public JoinColumnInAssociationOverrideStateObject(AssociationOverride associationOverride, + JoinColumn joinColumn) { super(associationOverride, joinColumn); } @@ -59,8 +59,8 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * (non-Javadoc) */ @Override - public IAssociationOverride getOwner() { - return (IAssociationOverride) super.getOwner(); + public AssociationOverride getOwner() { + return (AssociationOverride) super.getOwner(); } /* @@ -69,14 +69,14 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO @Override public Table getReferencedNameTable() { - IAssociationOverride associationOverride = getOwner(); - IRelationshipMapping relationshipMapping = associationOverride.owner().relationshipMapping(associationOverride.getName()); + AssociationOverride associationOverride = getOwner(); + RelationshipMapping relationshipMapping = associationOverride.owner().relationshipMapping(associationOverride.getName()); if (relationshipMapping == null){ return null; } - IEntity targetEntity = relationshipMapping.getResolvedTargetEntity(); + Entity targetEntity = relationshipMapping.getResolvedTargetEntity(); if (targetEntity != null) { return targetEntity.primaryDbTable(); @@ -98,7 +98,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * * @return The owner of the join column to create or to edit */ - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return getOwner().owner().typeMapping(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java index b197b3635f..56f22d92f4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -19,8 +19,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is located * on a join table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see JoinColumnInJoinTableStateObject * @see AbstractJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class JoinColumnInJoinTableDialog extends AbstractJoinColumnDialog<JoinCo * this state object is used to create a new one */ public JoinColumnInJoinTableDialog(Shell parent, - IJoinTable joinTable, - IJoinColumn joinColumn) { + JoinTable joinTable, + JoinColumn joinColumn) { super(parent, joinTable, joinColumn); } @@ -70,15 +70,15 @@ public class JoinColumnInJoinTableDialog extends AbstractJoinColumnDialog<JoinCo * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + protected JoinTable getOwner() { + return (JoinTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java index 506e9921c2..9b033eb236 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java @@ -9,17 +9,17 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on a * joint table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see InverseJoinColumnDialog * @see InverseJoinColumnDialogPane * @see JoinColumnInJoinTableDialog @@ -35,8 +35,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * @param joinTable The owner of the join column to create or to edit * @param joinColumn The join column to edit */ - public JoinColumnInJoinTableStateObject(IJoinTable joinTable, - IJoinColumn joinColumn) { + public JoinColumnInJoinTableStateObject(JoinTable joinTable, + JoinColumn joinColumn) { super(joinTable, joinColumn); } @@ -44,8 +44,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * (non-Javadoc) */ @Override - public IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + public JoinTable getOwner() { + return (JoinTable) super.getOwner(); } /* @@ -77,7 +77,7 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * * @return The parent of the join table */ - public IRelationshipMapping relationshipMapping() { + public RelationshipMapping relationshipMapping() { return getOwner().parent(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java index 657cb2df13..8784d8f36c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.swt.widgets.Shell; /** * This dialog is used to either create or edit a joing column that is located * on a relational mapping. * - * @see IJoinColumn - * @see IRelationshipMapping + * @see JoinColumn + * @see RelationshipMapping * @see JoinColumnInRelationshipMappingStateObject * @see JoinColumnDialogPane * @@ -37,8 +37,8 @@ public class JoinColumnInRelationshipMappingDialog extends JoinColumnDialog<Join * used to create a new one */ JoinColumnInRelationshipMappingDialog(Shell parent, - IRelationshipMapping relationshipMapping, - IJoinColumn joinColumn) { + RelationshipMapping relationshipMapping, + JoinColumn joinColumn) { super(parent, relationshipMapping, joinColumn); } @@ -58,7 +58,7 @@ public class JoinColumnInRelationshipMappingDialog extends JoinColumnDialog<Join * (non-Javadoc) */ @Override - protected IRelationshipMapping getOwner() { - return (IRelationshipMapping) super.getOwner(); + protected RelationshipMapping getOwner() { + return (RelationshipMapping) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java index ab1ded8f47..7caee0ee73 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -19,8 +19,8 @@ import org.eclipse.jpt.db.internal.Table; * The state object used to create or edit a primary key join column on a * relationship mapping. * - * @see IJoinColumn - * @see IRelationshipMapping + * @see JoinColumn + * @see RelationshipMapping * @see JoinColumnInRelationshipMappingDialog * * @version 2.0 @@ -35,8 +35,8 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public JoinColumnInRelationshipMappingStateObject(IRelationshipMapping relationshipMapping, - IJoinColumn joinColumn) { + public JoinColumnInRelationshipMappingStateObject(RelationshipMapping relationshipMapping, + JoinColumn joinColumn) { super(relationshipMapping, joinColumn); } @@ -46,7 +46,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO @Override public String defaultTableName() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultTable(); @@ -68,8 +68,8 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO * (non-Javadoc) */ @Override - public IRelationshipMapping getOwner() { - return (IRelationshipMapping) super.getOwner(); + public RelationshipMapping getOwner() { + return (RelationshipMapping) super.getOwner(); } /* @@ -77,7 +77,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO */ @Override public Table getReferencedNameTable() { - IEntity targetEntity = getOwner().getResolvedTargetEntity(); + Entity targetEntity = getOwner().getResolvedTargetEntity(); if (targetEntity != null) { return targetEntity.primaryDbTable(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java index ae29565024..05cf4079cf 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -35,7 +35,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * @param owner The owner of the join column to create or where it is located * @param joinColumn The join column to edit */ - public JoinColumnStateObject(Object owner, IJoinColumn joinColumn) { + public JoinColumnStateObject(Object owner, JoinColumn joinColumn) { super(owner, joinColumn); } @@ -43,7 +43,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public Boolean getDefaultInsertable() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultInsertable(); @@ -54,7 +54,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public Boolean getDefaultUpdatable() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultUpdatable(); @@ -71,8 +71,8 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -106,12 +106,12 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec */ @Override protected void initialize(Object owner, - IAbstractJoinColumn abstractJoinColumn) { + AbstractJoinColumn abstractJoinColumn) { super.initialize(owner, abstractJoinColumn); if (abstractJoinColumn != null) { - IJoinColumn joinColumn = (IJoinColumn) abstractJoinColumn; + JoinColumn joinColumn = (JoinColumn) abstractJoinColumn; table = joinColumn.getSpecifiedTable(); insertable = joinColumn.getSpecifiedInsertable(); @@ -139,7 +139,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public String specifiedTableName() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getSpecifiedTable(); @@ -156,11 +156,11 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * (non-Javadoc) */ @Override - public void updateJoinColumn(IAbstractJoinColumn abstractJoinColumn) { + public void updateJoinColumn(AbstractJoinColumn abstractJoinColumn) { super.updateJoinColumn(abstractJoinColumn); - IJoinColumn joinColumn = (IJoinColumn) abstractJoinColumn; + JoinColumn joinColumn = (JoinColumn) abstractJoinColumn; // Table if (valuesAreDifferent(table, joinColumn.getSpecifiedTable())) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java index 3f4fd56b20..67dbcc2ec9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java @@ -13,15 +13,15 @@ import java.util.ArrayList; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T> +public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T> { /** * The editor used to perform the common behaviors defined in the list pane. @@ -115,7 +115,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T */ public JoinColumnsComposite(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory, + WidgetFactory widgetFactory, IJoinColumnsEditor<T> joinColumnsEditor) { super(subjectHolder, parent, widgetFactory); @@ -123,11 +123,11 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T initializeLayout2(); } - private WritablePropertyValueModel<IJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IJoinColumn>(); + private WritablePropertyValueModel<JoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<JoinColumn>(); } - private String buildJoinColumnLabel(IJoinColumn joinColumn) { + private String buildJoinColumnLabel(JoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( @@ -187,7 +187,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T @Override public void optionOnSelection(ObjectListSelectionModel listSelectionModel) { - IJoinColumn joinColumn = (IJoinColumn) listSelectionModel.selectedValue(); + JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue(); joinColumnsEditor.editJoinColumn(subject(), joinColumn); } @@ -197,25 +197,25 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IJoinColumn>(buildJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); + private ListValueModel<JoinColumn> buildJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<JoinColumn>(buildJoinColumnsListHolder(), + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); } - private ListValueModel<IJoinColumn> buildJoinColumnsListHolder() { - java.util.List<ListValueModel<IJoinColumn>> list = new ArrayList<ListValueModel<IJoinColumn>>(); + private ListValueModel<JoinColumn> buildJoinColumnsListHolder() { + java.util.List<ListValueModel<JoinColumn>> list = new ArrayList<ListValueModel<JoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IJoinColumn>, IJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<JoinColumn>, JoinColumn>(list); } - private ListValueModel<IJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<T, IJoinColumn>(getSubjectHolder(), joinColumnsEditor.specifiedListPropertyName()) { + private ListValueModel<JoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<T, JoinColumn>(getSubjectHolder(), joinColumnsEditor.specifiedListPropertyName()) { @Override - protected ListIterator<IJoinColumn> listIterator_() { + protected ListIterator<JoinColumn> listIterator_() { return joinColumnsEditor.specifiedJoinColumns(subject); } @@ -227,15 +227,15 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T } - private ListValueModel<IJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<JoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<JoinColumn>(buildDefaultJoinColumnHolder()); } - private PropertyValueModel<IJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<T, IJoinColumn>(getSubjectHolder(), joinColumnsEditor.defaultPropertyName()) { + private PropertyValueModel<JoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<T, JoinColumn>(getSubjectHolder(), joinColumnsEditor.defaultPropertyName()) { @Override - protected IJoinColumn buildValue_() { + protected JoinColumn buildValue_() { return joinColumnsEditor.defaultJoinColumn(subject); } }; @@ -246,7 +246,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T return new LabelProvider() { @Override public String getText(Object element) { - IJoinColumn joinColumn = (IJoinColumn) element; + JoinColumn joinColumn = (JoinColumn) element; return buildJoinColumnLabel(joinColumn); } @@ -279,7 +279,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T buildJoinColumnsListModel(), buildJoinColumnHolder(), buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); } @@ -289,11 +289,11 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T public static interface IJoinColumnsEditor<T> { void addJoinColumn(T subject); - void editJoinColumn(T subject, IJoinColumn joinColumn); + void editJoinColumn(T subject, JoinColumn joinColumn); boolean hasSpecifiedJoinColumns(T subject); - ListIterator<IJoinColumn> specifiedJoinColumns(T subject); + ListIterator<JoinColumn> specifiedJoinColumns(T subject); int specifiedJoinColumnsSize(T subject); - IJoinColumn defaultJoinColumn(T subject); + JoinColumn defaultJoinColumn(T subject); String specifiedListPropertyName(); String defaultPropertyName(); void removeJoinColumns(T subject, int[] selectedIndices); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java index af8a04405b..89e65905fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java @@ -12,17 +12,16 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.ITable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.IJoinColumnsEditor; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -66,7 +65,7 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IJoinTable + * @see JoinTable * @see OneToManyMappingComposite - A container of this pane * @see ManyToManyMappingComposite - A container of this pane * @see JoinColumnsComposite @@ -74,10 +73,10 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 1.0 */ -public class JoinTableComposite extends AbstractFormPane<IJoinTable> +public class JoinTableComposite extends AbstractFormPane<JoinTable> { - private JoinColumnsComposite<IJoinTable> inverseJoinColumnsComposite; - private JoinColumnsComposite<IJoinTable> joinColumnsComposite; + private JoinColumnsComposite<JoinTable> inverseJoinColumnsComposite; + private JoinColumnsComposite<JoinTable> joinColumnsComposite; private Button overrideDefaultInverseJoinColumnsCheckBox; private Button overrideDefaultJoinColumnsCheckBox; @@ -89,7 +88,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> * @param parent The parent container */ public JoinTableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IJoinTable> subjectHolder, + PropertyValueModel<? extends JoinTable> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent, false); @@ -102,14 +101,14 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public JoinTableComposite(PropertyValueModel<? extends IJoinTable> subjectHolder, + public JoinTableComposite(PropertyValueModel<? extends JoinTable> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private void addInverseJoinColumn(IJoinTable joinTable) { + private void addInverseJoinColumn(JoinTable joinTable) { InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(shell(), joinTable, null); @@ -119,14 +118,14 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> private void addInverseJoinColumnFromDialog(InverseJoinColumnInJoinTableStateObject stateObject) { - IJoinTable subject = subject(); + JoinTable subject = subject(); int index = subject.specifiedInverseJoinColumnsSize(); - IJoinColumn joinColumn = subject.addSpecifiedInverseJoinColumn(index); + JoinColumn joinColumn = subject.addSpecifiedInverseJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } - private void addJoinColumn(IJoinTable joinTable) { + private void addJoinColumn(JoinTable joinTable) { JoinColumnInJoinTableDialog dialog = new JoinColumnInJoinTableDialog(shell(), joinTable, null); @@ -136,10 +135,10 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> private void addJoinColumnFromDialog(JoinColumnInJoinTableStateObject stateObject) { - IJoinTable subject = subject(); + JoinTable subject = subject(); int index = subject.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = subject().addSpecifiedJoinColumn(index); + JoinColumn joinColumn = subject().addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -217,15 +216,15 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return buildSubPane(container, 0, groupBoxMargin, 10, groupBoxMargin); } - private TableCombo<IJoinTable> buildTableCombo(Composite container) { + private TableCombo<JoinTable> buildTableCombo(Composite container) { - return new TableCombo<IJoinTable>(this, container) { + return new TableCombo<JoinTable>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_NAME_PROPERTY); - propertyNames.add(ITable.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Table.DEFAULT_NAME_PROPERTY); + propertyNames.add(Table.SPECIFIED_NAME_PROPERTY); } @Override @@ -239,7 +238,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> } @Override - protected Table table() { + protected org.eclipse.jpt.db.internal.Table table() { return subject().dbTable(); } @@ -272,7 +271,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> protected void doPopulate() { super.doPopulate(); - IJoinTable subject = subject(); + JoinTable subject = subject(); boolean enabled = (subject != null) && subject.containsSpecifiedJoinColumns(); boolean inverseEnabled = (subject != null) && subject.containsSpecifiedInverseJoinColumns(); @@ -283,7 +282,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> inverseJoinColumnsComposite.enableWidgets(inverseEnabled); } - private void editInverseJoinColumn(IJoinColumn joinColumn) { + private void editInverseJoinColumn(JoinColumn joinColumn) { InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(shell(), subject(), joinColumn); @@ -291,7 +290,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> dialog.openDialog(buildEditInverseJoinColumnPostExecution()); } - private void editJoinColumn(IJoinColumn joinColumn) { + private void editJoinColumn(JoinColumn joinColumn) { JoinColumnInJoinTableDialog dialog = new JoinColumnInJoinTableDialog(shell(), subject(), joinColumn); @@ -316,13 +315,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> int groupBoxMargin = groupBoxMargin(); // Name widgets - TableCombo<IJoinTable> tableCombo = buildTableCombo(container); + TableCombo<JoinTable> tableCombo = buildTableCombo(container); buildLabeledComposite( buildPane(container, groupBoxMargin), JptUiMappingsMessages.JoinTableComposite_name, tableCombo.getControl(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_NAME + JpaHelpContextIds.MAPPING_JOIN_TABLE_NAME ); // Join Columns group pane @@ -342,7 +341,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> buildOverrideDefaultSelectionListener() ); - joinColumnsComposite = new JoinColumnsComposite<IJoinTable>( + joinColumnsComposite = new JoinColumnsComposite<JoinTable>( this, joinColumnGroupPane, buildJoinColumnsEditor() @@ -365,7 +364,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> buildOverrideDefaultInverseSelectionListener() ); - inverseJoinColumnsComposite = new JoinColumnsComposite<IJoinTable>( + inverseJoinColumnsComposite = new JoinColumnsComposite<JoinTable>( this, inverseJoinColumnGroupPane, buildInverseJoinColumnsEditor() @@ -378,7 +377,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return; } - IJoinTable joinTable = subject(); + JoinTable joinTable = subject(); boolean selected = overrideDefaultInverseJoinColumnsCheckBox.getSelection(); inverseJoinColumnsComposite.enableWidgets(selected); setPopulating(true); @@ -388,13 +387,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = joinTable.getDefaultInverseJoinColumn(); //TODO null check, override default button disabled + JoinColumn defaultJoinColumn = joinTable.getDefaultInverseJoinColumn(); //TODO null check, override default button disabled if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = joinTable.addSpecifiedInverseJoinColumn(0); + JoinColumn joinColumn = joinTable.addSpecifiedInverseJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); } @@ -416,7 +415,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return; } - IJoinTable joinTable = subject(); + JoinTable joinTable = subject(); boolean selected = overrideDefaultJoinColumnsCheckBox.getSelection(); joinColumnsComposite.enableWidgets(selected); setPopulating(true); @@ -426,13 +425,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = joinTable.getDefaultJoinColumn(); //TODO null check, override default button disabled + JoinColumn defaultJoinColumn = joinTable.getDefaultJoinColumn(); //TODO null check, override default button disabled if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); + JoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); } @@ -448,85 +447,85 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> } } - private class InverseJoinColumnsProvider implements IJoinColumnsEditor<IJoinTable> { + private class InverseJoinColumnsProvider implements IJoinColumnsEditor<JoinTable> { - public void addJoinColumn(IJoinTable subject) { + public void addJoinColumn(JoinTable subject) { JoinTableComposite.this.addInverseJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IJoinTable subject) { + public JoinColumn defaultJoinColumn(JoinTable subject) { return subject.getDefaultInverseJoinColumn(); } public String defaultPropertyName() { - return IJoinTable.DEFAULT_INVERSE_JOIN_COLUMN; + return JoinTable.DEFAULT_INVERSE_JOIN_COLUMN; } - public void editJoinColumn(IJoinTable subject, IJoinColumn joinColumn) { + public void editJoinColumn(JoinTable subject, JoinColumn joinColumn) { JoinTableComposite.this.editInverseJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IJoinTable subject) { + public boolean hasSpecifiedJoinColumns(JoinTable subject) { return subject.containsSpecifiedInverseJoinColumns(); } - public void removeJoinColumns(IJoinTable subject, int[] selectedIndices) { + public void removeJoinColumns(JoinTable subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedInverseJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IJoinTable subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(JoinTable subject) { return subject.specifiedInverseJoinColumns(); } - public int specifiedJoinColumnsSize(IJoinTable subject) { + public int specifiedJoinColumnsSize(JoinTable subject) { return subject.specifiedInverseJoinColumnsSize(); } public String specifiedListPropertyName() { - return IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; + return JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; } } - private class JoinColumnsProvider implements IJoinColumnsEditor<IJoinTable> { + private class JoinColumnsProvider implements IJoinColumnsEditor<JoinTable> { - public void addJoinColumn(IJoinTable subject) { + public void addJoinColumn(JoinTable subject) { JoinTableComposite.this.addJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IJoinTable subject) { + public JoinColumn defaultJoinColumn(JoinTable subject) { return subject.getDefaultJoinColumn(); } public String defaultPropertyName() { - return IJoinTable.DEFAULT_JOIN_COLUMN; + return JoinTable.DEFAULT_JOIN_COLUMN; } - public void editJoinColumn(IJoinTable subject, IJoinColumn joinColumn) { + public void editJoinColumn(JoinTable subject, JoinColumn joinColumn) { JoinTableComposite.this.editJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IJoinTable subject) { + public boolean hasSpecifiedJoinColumns(JoinTable subject) { return subject.containsSpecifiedJoinColumns(); } - public void removeJoinColumns(IJoinTable subject, int[] selectedIndices) { + public void removeJoinColumns(JoinTable subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IJoinTable subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(JoinTable subject) { return subject.specifiedJoinColumns(); } - public int specifiedJoinColumnsSize(IJoinTable subject) { + public int specifiedJoinColumnsSize(JoinTable subject) { return subject.specifiedJoinColumnsSize(); } public String specifiedListPropertyName() { - return IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST; + return JoinTable.SPECIFIED_JOIN_COLUMNS_LIST; } } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java index 7c6bf3eaf9..b5bde2894d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java @@ -8,11 +8,11 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -20,12 +20,12 @@ import org.eclipse.swt.widgets.Composite; /** * This composite simply shows the Lob check box. * - * @see IBasicMapping + * @see BasicMapping * * @version 2.0 * @since 1.0 */ -public class LobComposite extends AbstractFormPane<IBasicMapping> +public class LobComposite extends AbstractFormPane<BasicMapping> { /** * Creates a new <code>LobComposite</code>. @@ -33,7 +33,7 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public LobComposite(AbstractFormPane<? extends IBasicMapping> parentPane, + public LobComposite(AbstractFormPane<? extends BasicMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -46,16 +46,16 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public LobComposite(PropertyValueModel<? extends IBasicMapping> subjectHolder, + public LobComposite(PropertyValueModel<? extends BasicMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyAspectAdapter<IBasicMapping, Boolean> buildLobHolder() { + private PropertyAspectAdapter<BasicMapping, Boolean> buildLobHolder() { - return new PropertyAspectAdapter<IBasicMapping, Boolean>(getSubjectHolder(), IBasicMapping.LOB_PROPERTY) { + return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), BasicMapping.LOB_PROPERTY) { @Override protected Boolean buildValue_() { @@ -79,7 +79,7 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> container, JptUiMappingsMessages.BasicGeneralSection_lobLabel, buildLobHolder(), - IJpaHelpContextIds.MAPPING_LOB + JpaHelpContextIds.MAPPING_LOB ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java index 75d87c3c10..46edd1a902 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -52,7 +52,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IManyToManyMapping + * @see ManyToManyMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -63,8 +63,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class ManyToManyMappingComposite extends AbstractFormPane<IManyToManyMapping> - implements IJpaComposite<IManyToManyMapping> +public class ManyToManyMappingComposite extends AbstractFormPane<ManyToManyMapping> + implements JpaComposite<ManyToManyMapping> { /** * Creates a new <code>ManyToManyMappingComposite</code>. @@ -73,26 +73,26 @@ public class ManyToManyMappingComposite extends AbstractFormPane<IManyToManyMapp * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ManyToManyMappingComposite(PropertyValueModel<? extends IManyToManyMapping> subjectHolder, + public ManyToManyMappingComposite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IManyToManyMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<ManyToManyMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IManyToManyMapping value) { + protected Cascade transform_(ManyToManyMapping value) { return value.getCascade(); } }; } - private PropertyValueModel<IJoinTable> buildJointTableHolder() { - return new TransformationPropertyValueModel<IManyToManyMapping, IJoinTable>(getSubjectHolder()) { + private PropertyValueModel<JoinTable> buildJointTableHolder() { + return new TransformationPropertyValueModel<ManyToManyMapping, JoinTable>(getSubjectHolder()) { @Override - protected IJoinTable transform_(IManyToManyMapping value) { + protected JoinTable transform_(ManyToManyMapping value) { return value.getJoinTable(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java index bdea365d9c..c5d331cf3f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -49,7 +49,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IManyToOneMapping + * @see ManyToOneMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -60,8 +60,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class ManyToOneMappingComposite extends AbstractFormPane<IManyToOneMapping> - implements IJpaComposite<IManyToOneMapping> +public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping> + implements JpaComposite<ManyToOneMapping> { /** * Creates a new <code>ManyToOneMappingComposite</code>. @@ -70,17 +70,17 @@ public class ManyToOneMappingComposite extends AbstractFormPane<IManyToOneMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ManyToOneMappingComposite(PropertyValueModel<? extends IManyToOneMapping> subjectHolder, + public ManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IManyToOneMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<ManyToOneMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IManyToOneMapping value) { + protected Cascade transform_(ManyToOneMapping value) { return value.getCascade(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java index a0f56fcff1..5e1e29f54c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite; * | -------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see INonOwningMapping + * @see NonOwningMapping * @see ManyToManyMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane @@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Composite; * @since 1.0 */ @SuppressWarnings("nls") -public class MappedByComposite extends AbstractFormPane<INonOwningMapping> +public class MappedByComposite extends AbstractFormPane<NonOwningMapping> { private CCombo combo; @@ -55,7 +55,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public MappedByComposite(AbstractFormPane<? extends INonOwningMapping> parentPane, + public MappedByComposite(AbstractFormPane<? extends NonOwningMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -68,9 +68,9 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MappedByComposite(PropertyValueModel<? extends INonOwningMapping> subjectHolder, + public MappedByComposite(PropertyValueModel<? extends NonOwningMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -81,7 +81,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(INonOwningMapping.MAPPED_BY_PROPERTY); + propertyNames.add(NonOwningMapping.MAPPED_BY_PROPERTY); } private ModifyListener buildComboModifyListener() { @@ -148,7 +148,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> container, JptUiMappingsMessages.NonOwningMapping_mappedByLabel, buildComboModifyListener(), - IJpaHelpContextIds.MAPPING_MAPPED_BY + JpaHelpContextIds.MAPPING_MAPPED_BY ); combo.addFocusListener(buildFocusListener()); @@ -159,7 +159,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> combo.removeAll(); combo.add(JptUiMappingsMessages.NoneSelected); - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); if (subject != null) { Iterator<String> iter = subject.candidateMappedByAttributeNames(); @@ -179,7 +179,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == INonOwningMapping.MAPPED_BY_PROPERTY) { + if (propertyName == NonOwningMapping.MAPPED_BY_PROPERTY) { populateCombo(); } } @@ -194,7 +194,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> */ private void updateSelectedItem() { - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); String value = (subject != null) ? subject.getMappedBy() : null; if (value != null) { @@ -209,7 +209,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> private void valueChanged(String value) { - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); String oldValue = (subject != null) ? subject.getMappedBy() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java index 24ec4f562e..126a3028e4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java @@ -8,22 +8,22 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** - * @see IMappedSuperclass + * @see MappedSuperclass * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 2.0 */ -public class MappedSuperclassComposite extends AbstractFormPane<IMappedSuperclass> - implements IJpaComposite<IMappedSuperclass> +public class MappedSuperclassComposite extends AbstractFormPane<MappedSuperclass> + implements JpaComposite<MappedSuperclass> { /** * Creates a new <code>MappedSuperclassComposite</code>. @@ -32,7 +32,7 @@ public class MappedSuperclassComposite extends AbstractFormPane<IMappedSuperclas * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MappedSuperclassComposite(PropertyValueModel<? extends IMappedSuperclass> subjectHolder, + public MappedSuperclassComposite(PropertyValueModel<? extends MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java index 68939732b3..4d07681136 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -52,7 +52,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IOneToManyMapping + * @see OneToManyMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -63,8 +63,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class OneToManyMappingComposite extends AbstractFormPane<IOneToManyMapping> - implements IJpaComposite<IOneToManyMapping> +public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping> + implements JpaComposite<OneToManyMapping> { /** * Creates a new <code>OneToManyMappingComposite</code>. @@ -73,26 +73,26 @@ public class OneToManyMappingComposite extends AbstractFormPane<IOneToManyMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OneToManyMappingComposite(PropertyValueModel<? extends IOneToManyMapping> subjectHolder, + public OneToManyMappingComposite(PropertyValueModel<? extends OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IOneToManyMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<OneToManyMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IOneToManyMapping value) { + protected Cascade transform_(OneToManyMapping value) { return value.getCascade(); } }; } - private PropertyValueModel<IJoinTable> buildJointTableHolder() { - return new TransformationPropertyValueModel<IOneToManyMapping, IJoinTable>(getSubjectHolder()) { + private PropertyValueModel<JoinTable> buildJointTableHolder() { + return new TransformationPropertyValueModel<OneToManyMapping, JoinTable>(getSubjectHolder()) { @Override - protected IJoinTable transform_(IOneToManyMapping value) { + protected JoinTable transform_(OneToManyMapping value) { return value.getJoinTable(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java index d3f01e6e0b..bccd870a2a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -54,7 +54,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IOneToOneMapping + * @see OneToOneMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -66,8 +66,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class OneToOneMappingComposite extends AbstractFormPane<IOneToOneMapping> - implements IJpaComposite<IOneToOneMapping> +public class OneToOneMappingComposite extends AbstractFormPane<OneToOneMapping> + implements JpaComposite<OneToOneMapping> { /** * Creates a new <code>OneToOneMappingComposite</code>. @@ -76,17 +76,17 @@ public class OneToOneMappingComposite extends AbstractFormPane<IOneToOneMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OneToOneMappingComposite(PropertyValueModel<? extends IOneToOneMapping> subjectHolder, + public OneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IOneToOneMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<OneToOneMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IOneToOneMapping value) { + protected Cascade transform_(OneToOneMapping value) { return value.getCascade(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java index ee65ff8050..c57980fb9b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java @@ -8,8 +8,8 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; /** * This composite simply shows a tri-state check box for the Optional option. * - * @see IBasicMapping + * @see BasicMapping * @see BasicMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite; * @version 1.0 * @since 2.0 */ -public class OptionalComposite extends AbstractFormPane<INullable> +public class OptionalComposite extends AbstractFormPane<Nullable> { /** * Creates a new <code>OptionalComposite</code>. @@ -38,14 +38,14 @@ public class OptionalComposite extends AbstractFormPane<INullable> * @param parentPane The parent container of this one * @param parent The parent container */ - public OptionalComposite(AbstractFormPane<? extends INullable> parentPane, + public OptionalComposite(AbstractFormPane<? extends Nullable> parentPane, Composite parent) { super(parentPane, parent); } private WritablePropertyValueModel<Boolean> buildOptionalHolder() { - return new PropertyAspectAdapter<INullable, Boolean>(getSubjectHolder(), INullable.SPECIFIED_OPTIONAL_PROPERTY) { + return new PropertyAspectAdapter<Nullable, Boolean>(getSubjectHolder(), Nullable.SPECIFIED_OPTIONAL_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getSpecifiedOptional(); @@ -97,7 +97,7 @@ public class OptionalComposite extends AbstractFormPane<INullable> JptUiMappingsMessages.BasicGeneralSection_optionalLabel, buildOptionalHolder(), buildOptionalStringHolder(), - IJpaHelpContextIds.MAPPING_OPTIONAL + JpaHelpContextIds.MAPPING_OPTIONAL ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java index c6f02ed798..615fed0741 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.IMultiRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.MultiRelationshipMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.WritablePropertyValueModel; @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Text; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IMultiRelationshipMapping + * @see MultiRelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane * @@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Text; * @since 1.0 */ @SuppressWarnings("nls") -public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMapping> +public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping> { private Text customOrderingText; @@ -60,7 +60,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin * @param parentPane The parent container of this one * @param parent The parent container */ - public OrderingComposite(AbstractFormPane<? extends IMultiRelationshipMapping> parentPane, + public OrderingComposite(AbstractFormPane<? extends MultiRelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -73,9 +73,9 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OrderingComposite(PropertyValueModel<? extends IMultiRelationshipMapping> subjectHolder, + public OrderingComposite(PropertyValueModel<? extends MultiRelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -86,7 +86,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IMultiRelationshipMapping.ORDER_BY_PROPERTY); + propertyNames.add(MultiRelationshipMapping.ORDER_BY_PROPERTY); } private ModifyListener buildCustomTextModifyListener() { @@ -119,14 +119,14 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin Group orderByGroup = buildTitledPane( container, JptUiMappingsMessages.OrderByComposite_orderByGroup, - IJpaHelpContextIds.MAPPING_ORDER_BY); + JpaHelpContextIds.MAPPING_ORDER_BY); // No Ordering radio button buildRadioButton( buildSubPane(orderByGroup, 8), JptUiMappingsMessages.OrderByComposite_noOrdering, buildNoOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_NO_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_NO_ORDERING ); // Order by Primary Key radio button @@ -134,7 +134,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin orderByGroup, JptUiMappingsMessages.OrderByComposite_primaryKeyOrdering, buildPrimaryKeyOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_PRIMARY_KEY_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_PRIMARY_KEY_ORDERING ); // Custom Ordering radio button @@ -142,13 +142,13 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin orderByGroup, JptUiMappingsMessages.OrderByComposite_customOrdering, buildCustomOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_CUSTOM_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_CUSTOM_ORDERING ); // Custom Ordering text field customOrderingText = buildText( buildSubPane(orderByGroup, 0, 16), - IJpaHelpContextIds.MAPPING_ORDER_BY + JpaHelpContextIds.MAPPING_ORDER_BY ); customOrderingText.addModifyListener(buildCustomTextModifyListener()); @@ -160,7 +160,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildCustomOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.CUSTOM_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.CUSTOM_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isCustomOrdering()); @@ -174,7 +174,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildNoOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.NO_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.NO_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isNoOrdering()); @@ -188,7 +188,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildPrimaryKeyOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.PK_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.PK_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isPkOrdering()); @@ -217,7 +217,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IMultiRelationshipMapping.ORDER_BY_PROPERTY) { + if (propertyName == MultiRelationshipMapping.ORDER_BY_PROPERTY) { populateCustomOrdering(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java index 91abe9f711..92a2d5ceda 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java @@ -15,20 +15,20 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.IJoinColumnsEditor; import org.eclipse.jpt.ui.internal.util.ControlSwitcher; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -71,7 +71,7 @@ import org.eclipse.ui.part.PageBook; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * @see ColumnComposite * @see JoinColumnsComposite @@ -80,11 +80,11 @@ import org.eclipse.ui.part.PageBook; * @since 1.0 */ @SuppressWarnings("nls") -public class OverridesComposite extends AbstractFormPane<IEntity> +public class OverridesComposite extends AbstractFormPane<Entity> { private Composite columnPane; private Composite joinColumnsPane; - private WritablePropertyValueModel<IOverride> overrideHolder; + private WritablePropertyValueModel<BaseOverride> overrideHolder; /** * Creates a new <code>OverridesComposite</code>. @@ -92,7 +92,7 @@ public class OverridesComposite extends AbstractFormPane<IEntity> * @param parentPane The parent controller of this one * @param parent The parent container */ - public OverridesComposite(AbstractFormPane<? extends IEntity> parentPane, + public OverridesComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -105,14 +105,14 @@ public class OverridesComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OverridesComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public OverridesComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private void addJoinColumn(IAssociationOverride subject) { + private void addJoinColumn(AssociationOverride subject) { JoinColumnInAssociationOverrideDialog dialog = new JoinColumnInAssociationOverrideDialog(shell(), subject, null); @@ -122,10 +122,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> private void addJoinColumn(JoinColumnInAssociationOverrideStateObject stateObject) { - IAssociationOverride associationOverride = stateObject.getOwner(); + AssociationOverride associationOverride = stateObject.getOwner(); int index = associationOverride.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = associationOverride.addSpecifiedJoinColumn(index); + JoinColumn joinColumn = associationOverride.addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -139,37 +139,37 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private WritablePropertyValueModel<IAssociationOverride> buildAssociationOverrideHolder() { - return new TransformationWritablePropertyValueModel<IOverride, IAssociationOverride>(overrideHolder) { + private WritablePropertyValueModel<AssociationOverride> buildAssociationOverrideHolder() { + return new TransformationWritablePropertyValueModel<BaseOverride, AssociationOverride>(overrideHolder) { @Override - protected IAssociationOverride transform_(IOverride value) { - return (value instanceof IAssociationOverride) ? (IAssociationOverride) value : null; + protected AssociationOverride transform_(BaseOverride value) { + return (value instanceof AssociationOverride) ? (AssociationOverride) value : null; } }; } - private WritablePropertyValueModel<IAttributeOverride> buildAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IOverride, IAttributeOverride>(overrideHolder) { + private WritablePropertyValueModel<AttributeOverride> buildAttributeOverrideHolder() { + return new TransformationWritablePropertyValueModel<BaseOverride, AttributeOverride>(overrideHolder) { @Override - protected IAttributeOverride transform_(IOverride value) { - return (value instanceof IAttributeOverride) ? (IAttributeOverride) value : null; + protected AttributeOverride transform_(BaseOverride value) { + return (value instanceof AttributeOverride) ? (AttributeOverride) value : null; } }; } - private PropertyValueModel<IColumn> buildColumnHolder(PropertyValueModel<IAttributeOverride> attributeOverrideHolder) { - return new TransformationPropertyValueModel<IAttributeOverride, IColumn>(attributeOverrideHolder) { + private PropertyValueModel<Column> buildColumnHolder(PropertyValueModel<AttributeOverride> attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Column>(attributeOverrideHolder) { @Override - protected IColumn transform_(IAttributeOverride value) { + protected Column transform_(AttributeOverride value) { return value.getColumn(); } }; } - private ListValueModel<IAssociationOverride> buildDefaultAssociationOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAssociationOverride>(getSubjectHolder(), IEntity.DEFAULT_ASSOCIATION_OVERRIDES_LIST) { + private ListValueModel<AssociationOverride> buildDefaultAssociationOverridesListHolder() { + return new ListAspectAdapter<Entity, AssociationOverride>(getSubjectHolder(), Entity.DEFAULT_ASSOCIATION_OVERRIDES_LIST) { @Override - protected ListIterator<IAssociationOverride> listIterator_() { + protected ListIterator<AssociationOverride> listIterator_() { return subject.defaultAssociationOverrides(); } @@ -180,10 +180,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAttributeOverride> buildDefaultAttributeOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAttributeOverride>(getSubjectHolder(), IEntity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { + private ListValueModel<AttributeOverride> buildDefaultAttributeOverridesListHolder() { + return new ListAspectAdapter<Entity, AttributeOverride>(getSubjectHolder(), Entity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.defaultAttributeOverrides(); } @@ -209,41 +209,41 @@ public class OverridesComposite extends AbstractFormPane<IEntity> } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAssociationOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAssociationOverride, Boolean>(buildAssociationOverrideHolder()) { + return new TransformationWritablePropertyValueModel<AssociationOverride, Boolean>(buildAssociationOverrideHolder()) { @Override public void setValue(Boolean value) { updateAssociationOverride(value); } @Override - protected Boolean transform_(IAssociationOverride value) { + protected Boolean transform_(AssociationOverride value) { return !value.isVirtual(); } }; } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAttributeOverride, Boolean>(buildAttributeOverrideHolder()) { + return new TransformationWritablePropertyValueModel<AttributeOverride, Boolean>(buildAttributeOverrideHolder()) { @Override public void setValue(Boolean value) { updateAttributeOverride(value); } @Override - protected Boolean transform_(IAttributeOverride value) { + protected Boolean transform_(AttributeOverride value) { return !value.isVirtual(); } }; } - private String buildOverrideDisplayString(IOverride override) { + private String buildOverrideDisplayString(BaseOverride override) { - IEntity subject = subject(); + Entity subject = subject(); String overrideType; int index = 0; // Retrieve the index and type - if (override instanceof IAssociationOverride) { + if (override instanceof AssociationOverride) { index = CollectionTools.indexOf(subject.associationOverrides(), override); overrideType = JptUiMappingsMessages.OverridesComposite_association; } @@ -274,15 +274,15 @@ public class OverridesComposite extends AbstractFormPane<IEntity> return sb.toString(); } - private WritablePropertyValueModel<IOverride> buildOverrideHolder() { - return new SimplePropertyValueModel<IOverride>(); + private WritablePropertyValueModel<BaseOverride> buildOverrideHolder() { + return new SimplePropertyValueModel<BaseOverride>(); } private ILabelProvider buildOverrideLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - return buildOverrideDisplayString((IOverride) element); + return buildOverrideDisplayString((BaseOverride) element); } }; } @@ -299,31 +299,31 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IOverride> buildOverridesListHolder() { - List<ListValueModel<? extends IOverride>> list = new ArrayList<ListValueModel<? extends IOverride>>(); + private ListValueModel<BaseOverride> buildOverridesListHolder() { + List<ListValueModel<? extends BaseOverride>> list = new ArrayList<ListValueModel<? extends BaseOverride>>(); list.add(buildSpecifiedAttributeOverridesListHolder()); list.add(buildDefaultAttributeOverridesListHolder()); list.add(buildSpecifiedAssociationOverridesListHolder()); list.add(buildDefaultAssociationOverridesListHolder()); - return new CompositeListValueModel<ListValueModel<? extends IOverride>, IOverride>(list); + return new CompositeListValueModel<ListValueModel<? extends BaseOverride>, BaseOverride>(list); } - private ListValueModel<IOverride> buildOverridesListModel() { - return new ItemPropertyListValueModelAdapter<IOverride>( + private ListValueModel<BaseOverride> buildOverridesListModel() { + return new ItemPropertyListValueModelAdapter<BaseOverride>( buildOverridesListHolder(), - IOverride.NAME_PROPERTY + BaseOverride.NAME_PROPERTY ); } - private Transformer<IOverride, Control> buildPaneTransformer() { - return new Transformer<IOverride, Control>() { - public Control transform(IOverride override) { + private Transformer<BaseOverride, Control> buildPaneTransformer() { + return new Transformer<BaseOverride, Control>() { + public Control transform(BaseOverride override) { - if (override instanceof IAttributeOverride) { + if (override instanceof AttributeOverride) { return columnPane; } - if (override instanceof IAssociationOverride) { + if (override instanceof AssociationOverride) { return joinColumnsPane; } @@ -332,10 +332,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAssociationOverride> buildSpecifiedAssociationOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAssociationOverride>(getSubjectHolder(), IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST) { + private ListValueModel<AssociationOverride> buildSpecifiedAssociationOverridesListHolder() { + return new ListAspectAdapter<Entity, AssociationOverride>(getSubjectHolder(), Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST) { @Override - protected ListIterator<IAssociationOverride> listIterator_() { + protected ListIterator<AssociationOverride> listIterator_() { return subject.specifiedAssociationOverrides(); } @@ -346,10 +346,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAttributeOverride> buildSpecifiedAttributeOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAttributeOverride>(getSubjectHolder(), IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { + private ListValueModel<AttributeOverride> buildSpecifiedAttributeOverridesListHolder() { + return new ListAspectAdapter<Entity, AttributeOverride>(getSubjectHolder(), Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.specifiedAttributeOverrides(); } @@ -360,12 +360,12 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private void editJoinColumn(IJoinColumn joinColumn) { + private void editJoinColumn(JoinColumn joinColumn) { JoinColumnInAssociationOverrideDialog dialog = new JoinColumnInAssociationOverrideDialog( shell(), - (IAssociationOverride) overrideHolder.value(), + (AssociationOverride) overrideHolder.value(), joinColumn ); @@ -426,8 +426,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> ); // Join Columns list pane (for IOverrideAssociation) - JoinColumnsComposite<IAssociationOverride> joinColumnsComposite = - new JoinColumnsComposite<IAssociationOverride>( + JoinColumnsComposite<AssociationOverride> joinColumnsComposite = + new JoinColumnsComposite<AssociationOverride>( this, buildAssociationOverrideHolder(), joinColumnsGroupPane, @@ -461,16 +461,16 @@ public class OverridesComposite extends AbstractFormPane<IEntity> installOverrideControlSwitcher(overrideHolder, pageBook); } - private AddRemoveListPane<IEntity> initializeOverridesList(Composite container) { + private AddRemoveListPane<Entity> initializeOverridesList(Composite container) { - return new AddRemoveListPane<IEntity>( + return new AddRemoveListPane<Entity>( this, buildSubPane(container, 8), buildOverridesAdapter(), buildOverridesListModel(), overrideHolder, buildOverrideLabelProvider(), - IJpaHelpContextIds.ENTITY_ATTRIBUTE_OVERRIDES + JpaHelpContextIds.ENTITY_ATTRIBUTE_OVERRIDES ) { @Override @@ -490,14 +490,14 @@ public class OverridesComposite extends AbstractFormPane<IEntity> ); } - private void installJoinColumnsPaneEnabler(JoinColumnsComposite<IAssociationOverride> pane) { + private void installJoinColumnsPaneEnabler(JoinColumnsComposite<AssociationOverride> pane) { new PaneEnabler( buildOverrideDefaultAssociationOverrideHolder(), pane ); } - private void installOverrideControlSwitcher(PropertyValueModel<IOverride> overrideHolder, + private void installOverrideControlSwitcher(PropertyValueModel<BaseOverride> overrideHolder, PageBook pageBook) { new ControlSwitcher( @@ -509,18 +509,18 @@ public class OverridesComposite extends AbstractFormPane<IEntity> private void removeOverrides(ObjectListSelectionModel listSelectionModel) { - IEntity subject = subject(); + Entity subject = subject(); Object[] selectedItems = listSelectionModel.selectedValues(); for (int index = selectedItems.length; --index >= 0; ) { Object override = selectedItems[index]; - if (override instanceof IAttributeOverride) { - subject.removeSpecifiedAttributeOverride((IAttributeOverride) override); + if (override instanceof AttributeOverride) { + subject.removeSpecifiedAttributeOverride((AttributeOverride) override); } - else if (override instanceof IAssociationOverride) { - subject.removeSpecifiedAssociationOverride((IAssociationOverride) override); + else if (override instanceof AssociationOverride) { + subject.removeSpecifiedAssociationOverride((AssociationOverride) override); } } } @@ -534,13 +534,13 @@ public class OverridesComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); - IAssociationOverride override = (IAssociationOverride) overrideHolder.value(); + Entity subject = subject(); + AssociationOverride override = (AssociationOverride) overrideHolder.value(); // Add a new association override if (selected) { int index = subject.specifiedAssociationOverridesSize(); - IAssociationOverride associationOverride = subject.addSpecifiedAssociationOverride(index); + AssociationOverride associationOverride = subject.addSpecifiedAssociationOverride(index); associationOverride.setName(override.getName()); overrideHolder.setValue(associationOverride); @@ -551,8 +551,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> subject.removeSpecifiedAssociationOverride(override); // Select the default association override - for (Iterator<IAssociationOverride> iter = subject.defaultAssociationOverrides(); iter.hasNext(); ) { - IAssociationOverride associationOverride = iter.next(); + for (Iterator<AssociationOverride> iter = subject.defaultAssociationOverrides(); iter.hasNext(); ) { + AssociationOverride associationOverride = iter.next(); if (associationOverride.getName().equals(name)) { overrideHolder.setValue(associationOverride); @@ -575,13 +575,13 @@ public class OverridesComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); - IAttributeOverride override = (IAttributeOverride) overrideHolder.value(); + Entity subject = subject(); + AttributeOverride override = (AttributeOverride) overrideHolder.value(); // Add a new attribute override if (selected) { int index = subject.specifiedAttributeOverridesSize(); - IAttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); + AttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); attributeOverride.setName(override.getName()); attributeOverride.getColumn().setSpecifiedName(override.getColumn().getName()); @@ -593,8 +593,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> subject.removeSpecifiedAttributeOverride(override); // Select the default attribute override - for (Iterator<IAttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { - IAttributeOverride attributeOverride = iter.next(); + for (Iterator<AttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { + AttributeOverride attributeOverride = iter.next(); if (attributeOverride.getName().equals(name)) { overrideHolder.setValue(attributeOverride); @@ -608,44 +608,44 @@ public class OverridesComposite extends AbstractFormPane<IEntity> } } - private class JoinColumnsProvider implements IJoinColumnsEditor<IAssociationOverride> { + private class JoinColumnsProvider implements IJoinColumnsEditor<AssociationOverride> { - public void addJoinColumn(IAssociationOverride subject) { + public void addJoinColumn(AssociationOverride subject) { OverridesComposite.this.addJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IAssociationOverride subject) { + public JoinColumn defaultJoinColumn(AssociationOverride subject) { return null; } public String defaultPropertyName() { - return IAssociationOverride.DEFAULT_JOIN_COLUMNS_LIST; + return AssociationOverride.DEFAULT_JOIN_COLUMNS_LIST; } - public void editJoinColumn(IAssociationOverride subject, IJoinColumn joinColumn) { + public void editJoinColumn(AssociationOverride subject, JoinColumn joinColumn) { OverridesComposite.this.editJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IAssociationOverride subject) { + public boolean hasSpecifiedJoinColumns(AssociationOverride subject) { return subject.containsSpecifiedJoinColumns(); } - public void removeJoinColumns(IAssociationOverride subject, int[] selectedIndices) { + public void removeJoinColumns(AssociationOverride subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IAssociationOverride subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(AssociationOverride subject) { return subject.specifiedJoinColumns(); } - public int specifiedJoinColumnsSize(IAssociationOverride subject) { + public int specifiedJoinColumnsSize(AssociationOverride subject) { return subject.specifiedJoinColumnsSize(); } public String specifiedListPropertyName() { - return IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST; + return AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST; } } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java index c22ef92c41..87ced5dc3d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -18,8 +18,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is located * on an entity. * - * @see IPrimaryKeyJoinColumn - * @see IEntity + * @see PrimaryKeyJoinColumn + * @see Entity * @see PrimaryKeyJoinColumnStateObject * @see PrimaryKeyJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class PrimaryKeyJoinColumnDialog extends AbstractJoinColumnDialog<Primary * this state object is used to create a new one */ public PrimaryKeyJoinColumnDialog(Shell parent, - IEntity entity, - IPrimaryKeyJoinColumn joinColumn) { + Entity entity, + PrimaryKeyJoinColumn joinColumn) { super(parent, entity, joinColumn); } @@ -64,15 +64,15 @@ public class PrimaryKeyJoinColumnDialog extends AbstractJoinColumnDialog<Primary * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IEntity getOwner() { - return (IEntity) super.getOwner(); + protected Entity getOwner() { + return (Entity) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java index 218766b9ae..432fd144d2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -18,8 +18,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is within * a secondary table. * - * @see IPrimaryKeyJoinColumn - * @see ISecondaryTable + * @see PrimaryKeyJoinColumn + * @see SecondaryTable * @see PrimaryKeyJoinColumnInSecondaryTableStateObject * @see AbstractJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends AbstractJoinColu * this state object is used to create a new one */ public PrimaryKeyJoinColumnInSecondaryTableDialog(Shell parent, - ISecondaryTable secondaryTable, - IPrimaryKeyJoinColumn joinColumn) { + SecondaryTable secondaryTable, + PrimaryKeyJoinColumn joinColumn) { super(parent, secondaryTable, joinColumn); } @@ -70,15 +70,15 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends AbstractJoinColu * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected ISecondaryTable getOwner() { - return (ISecondaryTable) super.getOwner(); + protected SecondaryTable getOwner() { + return (SecondaryTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java index dc4cfbb82f..fbe09a28d5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on an * secondary table. * - * @see IPrimaryKeyJoinColumn - * @see ISecondaryTable + * @see PrimaryKeyJoinColumn + * @see SecondaryTable * @see PrimaryKeyJoinColumnInSecondaryTableDialog * * @version 2.0 @@ -34,8 +34,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * @param joinColumn The join column to edit or <code>null</code> if it is to * create a new one */ - public PrimaryKeyJoinColumnInSecondaryTableStateObject(ISecondaryTable secondaryTable, - IPrimaryKeyJoinColumn joinColumn) { + public PrimaryKeyJoinColumnInSecondaryTableStateObject(SecondaryTable secondaryTable, + PrimaryKeyJoinColumn joinColumn) { super(secondaryTable, joinColumn); } @@ -44,8 +44,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * (non-Javadoc) */ @Override - public ISecondaryTable getOwner() { - return (ISecondaryTable) super.getOwner(); + public SecondaryTable getOwner() { + return (SecondaryTable) super.getOwner(); } /* (non-Javadoc) diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java index 56d41e88b8..bb6de3483c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on an * entity. * - * @see IPrimaryKeyJoinColumn - * @see IEntity + * @see PrimaryKeyJoinColumn + * @see Entity * @see PrimaryKeyJoinColumnDialog * @see PrimaryKeyJoinColumnDialogPane * @@ -35,8 +35,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public PrimaryKeyJoinColumnStateObject(IEntity entity, - IPrimaryKeyJoinColumn joinColumn) { + public PrimaryKeyJoinColumnStateObject(Entity entity, + PrimaryKeyJoinColumn joinColumn) { super(entity, joinColumn); } @@ -44,8 +44,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * (non-Javadoc) */ @Override - public IEntity getOwner() { - return (IEntity) super.getOwner(); + public Entity getOwner() { + return (Entity) super.getOwner(); } /* diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java index cf110b150d..0c362f73d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java @@ -14,16 +14,16 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; @@ -58,15 +58,15 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see InheritanceComposite - The container of this pane * * @version 2.0 * @since 2.0 */ -public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> +public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<Entity> { - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder; /** * Creates a new <code>PrimaryKeyJoinColumnsComposite</code>. @@ -74,7 +74,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> * @param parentPane The parent controller of this one * @param parent The parent container */ - public PrimaryKeyJoinColumnsComposite(AbstractFormPane<? extends IEntity> subjectHolder, + public PrimaryKeyJoinColumnsComposite(AbstractFormPane<? extends Entity> subjectHolder, Composite parent) { super(subjectHolder, parent); @@ -87,19 +87,19 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public PrimaryKeyJoinColumnsComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public PrimaryKeyJoinColumnsComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } private void addJoinColumn(PrimaryKeyJoinColumnStateObject stateObject) { - IEntity subject = subject(); + Entity subject = subject(); int index = subject.specifiedPrimaryKeyJoinColumnsSize(); - IPrimaryKeyJoinColumn joinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(index); + PrimaryKeyJoinColumn joinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -124,17 +124,17 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> }; } - private PropertyValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<IEntity, IPrimaryKeyJoinColumn>(getSubjectHolder(), IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { + private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<Entity, PrimaryKeyJoinColumn>(getSubjectHolder(), Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { @Override - protected IPrimaryKeyJoinColumn buildValue_() { + protected PrimaryKeyJoinColumn buildValue_() { return subject.getDefaultPrimaryKeyJoinColumn(); } }; } - private ListValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IPrimaryKeyJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<PrimaryKeyJoinColumn>(buildDefaultJoinColumnHolder()); } @@ -148,11 +148,11 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> }; } - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IPrimaryKeyJoinColumn>(); + private WritablePropertyValueModel<PrimaryKeyJoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<PrimaryKeyJoinColumn>(); } - private String buildJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) { + private String buildJoinColumnLabel(PrimaryKeyJoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsDefault, @@ -216,7 +216,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) { int[] selectedIndices = listSelectionModel.selectedIndices(); - IEntity entity = subject(); + Entity entity = subject(); for (int index = selectedIndices.length; --index >= 0; ) { entity.removeSpecifiedPrimaryKeyJoinColumn(selectedIndices[index]); @@ -229,7 +229,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> return new LabelProvider() { @Override public String getText(Object element) { - return buildJoinColumnLabel((IPrimaryKeyJoinColumn) element); + return buildJoinColumnLabel((PrimaryKeyJoinColumn) element); } }; } @@ -238,27 +238,27 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> return new OverrideDefaultJoinColumnHolder(); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { - List<ListValueModel<IPrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<IPrimaryKeyJoinColumn>>(); + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { + List<ListValueModel<PrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<PrimaryKeyJoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IPrimaryKeyJoinColumn>, IPrimaryKeyJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<PrimaryKeyJoinColumn>, PrimaryKeyJoinColumn>(list); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildPrimaryKeyJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY ); } - private ListValueModel<IPrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<IEntity, IPrimaryKeyJoinColumn>(getSubjectHolder(), IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { + private ListValueModel<PrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<Entity, PrimaryKeyJoinColumn>(getSubjectHolder(), Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IPrimaryKeyJoinColumn> listIterator_() { + protected ListIterator<PrimaryKeyJoinColumn> listIterator_() { return subject.specifiedPrimaryKeyJoinColumns(); } @@ -275,7 +275,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> private void editPrimaryKeyJoinColumn(ObjectListSelectionModel listSelectionModel) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) listSelectionModel.selectedValue(); + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) listSelectionModel.selectedValue(); PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog( shell(), @@ -315,20 +315,20 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> ); // Primary Key Join Columns list pane - AddRemoveListPane<IEntity> joinColumnsListPane = new AddRemoveListPane<IEntity>( + AddRemoveListPane<Entity> joinColumnsListPane = new AddRemoveListPane<Entity>( this, groupPane, buildJoinColumnsAdapter(), buildPrimaryKeyJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installJoinColumnsListPaneEnabler(joinColumnsListPane); } - private void installJoinColumnsListPaneEnabler(AddRemoveListPane<IEntity> pane) { + private void installJoinColumnsListPaneEnabler(AddRemoveListPane<Entity> pane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), pane @@ -344,19 +344,19 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); + Entity subject = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IPrimaryKeyJoinColumn defaultJoinColumn = subject.getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn defaultJoinColumn = subject.getDefaultPrimaryKeyJoinColumn(); if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IPrimaryKeyJoinColumn pkJoinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(0); + PrimaryKeyJoinColumn pkJoinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(0); pkJoinColumn.setSpecifiedName(columnName); pkJoinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java index 1916a99fbe..c943313ecc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java @@ -14,11 +14,11 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.util.PaneEnabler; @@ -60,16 +60,16 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ISecondaryTable + * @see SecondaryTable * @see EntityComposite - The container of this pane * @see AddRemoveListPane * * @version 2.0 * @since 1.0 */ -public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractFormPane<ISecondaryTable> +public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractFormPane<SecondaryTable> { - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder; /** * Creates a new <code>PrimaryKeyJoinColumnsInSecondaryTableComposite</code>. @@ -79,7 +79,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm * @param parent The parent container */ public PrimaryKeyJoinColumnsInSecondaryTableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends ISecondaryTable> subjectHolder, + PropertyValueModel<? extends SecondaryTable> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -92,7 +92,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public PrimaryKeyJoinColumnsInSecondaryTableComposite(PropertyValueModel<? extends ISecondaryTable> subjectHolder, + public PrimaryKeyJoinColumnsInSecondaryTableComposite(PropertyValueModel<? extends SecondaryTable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -101,10 +101,10 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm private void addJoinColumn(PrimaryKeyJoinColumnInSecondaryTableStateObject stateObject) { - ISecondaryTable secondaryTable = stateObject.getOwner(); + SecondaryTable secondaryTable = stateObject.getOwner(); int index = secondaryTable.specifiedPrimaryKeyJoinColumnsSize(); - IPrimaryKeyJoinColumn joinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(index); + PrimaryKeyJoinColumn joinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -127,25 +127,25 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm } private PropertyValueModel<Boolean> buildControlBooleanHolder() { - return new TransformationPropertyValueModel<ISecondaryTable, Boolean>(getSubjectHolder()) { + return new TransformationPropertyValueModel<SecondaryTable, Boolean>(getSubjectHolder()) { @Override - protected Boolean transform(ISecondaryTable value) { + protected Boolean transform(SecondaryTable value) { return (value != null); } }; } - private PropertyValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<ISecondaryTable, IPrimaryKeyJoinColumn>(getSubjectHolder(), ISecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { + private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { @Override - protected IPrimaryKeyJoinColumn buildValue_() { + protected PrimaryKeyJoinColumn buildValue_() { return subject.getDefaultPrimaryKeyJoinColumn(); } }; } - private ListValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildDefaultJoinColumnHolder() ); } @@ -160,7 +160,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm }; } - private String buildJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) { + private String buildJoinColumnLabel(PrimaryKeyJoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( @@ -205,7 +205,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm return new LabelProvider() { @Override public String getText(Object element) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) element; + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) element; return buildJoinColumnLabel(joinColumn); } }; @@ -246,31 +246,31 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm }; } - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnHolder() { - return new SimplePropertyValueModel<IPrimaryKeyJoinColumn>(); + private WritablePropertyValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnHolder() { + return new SimplePropertyValueModel<PrimaryKeyJoinColumn>(); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { - List<ListValueModel<IPrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<IPrimaryKeyJoinColumn>>(); + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { + List<ListValueModel<PrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<PrimaryKeyJoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IPrimaryKeyJoinColumn>, IPrimaryKeyJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<PrimaryKeyJoinColumn>, PrimaryKeyJoinColumn>(list); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildPrimaryKeyJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY ); } - private ListValueModel<IPrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<ISecondaryTable, IPrimaryKeyJoinColumn>(getSubjectHolder(), ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { + private ListValueModel<PrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IPrimaryKeyJoinColumn> listIterator_() { + protected ListIterator<PrimaryKeyJoinColumn> listIterator_() { return subject.specifiedPrimaryKeyJoinColumns(); } @@ -283,7 +283,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm private void editPrimaryKeyJoinColumn(ObjectListSelectionModel listSelectionModel) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) listSelectionModel.selectedValue(); + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) listSelectionModel.selectedValue(); PrimaryKeyJoinColumnInSecondaryTableDialog dialog = new PrimaryKeyJoinColumnInSecondaryTableDialog( @@ -330,14 +330,14 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm installOverrideDefaultButtonEnabler(button); // Primary Key Join Columns list pane - AddRemoveListPane<ISecondaryTable> joinColumnsPane = new AddRemoveListPane<ISecondaryTable>( + AddRemoveListPane<SecondaryTable> joinColumnsPane = new AddRemoveListPane<SecondaryTable>( this, groupPane, buildPrimaryKeyJoinColumnAdapter(), buildPrimaryKeyJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installPrimaryKeyJoinColumnListPaneEnabler(joinColumnsPane); @@ -351,7 +351,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm ); } - private void installPrimaryKeyJoinColumnListPaneEnabler(AddRemoveListPane<ISecondaryTable> pkJoinColumnListPane) { + private void installPrimaryKeyJoinColumnListPaneEnabler(AddRemoveListPane<SecondaryTable> pkJoinColumnListPane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), @@ -376,19 +376,19 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm setPopulating(true); try { - ISecondaryTable secondaryTable = subject(); + SecondaryTable secondaryTable = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IPrimaryKeyJoinColumn defaultJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn defaultJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IPrimaryKeyJoinColumn pkJoinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0); + PrimaryKeyJoinColumn pkJoinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0); pkJoinColumn.setSpecifiedName(columnName); pkJoinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java index 4c91240e66..23cc58c191 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Iterator; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.db.internal.Schema; @@ -32,8 +32,8 @@ public class SecondaryTableDialog extends Dialog { //if creating a new JoinColumn, this will be null, //specify the JoinColumnOwner instead in the appropriate construtor - private ISecondaryTable secondaryTable; - private IEntity entity; + private SecondaryTable secondaryTable; + private Entity entity; protected Combo nameCombo; protected Combo catalogCombo; @@ -46,12 +46,12 @@ public class SecondaryTableDialog extends Dialog { private boolean defaultSchemaSelected; private boolean defaultCatalogSelected; - SecondaryTableDialog(Shell parent, IEntity entity) { + SecondaryTableDialog(Shell parent, Entity entity) { super(parent); this.entity = entity; } - SecondaryTableDialog(Shell parent, ISecondaryTable secondaryTable, IEntity entity) { + SecondaryTableDialog(Shell parent, SecondaryTable secondaryTable, Entity entity) { super(parent); this.secondaryTable = secondaryTable; this.entity = entity; @@ -117,7 +117,7 @@ public class SecondaryTableDialog extends Dialog { } private ConnectionProfile getConnectionProfile() { - IJpaProject project = (this.secondaryTable == null) ? this.entity.jpaProject() : this.secondaryTable.jpaProject(); + JpaProject project = (this.secondaryTable == null) ? this.entity.jpaProject() : this.secondaryTable.jpaProject(); return project.connectionProfile(); } @@ -207,7 +207,7 @@ public class SecondaryTableDialog extends Dialog { return this.catalogCombo; } - protected ISecondaryTable getSecondaryTable() { + protected SecondaryTable getSecondaryTable() { return this.secondaryTable; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java index 5d0f498d27..a2bd3dc0f0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java @@ -13,10 +13,10 @@ import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; @@ -46,7 +46,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The container of this pane * @see AddRemoveListPane * @see PrimaryKeyJoinColumnsInSecondaryTableComposite @@ -55,7 +55,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class SecondaryTablesComposite extends AbstractFormPane<IEntity> +public class SecondaryTablesComposite extends AbstractFormPane<Entity> { /** * Creates a new <code>SecondaryTablesComposite</code>. @@ -63,7 +63,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> * @param parentPane The parent container of this one * @param parent The parent container */ - public SecondaryTablesComposite(AbstractFormPane<? extends IEntity> parentPane, + public SecondaryTablesComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -76,7 +76,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public SecondaryTablesComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public SecondaryTablesComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -90,7 +90,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> String name = dialog.getSelectedName(); String catalog = dialog.getSelectedCatalog(); String schema = dialog.getSelectedSchema(); - ISecondaryTable secondaryTable = this.subject().addSpecifiedSecondaryTable(index); + SecondaryTable secondaryTable = this.subject().addSpecifiedSecondaryTable(index); secondaryTable.setSpecifiedName(name); secondaryTable.setSpecifiedCatalog(catalog); secondaryTable.setSpecifiedSchema(schema); @@ -99,8 +99,8 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> } } - private WritablePropertyValueModel<ISecondaryTable> buildSecondaryTableHolder() { - return new SimplePropertyValueModel<ISecondaryTable>(); + private WritablePropertyValueModel<SecondaryTable> buildSecondaryTableHolder() { + return new SimplePropertyValueModel<SecondaryTable>(); } private ILabelProvider buildSecondaryTableLabelProvider() { @@ -108,7 +108,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> @Override public String getText(Object element) { // TODO display a qualified name instead - ISecondaryTable secondaryTable = (ISecondaryTable) element; + SecondaryTable secondaryTable = (SecondaryTable) element; if (secondaryTable.getName() != null) { return secondaryTable.getName(); } @@ -137,13 +137,13 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> @Override public void optionOnSelection(ObjectListSelectionModel listSelectionModel) { - ISecondaryTable secondaryTable = (ISecondaryTable) listSelectionModel.selectedValue(); + SecondaryTable secondaryTable = (SecondaryTable) listSelectionModel.selectedValue(); SecondaryTableDialog dialog = new SecondaryTableDialog(getControl().getShell(), secondaryTable, subject()); editSecondaryTableFromDialog(dialog, secondaryTable); } public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) { - IEntity entity = subject(); + Entity entity = subject(); int[] selectedIndices = listSelectionModel.selectedIndices(); for (int index = selectedIndices.length; --index >= 0; ) { @@ -153,15 +153,15 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<ISecondaryTable> buildSecondaryTablesListModel() { - return new ItemPropertyListValueModelAdapter<ISecondaryTable>(buildSecondaryTablesListHolder(), - ITable.SPECIFIED_NAME_PROPERTY); + private ListValueModel<SecondaryTable> buildSecondaryTablesListModel() { + return new ItemPropertyListValueModelAdapter<SecondaryTable>(buildSecondaryTablesListHolder(), + Table.SPECIFIED_NAME_PROPERTY); } - private ListValueModel<ISecondaryTable> buildSecondaryTablesListHolder() { - return new ListAspectAdapter<IEntity, ISecondaryTable>(getSubjectHolder(), IEntity.SPECIFIED_SECONDARY_TABLES_LIST) { + private ListValueModel<SecondaryTable> buildSecondaryTablesListHolder() { + return new ListAspectAdapter<Entity, SecondaryTable>(getSubjectHolder(), Entity.SPECIFIED_SECONDARY_TABLES_LIST) { @Override - protected ListIterator<ISecondaryTable> listIterator_() { + protected ListIterator<SecondaryTable> listIterator_() { return subject.secondaryTables(); } @@ -172,7 +172,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> }; } - private void editSecondaryTableDialogOkd(SecondaryTableDialog dialog, ISecondaryTable secondaryTable) { + private void editSecondaryTableDialogOkd(SecondaryTableDialog dialog, SecondaryTable secondaryTable) { String name = dialog.getSelectedName(); String catalog = dialog.getSelectedCatalog(); String schema = dialog.getSelectedSchema(); @@ -200,7 +200,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> } } - private void editSecondaryTableFromDialog(SecondaryTableDialog dialog, ISecondaryTable secondaryTable) { + private void editSecondaryTableFromDialog(SecondaryTableDialog dialog, SecondaryTable secondaryTable) { if (dialog.open() == Window.OK) { editSecondaryTableDialogOkd(dialog, secondaryTable); } @@ -214,18 +214,18 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> int groupBoxMargin = groupBoxMargin(); - WritablePropertyValueModel<ISecondaryTable> secondaryTableHolder = + WritablePropertyValueModel<SecondaryTable> secondaryTableHolder = buildSecondaryTableHolder(); // Secondary Tables add/remove list pane - new AddRemoveListPane<IEntity>( + new AddRemoveListPane<Entity>( this, buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin), buildSecondaryTablesAdapter(), buildSecondaryTablesListModel(), secondaryTableHolder, buildSecondaryTableLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS//TODO need a help context id for this + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS//TODO need a help context id for this ); // Primary Key Join Columns pane diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java index 75accebe57..0817f79adf 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java @@ -10,11 +10,11 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.SequenceGenerator; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.SequenceCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; @@ -35,15 +35,15 @@ import org.eclipse.swt.widgets.Text; * | ----------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see ISequenceGenerator + * @see IdMapping + * @see SequenceGenerator * @see GenerationComposite - The parent container * @see SequenceCombo * * @version 2.0 * @since 1.0 */ -public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGenerator> +public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGenerator> { /** * Creates a new <code>SequenceGeneratorComposite</code>. @@ -51,7 +51,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * @param parentPane The parent container of this one * @param parent The parent container */ - public SequenceGeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public SequenceGeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -61,28 +61,28 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * (non-Javadoc) */ @Override - protected ISequenceGenerator buildGenerator() { + protected SequenceGenerator buildGenerator() { return subject().addSequenceGenerator(); } - private PropertyValueModel<ISequenceGenerator> buildSequenceGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, ISequenceGenerator>(getSubjectHolder(), propertyName()) { + private PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder() { + return new PropertyAspectAdapter<IdMapping, SequenceGenerator>(getSubjectHolder(), propertyName()) { @Override - protected ISequenceGenerator buildValue_() { + protected SequenceGenerator buildValue_() { return subject.getSequenceGenerator(); } }; } - private SequenceCombo<ISequenceGenerator> buildSequenceNameCombo(Composite parent) { + private SequenceCombo<SequenceGenerator> buildSequenceNameCombo(Composite parent) { - return new SequenceCombo<ISequenceGenerator>(this, buildSequenceGeneratorHolder(), parent) { + return new SequenceCombo<SequenceGenerator>(this, buildSequenceGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ISequenceGenerator.DEFAULT_SEQUENCE_NAME_PROPERTY); - propertyNames.add(ISequenceGenerator.SPECIFIED_SEQUENCE_NAME_PROPERTY); + propertyNames.add(SequenceGenerator.DEFAULT_SEQUENCE_NAME_PROPERTY); + propertyNames.add(SequenceGenerator.SPECIFIED_SEQUENCE_NAME_PROPERTY); } @Override @@ -101,7 +101,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return SequenceGeneratorComposite.this.jpaProject(); } @@ -118,7 +118,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene @Override protected String value() { - ISequenceGenerator generator = generator(); + SequenceGenerator generator = generator(); if (generator != null) { return generator.getSpecifiedSequenceName(); @@ -133,7 +133,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * (non-Javadoc) */ @Override - protected ISequenceGenerator generator(IIdMapping subject) { + protected SequenceGenerator generator(IdMapping subject) { return subject.getSequenceGenerator(); } @@ -151,7 +151,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene container, JptUiMappingsMessages.SequenceGeneratorComposite_name, nameText, - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_NAME + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_NAME ); // Sequence Generator widgets @@ -159,7 +159,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene container, JptUiMappingsMessages.SequenceGeneratorComposite_sequence, buildSequenceNameCombo(container), - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_SEQUENCE + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_SEQUENCE ); } @@ -168,6 +168,6 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene */ @Override protected String propertyName() { - return IIdMapping.SEQUENCE_GENERATOR_PROPERTY; + return IdMapping.SEQUENCE_GENERATOR_PROPERTY; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java index 136bf4ea60..9899f26cd2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java @@ -10,16 +10,15 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.ITable; +import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.CatalogCombo; import org.eclipse.jpt.ui.internal.mappings.db.SchemaCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -43,7 +42,7 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ITable + * @see Table * @see EntityComposite - The parent container * @see TableCombo * @see CatalogCombo @@ -54,7 +53,7 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 1.0 */ -public class TableComposite extends AbstractFormPane<ITable> +public class TableComposite extends AbstractFormPane<Table> { /** * Creates a new <code>TableComposite</code>. @@ -64,7 +63,7 @@ public class TableComposite extends AbstractFormPane<ITable> * @param parent The parent container */ public TableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends ITable> subjectHolder, + PropertyValueModel<? extends Table> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -77,22 +76,22 @@ public class TableComposite extends AbstractFormPane<ITable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TableComposite(PropertyValueModel<? extends ITable> subjectHolder, + public TableComposite(PropertyValueModel<? extends Table> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private CatalogCombo<ITable> buildCatalogCombo(Composite container) { + private CatalogCombo<Table> buildCatalogCombo(Composite container) { - return new CatalogCombo<ITable>(this, container) { + return new CatalogCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_CATALOG_PROPERTY); - propertyNames.add(ITable.SPECIFIED_CATALOG_PROPERTY); + propertyNames.add(Table.DEFAULT_CATALOG_PROPERTY); + propertyNames.add(Table.SPECIFIED_CATALOG_PROPERTY); } @Override @@ -112,15 +111,15 @@ public class TableComposite extends AbstractFormPane<ITable> }; } - private SchemaCombo<ITable> buildSchemaCombo(Composite container) { + private SchemaCombo<Table> buildSchemaCombo(Composite container) { - return new SchemaCombo<ITable>(this, container) { + return new SchemaCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_SCHEMA_PROPERTY); - propertyNames.add(ITable.SPECIFIED_SCHEMA_PROPERTY); + propertyNames.add(Table.DEFAULT_SCHEMA_PROPERTY); + propertyNames.add(Table.SPECIFIED_SCHEMA_PROPERTY); } @Override @@ -140,15 +139,15 @@ public class TableComposite extends AbstractFormPane<ITable> }; } - private TableCombo<ITable> buildTableCombo(Composite container) { + private TableCombo<Table> buildTableCombo(Composite container) { - return new TableCombo<ITable>(this, container) { + return new TableCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_NAME_PROPERTY); - propertyNames.add(ITable.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Table.DEFAULT_NAME_PROPERTY); + propertyNames.add(Table.SPECIFIED_NAME_PROPERTY); } @Override @@ -162,7 +161,7 @@ public class TableComposite extends AbstractFormPane<ITable> } @Override - protected Table table() { + protected org.eclipse.jpt.db.internal.Table table() { return subject().dbTable(); } @@ -205,7 +204,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.TableChooser_label, buildTableCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_TABLE + JpaHelpContextIds.ENTITY_TABLE ); // Catalog widgets @@ -213,7 +212,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.CatalogChooser_label, buildCatalogCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_CATALOG + JpaHelpContextIds.ENTITY_CATALOG ); // Schema widgets @@ -221,7 +220,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.SchemaChooser_label, buildSchemaCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_SCHEMA + JpaHelpContextIds.ENTITY_SCHEMA ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java index 3458146c6e..02b346f768 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java @@ -11,13 +11,13 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.TableGenerator; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; @@ -49,14 +49,14 @@ import org.eclipse.swt.widgets.Text; * | ----------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see ITableGenerator + * @see IdMapping + * @see TableGenerator * @see GenerationComposite - The parent container * * @version 2.0 * @since 1.0 */ -public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> +public class TableGeneratorComposite extends GeneratorComposite<TableGenerator> { /** * Creates a new <code>TableGeneratorComposite</code>. @@ -64,7 +64,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * @param parentPane The parent container of this one * @param parent The parent container */ - public TableGeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public TableGeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -74,19 +74,19 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * (non-Javadoc) */ @Override - protected ITableGenerator buildGenerator() { + protected TableGenerator buildGenerator() { return subject().addTableGenerator(); } - private ColumnCombo<ITableGenerator> buildPkColumnNameCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildPkColumnNameCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_PK_COLUMN_NAME_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_PK_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_PK_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_PK_COLUMN_NAME_PROPERTY); } @Override @@ -105,7 +105,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -134,15 +134,15 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private ColumnCombo<ITableGenerator> buildPkColumnValueCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildPkColumnValueCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_PK_COLUMN_VALUE_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_PK_COLUMN_VALUE_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_PK_COLUMN_VALUE_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_PK_COLUMN_VALUE_PROPERTY); } @Override @@ -161,7 +161,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -190,24 +190,24 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private PropertyValueModel<ITableGenerator> buildTableGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, ITableGenerator>(getSubjectHolder(), propertyName()) { + private PropertyValueModel<TableGenerator> buildTableGeneratorHolder() { + return new PropertyAspectAdapter<IdMapping, TableGenerator>(getSubjectHolder(), propertyName()) { @Override - protected ITableGenerator buildValue_() { + protected TableGenerator buildValue_() { return subject.getTableGenerator(); } }; } - private TableCombo<ITableGenerator> buildTableNameCombo(Composite parent) { + private TableCombo<TableGenerator> buildTableNameCombo(Composite parent) { - return new TableCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new TableCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_TABLE_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_TABLE_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_TABLE_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_TABLE_PROPERTY); } @Override @@ -226,7 +226,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -268,15 +268,15 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private ColumnCombo<ITableGenerator> buildValueColumnCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildValueColumnCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_VALUE_COLUMN_NAME_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_VALUE_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_VALUE_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_VALUE_COLUMN_NAME_PROPERTY); } @Override @@ -295,7 +295,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -328,7 +328,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * (non-Javadoc) */ @Override - protected ITableGenerator generator(IIdMapping subject) { + protected TableGenerator generator(IdMapping subject) { return (subject != null) ? subject.getTableGenerator() : null; } @@ -346,7 +346,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_name, nameText.getParent(), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_NAME + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_NAME ); // Table widgets @@ -354,7 +354,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_table, buildTableNameCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE ); // Primary Key Column widgets @@ -362,7 +362,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_pkColumn, buildPkColumnNameCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN ); // Value Column widgets @@ -370,7 +370,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_valueColumn, buildValueColumnCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN ); // Primary Key Column Value widgets @@ -378,7 +378,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_pkColumnValue, buildPkColumnValueCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN_VALUE + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN_VALUE ); } @@ -387,6 +387,6 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> */ @Override protected String propertyName() { - return IIdMapping.TABLE_GENERATOR_PROPERTY; + return IdMapping.TABLE_GENERATOR_PROPERTY; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java index 9e859828b5..6d2f4997c4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java @@ -16,12 +16,12 @@ import org.eclipse.jdt.core.search.SearchEngine; import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; @@ -48,7 +48,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * | ¯¯¯¯¯¯¯¯¯¯¯¯¯¯ -------------------------------------------- ------------- | * -----------------------------------------------------------------------------</pre> * - * @see IRelationshipMapping + * @see RelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane @@ -58,7 +58,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @since 1.0 */ @SuppressWarnings("nls") -public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping> +public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping> { private CCombo combo; @@ -68,7 +68,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * @param parentPane The parent container of this one * @param parent The parent container */ - public TargetEntityComposite(AbstractFormPane<? extends IRelationshipMapping> parentPane, + public TargetEntityComposite(AbstractFormPane<? extends RelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -81,9 +81,9 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TargetEntityComposite(PropertyValueModel<? extends IRelationshipMapping> subjectHolder, + public TargetEntityComposite(PropertyValueModel<? extends RelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -94,8 +94,8 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IRelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY); - propertyNames.add(IRelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY); + propertyNames.add(RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY); + propertyNames.add(RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY); } private FocusListener buildFocusListener() { @@ -236,7 +236,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping labelLink, combo, buildTargetEntitySelectionButton(container), - IJpaHelpContextIds.MAPPING_TARGET_ENTITY + JpaHelpContextIds.MAPPING_TARGET_ENTITY ); } @@ -275,7 +275,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping */ private void populateDefaultValue() { - IRelationshipMapping entity = subject(); + RelationshipMapping entity = subject(); String defaultValue = (entity != null) ? entity.getDefaultTargetEntity() : null; if (defaultValue != null) { @@ -296,8 +296,8 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IRelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY || - propertyName == IRelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY) { + if (propertyName == RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY || + propertyName == RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY) { populateCombo(); } @@ -312,7 +312,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * selection to (0, 0) makes the entire text visible. */ private void updateSelectedItem() { - IRelationshipMapping subject = subject(); + RelationshipMapping subject = subject(); String value = (subject != null) ? subject.getSpecifiedTargetEntity() : null; if (value != null) { @@ -344,7 +344,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping private void valueChanged(String value) { - IRelationshipMapping subject = subject(); + RelationshipMapping subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedTargetEntity() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java index ff8c3df200..caa87f2e32 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IColumnMapping + * @see ColumnMapping * @see BasicMappingComposite - A container of this widget * @see IdMappingComposite - A container of this widget * @see VersionMappingComposite - A container of this widget @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { +public class TemporalTypeComposite extends AbstractFormPane<ColumnMapping> { /** * Creates a new <code>TemporalTypeComposite</code>. @@ -42,20 +42,20 @@ public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { * @param parentPane The parent container of this one * @param parent The parent container */ - public TemporalTypeComposite(AbstractFormPane<? extends IColumnMapping> parentPane, + public TemporalTypeComposite(AbstractFormPane<? extends ColumnMapping> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IColumnMapping, TemporalType> buildTemporalCombo(Composite container) { + private EnumFormComboViewer<ColumnMapping, TemporalType> buildTemporalCombo(Composite container) { - return new EnumFormComboViewer<IColumnMapping, TemporalType>(this, container) { + return new EnumFormComboViewer<ColumnMapping, TemporalType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IColumnMapping.TEMPORAL_PROPERTY); + propertyNames.add(ColumnMapping.TEMPORAL_PROPERTY); } @Override @@ -99,7 +99,7 @@ public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { container, JptUiMappingsMessages.BasicGeneralSection_temporalLabel, buildTemporalCombo(container), - IJpaHelpContextIds.MAPPING_TEMPORAL + JpaHelpContextIds.MAPPING_TEMPORAL ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java index 7614db08c8..1d75b6e945 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -19,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see ITransientMapping + * @see TransientMapping * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 1.0 */ -public class TransientMappingComposite extends AbstractFormPane<ITransientMapping> - implements IJpaComposite<ITransientMapping> +public class TransientMappingComposite extends AbstractFormPane<TransientMapping> + implements JpaComposite<TransientMapping> { /** * Creates a new <code>TransientMappingComposite</code>. @@ -35,7 +35,7 @@ public class TransientMappingComposite extends AbstractFormPane<ITransientMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TransientMappingComposite(PropertyValueModel<? extends ITransientMapping> subjectHolder, + public TransientMappingComposite(PropertyValueModel<? extends TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java index a701c59ce8..bc8b3a42b7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -34,7 +34,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see TemporalTypeComposite @@ -42,8 +42,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class VersionMappingComposite extends AbstractFormPane<IVersionMapping> - implements IJpaComposite<IVersionMapping> +public class VersionMappingComposite extends AbstractFormPane<VersionMapping> + implements JpaComposite<VersionMapping> { /** * Creates a new <code>VersionMappingComposite</code>. @@ -52,17 +52,17 @@ public class VersionMappingComposite extends AbstractFormPane<IVersionMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public VersionMappingComposite(PropertyValueModel<? extends IVersionMapping> subjectHolder, + public VersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IVersionMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<Column> buildColumnHolder() { + return new TransformationPropertyValueModel<VersionMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IVersionMapping value) { + protected Column transform_(VersionMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java index 58ff3beae1..57971c3cc5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentProvider; @@ -118,9 +118,9 @@ public class JpaNavigatorContentProvider IProject project = (IProject) ((IAdaptable) element).getAdapter(IProject.class); if (project != null) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); return platformUi != null; } @@ -141,9 +141,9 @@ public class JpaNavigatorContentProvider IProject project = (IProject) ((IAdaptable) parentElement).getAdapter(IProject.class); if (project != null) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); if (platformUi != null) { return new Object[] {jpaProject.contextModel()}; @@ -193,14 +193,14 @@ public class JpaNavigatorContentProvider return null; } - IJpaContextNode contextNode = (IJpaContextNode) ((IAdaptable) element).getAdapter(IJpaContextNode.class); + JpaContextNode contextNode = (JpaContextNode) ((IAdaptable) element).getAdapter(JpaContextNode.class); if (contextNode == null) { return null; } - IJpaPlatform platform = contextNode.jpaProject().jpaPlatform(); - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); + JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); ICommonContentProvider delegate = delegateContentProviders.get(platform.getId()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java index 96714c09c0..cd2bebab0d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java @@ -16,10 +16,10 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProviderChangedEvent; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; @@ -154,14 +154,14 @@ public class JpaNavigatorLabelProvider extends LabelProvider return null; } - IJpaContextNode contextNode = (IJpaContextNode) ((IAdaptable) element).getAdapter(IJpaContextNode.class); + JpaContextNode contextNode = (JpaContextNode) ((IAdaptable) element).getAdapter(JpaContextNode.class); if (contextNode == null) { return null; } - IJpaPlatform platform = contextNode.jpaProject().jpaPlatform(); - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); + JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); ICommonLabelProvider delegate = delegateLabelProviders.get(platform.getId()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/JptUiXmlMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/JptUiOrmMessages.java index 5aa42b2125..b9d8a7c035 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/JptUiXmlMessages.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/JptUiOrmMessages.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml; +package org.eclipse.jpt.ui.internal.orm; import org.eclipse.osgi.util.NLS; -public class JptUiXmlMessages +public class JptUiOrmMessages { private static final String BUNDLE_NAME = "jpt_ui_xml"; //$NON-NLS-1$ @@ -26,40 +26,40 @@ public class JptUiXmlMessages public static String PersistentAttributePage_javaAttributeLabel; - public static String XmlEntityMappingsDetailsPage_package; + public static String EntityMappingsDetailsPage_package; - public static String XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox; - public static String XMLEntityMappingsPage_CascadePersistCheckBox; - public static String XMLEntityMappingsPage_PersistenceUnitSection; - public static String XMLEntityMappingsPage_SchemaDefault; - public static String XMLEntityMappingsPage_SchemaNoDefaultSpecified; - public static String XMLEntityMappingsPage_CatalogDefault; - public static String XMLEntityMappingsPage_CatalogNoDefaultSpecified; + public static String EntityMappingsPage_XmlMappingMetadataCompleteCheckBox; + public static String EntityMappingsPage_CascadePersistCheckBox; + public static String EntityMappingsPage_PersistenceUnitSection; + public static String EntityMappingsPage_SchemaDefault; + public static String EntityMappingsPage_SchemaNoDefaultSpecified; + public static String EntityMappingsPage_CatalogDefault; + public static String EntityMappingsPage_CatalogNoDefaultSpecified; - public static String XmlSchemaChooser_SchemaChooser; - public static String XmlCatalogChooser_CatalogChooser; + public static String OrmSchemaChooser_SchemaChooser; + public static String OrmCatalogChooser_CatalogChooser; - public static String XmlJavaClassChooser_browse; - public static String XmlJavaClassChooser_XmlJavaClassDialog_title; - public static String XmlJavaClassChooser_XmlJavaClassDialog_message; - public static String XmlPackageChooser_PackageDialog_title; - public static String XmlPackageChooser_PackageDialog_message; + public static String OrmJavaClassChooser_browse; + public static String OrmJavaClassChooser_XmlJavaClassDialog_title; + public static String OrmJavaClassChooser_XmlJavaClassDialog_message; + public static String OrmPackageChooser_PackageDialog_title; + public static String OrmPackageChooser_PackageDialog_message; public static String AccessTypeComposite_field; public static String AccessTypeComposite_property; - public static String XmlEntityMappingsDetailsPage_field; - public static String XmlEntityMappingsDetailsPage_property; + public static String EntityMappingsDetailsPage_field; + public static String EntityMappingsDetailsPage_property; public static String PersistenceUnitMetadataComposite_field; public static String PersistenceUnitMetadataComposite_property; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, JptUiXmlMessages.class); + NLS.initializeMessages(BUNDLE_NAME, JptUiOrmMessages.class); } - private JptUiXmlMessages() { + private JptUiOrmMessages() { throw new UnsupportedOperationException(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/AccessTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java index 9c90fbed69..ffcb1c587c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/AccessTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java @@ -6,15 +6,15 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -28,12 +28,12 @@ import org.eclipse.swt.widgets.Composite; * -----------------------------------------------------------------------------</pre> * * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - A container of this pane + * @see OrmPersistentTypeDetailsPage - A container of this pane * * @version 2.0 * @since 1.0 */ -public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? extends TypeMapping>> { +public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping<? extends AbstractTypeMapping>> { /** * Creates a new <code>AccessTypeComposite</code>. @@ -43,21 +43,21 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten * @param parent The parent container */ public AccessTypeComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); } - private EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType> buildAccessTypeComboViewer(Composite container) { + private EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType> buildAccessTypeComboViewer(Composite container) { - return new EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType>(this, container) { + return new EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.DEFAULT_ACCESS_PROPERTY); - propertyNames.add(XmlTypeMapping.SPECIFIED_ACCESS_PROPERTY); + propertyNames.add(OrmTypeMapping.DEFAULT_ACCESS_PROPERTY); + propertyNames.add(OrmTypeMapping.SPECIFIED_ACCESS_PROPERTY); } @Override @@ -73,7 +73,7 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, + JptUiOrmMessages.class, AccessTypeComposite.this, value ); @@ -97,12 +97,12 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten @Override protected void initializeLayout(Composite container) { - EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType> comboViewer = + EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType> comboViewer = buildAccessTypeComboViewer(container); buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, comboViewer.getControl() ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java index 9c08e44e5d..aa7f39e5eb 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlEntityMappingsDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java @@ -6,16 +6,16 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.BaseJpaDetailsPage; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.details.AbstractJpaDetailsPage; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -48,14 +48,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * @see PersistenceUnitMetadataComposite - * @see XmlPackageChooser + * @see OrmPackageChooser * * @version 2.0 * @since 2.0 */ -public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappings> +public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMappings> { /** * Creates a new <code>XmlEntityMappingsDetailsPage</code>. @@ -63,7 +63,7 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlEntityMappingsDetailsPage(Composite parent, + public EntityMappingsDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); @@ -93,8 +93,8 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, - XmlEntityMappingsDetailsPage.this, + JptUiOrmMessages.class, + EntityMappingsDetailsPage.this, value ); } @@ -203,7 +203,7 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi protected void initializeLayout(Composite container) { // Package widgets - new XmlPackageChooser( + new OrmPackageChooser( this, container ); @@ -214,9 +214,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.XmlSchemaChooser_SchemaChooser, + JptUiOrmMessages.OrmSchemaChooser_SchemaChooser, schemaComboViewer.getControl(), - IJpaHelpContextIds.ENTITY_ORM_SCHEMA + JpaHelpContextIds.ENTITY_ORM_SCHEMA ); // Catalog widgets @@ -225,9 +225,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.XmlCatalogChooser_CatalogChooser, + JptUiOrmMessages.OrmCatalogChooser_CatalogChooser, catalogComboViewer.getControl(), - IJpaHelpContextIds.ENTITY_ORM_CATALOG + JpaHelpContextIds.ENTITY_ORM_CATALOG ); // Access Type widgets @@ -236,9 +236,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, accessTypeComposite.getControl(), - IJpaHelpContextIds.ENTITY_ORM_ACCESS + JpaHelpContextIds.ENTITY_ORM_ACCESS ); // Persistence Unit Metadata widgets diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/MetaDataCompleteComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/MetaDataCompleteComboViewer.java index 48487ad4fe..6bff5494e3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/MetaDataCompleteComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/MetaDataCompleteComboViewer.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -24,12 +24,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * </pre> * * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - The container of this pane + * @see OrmPersistentTypeDetailsPage - The container of this pane * * @version 2.0 * @since 2.0 */ -public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping<? extends TypeMapping>> +public class MetaDataCompleteComboViewer extends AbstractFormPane<OrmTypeMapping<? extends AbstractTypeMapping>> { /** * Creates a new <code>MetaDataCompleteComboViewer</code>. @@ -39,7 +39,7 @@ public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping * @param parent The parent container */ public MetaDataCompleteComboViewer(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -52,22 +52,22 @@ public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MetaDataCompleteComboViewer(PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public MetaDataCompleteComboViewer(PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, Boolean> buildEnumTypeCombo(Composite container) { + private EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, Boolean> buildEnumTypeCombo(Composite container) { - return new EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, Boolean>(this, container) { + return new EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, Boolean>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.DEFAULT_METADATA_COMPLETE_PROPERTY); - propertyNames.add(XmlTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY); + propertyNames.add(OrmTypeMapping.DEFAULT_METADATA_COMPLETE_PROPERTY); + propertyNames.add(OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java new file mode 100644 index 0000000000..8a058efcdf --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 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.orm.details; + +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.orm.OrmStructureNodes; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; + +/** + * This provider is responsible for creating the {@link JpaDetailsPage} + * when the information comes from the XML file (either from the persistence + * configuration or from the Mappings Descriptor). + * + * @version 2.0 + * @since 1.0 + */ +public class OrmDetailsProvider + implements JpaDetailsProvider +{ + public OrmDetailsProvider() { + super(); + } + + public JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( + Composite parent, + Object contentNodeId, + TabbedPropertySheetWidgetFactory widgetFactory) { + + if (contentNodeId == OrmStructureNodes.ENTITY_MAPPINGS_ID) { + return new EntityMappingsDetailsPage(parent, widgetFactory); + } + + if (contentNodeId == OrmStructureNodes.PERSISTENT_TYPE_ID) { + return new OrmPersistentTypeDetailsPage(parent, widgetFactory); + } + + if (contentNodeId == OrmStructureNodes.PERSISTENT_ATTRIBUTE_ID) { + return new OrmPersistentAttributeDetailsPage(parent, widgetFactory); + } + + return null; + } +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaAttributeChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java index 04ab0eee61..d344c4b3d6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaAttributeChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java @@ -6,13 +6,13 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.orm.XmlAttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -20,13 +20,13 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; /** - * @see XmlPersistentAttributeDetailsPage - The parent ocntainer + * @see OrmPersistentAttributeDetailsPage - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMapping<? extends AttributeMapping>> +public class OrmJavaAttributeChooser extends AbstractFormPane<AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> { private Text text; @@ -37,8 +37,8 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin * @param subjectHolder The holder of this pane's subject * @param parent The parent container */ - public XmlJavaAttributeChooser(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlAttributeMapping<? extends AttributeMapping>> subjectHolder, + public OrmJavaAttributeChooser(AbstractFormPane<?> parentPane, + PropertyValueModel<? extends AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -50,7 +50,7 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlAttributeMapping.NAME_PROPERTY); + propertyNames.add(AbstractOrmAttributeMapping.NAME_PROPERTY); } private ModifyListener buildNameModifyListener() { @@ -81,14 +81,14 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin text = buildLabeledText( container, - JptUiXmlMessages.PersistentAttributePage_javaAttributeLabel, + JptUiOrmMessages.PersistentAttributePage_javaAttributeLabel, buildNameModifyListener() ); } private void populateText() { - XmlAttributeMapping<?> subject = subject(); + AbstractOrmAttributeMapping<?> subject = subject(); text.setText(""); if (subject == null) { @@ -111,7 +111,7 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == XmlAttributeMapping.NAME_PROPERTY) { + if (propertyName == AbstractOrmAttributeMapping.NAME_PROPERTY) { populateText(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaClassChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java index 54eb10cb4a..06cb4f8e60 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; import org.eclipse.core.resources.IProject; @@ -24,11 +24,11 @@ import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionP import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -54,14 +54,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * choose a class from the package. * Not sure if this should be driven by the UI or by ui api in the model * - * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - The parent container + * @see OrmTypeMapping + * @see OrmPersistentTypeDetailsPage - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { +public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping<?>> { private JavaTypeCompletionProcessor javaTypeCompletionProcessor; private Text text; @@ -73,8 +73,8 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { * @param subjectHolder The holder of this pane's subject * @param parent The parent container */ - public XmlJavaClassChooser(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public OrmJavaClassChooser(AbstractFormPane<?> parentPane, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -87,7 +87,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlJavaClassChooser(PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public OrmJavaClassChooser(PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -100,7 +100,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.CLASS_PROPERTY); + propertyNames.add(OrmTypeMapping.CLASS_PROPERTY); } private void browseType() { @@ -125,7 +125,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { private Button buildBrowseButton(Composite container) { return buildButton( container, - JptUiXmlMessages.XmlJavaClassChooser_browse, + JptUiOrmMessages.OrmJavaClassChooser_browse, buildBrowseButtonAction() ); } @@ -177,8 +177,8 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { return null; } - typeSelectionDialog.setTitle(JptUiXmlMessages.XmlJavaClassChooser_XmlJavaClassDialog_title); - typeSelectionDialog.setMessage(JptUiXmlMessages.XmlJavaClassChooser_XmlJavaClassDialog_message); + typeSelectionDialog.setTitle(JptUiOrmMessages.OrmJavaClassChooser_XmlJavaClassDialog_title); + typeSelectionDialog.setMessage(JptUiOrmMessages.OrmJavaClassChooser_XmlJavaClassDialog_message); if (typeSelectionDialog.open() == Window.OK) { return (IType) typeSelectionDialog.getResult()[0]; @@ -218,7 +218,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { text = buildLabeledText( container, - JptUiXmlMessages.PersistentTypePage_javaClassLabel, + JptUiOrmMessages.PersistentTypePage_javaClassLabel, buildPackageTextModifyListener(), buildBrowseButton(container) ); @@ -230,7 +230,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { private void populateText() { - XmlTypeMapping<?> subject = subject(); + OrmTypeMapping<?> subject = subject(); text.setText(""); if (subject == null) { @@ -259,7 +259,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == XmlTypeMapping.CLASS_PROPERTY) { + if (propertyName == OrmTypeMapping.CLASS_PROPERTY) { populateText(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPackageChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java index 55d04dd99a..c191435cf8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPackageChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; import org.eclipse.core.resources.IProject; @@ -22,11 +22,11 @@ import org.eclipse.jdt.ui.JavaElementLabelProvider; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Button; @@ -44,12 +44,12 @@ import org.eclipse.ui.dialogs.SelectionDialog; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * * @version 2.0 * @since 2.0 */ -public class XmlPackageChooser extends AbstractFormPane<EntityMappings> +public class OrmPackageChooser extends AbstractFormPane<EntityMappings> { private IContentAssistProcessor contentAssistProcessor; private Text text; @@ -60,7 +60,7 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> * @param parentPane The parent controller of this one * @param parent The parent container */ - public XmlPackageChooser(AbstractFormPane<? extends EntityMappings> parentPane, + public OrmPackageChooser(AbstractFormPane<? extends EntityMappings> parentPane, Composite parent) { super(parentPane, parent); @@ -97,7 +97,7 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> private Button buildBrowseButton(Composite container) { return buildButton( container, - JptUiXmlMessages.XmlJavaClassChooser_browse, + JptUiOrmMessages.OrmJavaClassChooser_browse, buildBrowseButtonAction() ); } @@ -146,8 +146,8 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> return null; } - selectionDialog.setTitle(JptUiXmlMessages.XmlPackageChooser_PackageDialog_title); - selectionDialog.setMessage(JptUiXmlMessages.XmlPackageChooser_PackageDialog_message); + selectionDialog.setTitle(JptUiOrmMessages.OrmPackageChooser_PackageDialog_title); + selectionDialog.setMessage(JptUiOrmMessages.OrmPackageChooser_PackageDialog_message); selectionDialog.setHelpAvailable(false); IPackageFragment pack = getPackageFragment(); @@ -205,10 +205,10 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> text = buildLabeledText( container, - JptUiXmlMessages.XmlEntityMappingsDetailsPage_package, + JptUiOrmMessages.EntityMappingsDetailsPage_package, buildPackageModifyListener(), buildBrowseButton(container), - IJpaHelpContextIds.ENTITY_ORM_PACKAGE + JpaHelpContextIds.ENTITY_ORM_PACKAGE ); contentAssistProcessor = new JavaPackageCompletionProcessor( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java index 581a060116..51b30777d5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java @@ -7,29 +7,29 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlAttributeMapping; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -47,16 +47,16 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the XML persistent * attribute. * - * @see IPersistentAttribute - * @see XmlJavaAttributeChooser + * @see PersistentAttribute + * @see OrmJavaAttributeChooser * * @version 2.0 * @since 2.0 */ @SuppressWarnings("nls") -public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<XmlPersistentAttribute> +public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<OrmPersistentAttribute> { - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders; /** * Creates a new <code>XmlPersistentAttributeDetailsPage</code>. @@ -64,13 +64,13 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlPersistentAttributeDetailsPage(Composite parent, + public OrmPersistentAttributeDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); } - protected void addAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(BasicMappingUiProvider.instance()); providers.add(EmbeddedMappingUiProvider.instance()); providers.add(EmbeddedIdMappingUiProvider.instance()); @@ -87,13 +87,13 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * (non-Javadoc) */ @Override - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() { if (this.attributeMappingUiProviders == null) { - this.attributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.attributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addAttributeMappingUiProvidersTo(this.attributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.attributeMappingUiProviders ); } @@ -103,16 +103,16 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail */ @Override @SuppressWarnings("unchecked") - protected IAttributeMappingUiProvider<? extends IAttributeMapping>[] attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute) { + protected AttributeMappingUiProvider<? extends AttributeMapping>[] attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute) { //bug 192035 - no default mapping option in xml - return CollectionTools.array(attributeMappingUiProviders(), new IAttributeMappingUiProvider[CollectionTools.size(attributeMappingUiProviders())]); + return CollectionTools.array(attributeMappingUiProviders(), new AttributeMappingUiProvider[CollectionTools.size(attributeMappingUiProviders())]); } /* * (non-Javadoc) */ @Override - protected IAttributeMappingUiProvider<IAttributeMapping> defaultAttributeMappingUiProvider(String key) { + protected AttributeMappingUiProvider<AttributeMapping> defaultAttributeMappingUiProvider(String key) { throw new UnsupportedOperationException("Xml attributeMappings should not be default"); } @@ -120,7 +120,7 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultAttributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() { return EmptyListIterator.instance(); } @@ -133,12 +133,12 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail updateEnbabledState(); } - private PropertyValueModel<XmlAttributeMapping<? extends AttributeMapping>> getMappingHolder() { - return new TransformationPropertyValueModel<IPersistentAttribute, XmlAttributeMapping<? extends AttributeMapping>>(getSubjectHolder()) { + private PropertyValueModel<AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> getMappingHolder() { + return new TransformationPropertyValueModel<PersistentAttribute, AbstractOrmAttributeMapping<? extends XmlAttributeMapping>>(getSubjectHolder()) { @Override @SuppressWarnings("unchecked") - protected XmlAttributeMapping<? extends AttributeMapping> transform_(IPersistentAttribute value) { - return (XmlAttributeMapping<? extends AttributeMapping>) value.getMapping(); + protected AbstractOrmAttributeMapping<? extends XmlAttributeMapping> transform_(PersistentAttribute value) { + return (AbstractOrmAttributeMapping<? extends XmlAttributeMapping>) value.getMapping(); } }; } @@ -150,7 +150,7 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail protected void initializeLayout(Composite container) { // Entity type widgets - new XmlJavaAttributeChooser(this, getMappingHolder(), container); + new OrmJavaAttributeChooser(this, getMappingHolder(), container); // Note: The combo's parent is a container fixing the issue with the // border not being painted diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java index cc52308eea..06706e85a7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java @@ -6,25 +6,25 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.ui.internal.details.PersistentTypeDetailsPage; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -38,18 +38,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the XML persistent * attribute. * - * @see XmlPersistentType + * @see OrmPersistentType * * @version 2.0 * @since 2.0 */ -public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlPersistentType> +public class OrmPersistentTypeDetailsPage extends PersistentTypeDetailsPage<OrmPersistentType> { /** * Storing these here instead of querying IJpaPlatformUI, because the orm.xml * schema is not extensible. We only need to support extensibility for java. */ - private List<ITypeMappingUiProvider<? extends ITypeMapping>> xmlTypeMappingUiProviders; + private List<TypeMappingUiProvider<? extends TypeMapping>> xmlTypeMappingUiProviders; /** * Creates a new <code>XmlPersistentTypeDetailsPage</code>. @@ -57,22 +57,22 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlPersistentTypeDetailsPage(Composite parent, + public OrmPersistentTypeDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); } - protected void addXmlTypeMappingUiProvidersTo(Collection<ITypeMappingUiProvider<? extends ITypeMapping>> providers) { + protected void addXmlTypeMappingUiProvidersTo(Collection<TypeMappingUiProvider<? extends TypeMapping>> providers) { providers.add(EntityUiProvider.instance()); providers.add(MappedSuperclassUiProvider.instance()); providers.add(EmbeddableUiProvider.instance()); } - private PropertyValueModel<XmlTypeMapping<? extends TypeMapping>> buildMappingHolder() { - return new PropertyAspectAdapter<XmlPersistentType, XmlTypeMapping<? extends TypeMapping>>(getSubjectHolder(), IPersistentType.MAPPING_PROPERTY) { + private PropertyValueModel<OrmTypeMapping<? extends AbstractTypeMapping>> buildMappingHolder() { + return new PropertyAspectAdapter<OrmPersistentType, OrmTypeMapping<? extends AbstractTypeMapping>>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { @Override - protected XmlTypeMapping<? extends TypeMapping> buildValue_() { + protected OrmTypeMapping<? extends AbstractTypeMapping> buildValue_() { return subject.getMapping(); } }; @@ -85,7 +85,7 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP protected void initializeLayout(Composite container) { // Java class widgets - new XmlJavaClassChooser(this, buildMappingHolder(), container); + new OrmJavaClassChooser(this, buildMappingHolder(), container); // Type Mapping widgets ComboViewer typeMappingCombo = buildTypeMappingCombo(container); @@ -102,7 +102,7 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_MetadataCompleteLabel, + JptUiOrmMessages.PersistentTypePage_MetadataCompleteLabel, metadataCompleteComboViewer.getControl() ); @@ -125,11 +125,11 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP * (non-Javadoc) */ @Override - public ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders() { + public ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() { if (this.xmlTypeMappingUiProviders == null) { - this.xmlTypeMappingUiProviders = new ArrayList<ITypeMappingUiProvider<? extends ITypeMapping>>(); + this.xmlTypeMappingUiProviders = new ArrayList<TypeMappingUiProvider<? extends TypeMapping>>(); this.addXmlTypeMappingUiProvidersTo(this.xmlTypeMappingUiProviders); } - return new CloneListIterator<ITypeMappingUiProvider<? extends ITypeMapping>>(this.xmlTypeMappingUiProviders); + return new CloneListIterator<TypeMappingUiProvider<? extends TypeMapping>>(this.xmlTypeMappingUiProviders); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java index e9f9d2fb53..d91b1359f9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/PersistenceUnitMetadataComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java @@ -6,16 +6,16 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Composite; * * @see PersistenceUnitMetadata * @see PersistenceUnitDefaults - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * * @version 2.0 * @since 2.0 @@ -91,7 +91,7 @@ public class PersistenceUnitMetadataComposite extends AbstractFormPane<Persisten @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, + JptUiOrmMessages.class, PersistenceUnitMetadataComposite.this, value ); @@ -229,47 +229,47 @@ public class PersistenceUnitMetadataComposite extends AbstractFormPane<Persisten // Section container = buildSection( container, - JptUiXmlMessages.XMLEntityMappingsPage_PersistenceUnitSection + JptUiOrmMessages.EntityMappingsPage_PersistenceUnitSection ); // XML mapping metadata complete check box buildCheckBox( container, - JptUiXmlMessages.XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox, + JptUiOrmMessages.EntityMappingsPage_XmlMappingMetadataCompleteCheckBox, buildXmlMappingMetadataCompleteHolder(), - IJpaHelpContextIds.ENTITY_ORM_XML + JpaHelpContextIds.ENTITY_ORM_XML ); // Cascade Persist widgets buildCheckBox( container, - JptUiXmlMessages.XMLEntityMappingsPage_CascadePersistCheckBox, + JptUiOrmMessages.EntityMappingsPage_CascadePersistCheckBox, buildCascadePersistHolder(), - IJpaHelpContextIds.ENTITY_ORM_CASCADE + JpaHelpContextIds.ENTITY_ORM_CASCADE ); // Schema widgets buildLabeledComposite( container, - JptUiXmlMessages.XmlSchemaChooser_SchemaChooser, + JptUiOrmMessages.OrmSchemaChooser_SchemaChooser, buildSchemaComboViewer(container), - IJpaHelpContextIds.ENTITY_ORM_SCHEMA + JpaHelpContextIds.ENTITY_ORM_SCHEMA ); // Catalog widgets buildLabeledComposite( container, - JptUiXmlMessages.XmlCatalogChooser_CatalogChooser, + JptUiOrmMessages.OrmCatalogChooser_CatalogChooser, buildCatalogComboViewer(container), - IJpaHelpContextIds.ENTITY_ORM_CATALOG + JpaHelpContextIds.ENTITY_ORM_CATALOG ); // Access Type widgets buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, buildAccessTypeCombo(container), - IJpaHelpContextIds.ENTITY_ORM_ACCESS + JpaHelpContextIds.ENTITY_ORM_ACCESS ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java index b70eb5d893..e6ec0d1331 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; @@ -93,7 +93,7 @@ public class JpaPlatformUiRegistry this.jpaPlatforms.put(platformId, configElement); } - public IJpaPlatformUi jpaPlatform(String platformId) { + public JpaPlatformUi jpaPlatform(String platformId) { IConfigurationElement registeredConfigElement = this.jpaPlatforms.get(platformId); if (registeredConfigElement == null) { @@ -101,7 +101,7 @@ public class JpaPlatformUiRegistry } try { - return (IJpaPlatformUi) registeredConfigElement.createExecutableExtension(AT_CLASS); + return (JpaPlatformUi) registeredConfigElement.createExecutableExtension(AT_CLASS); } catch (CoreException ce) { reportFailedInstantiation(registeredConfigElement); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java index 967c29ef8a..476d7da1fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.platform.base; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; +import org.eclipse.jpt.core.context.IBaseJpaContent; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java index e4a55e2cd2..2884641e85 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.ui.internal.platform.base; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.IContextModel; -import org.eclipse.jpt.core.internal.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.ContextModel; +import org.eclipse.jpt.core.internal.context.persistence.GeenericPersistenceXml; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; @@ -47,11 +47,11 @@ public class BaseJpaNavigatorLabelProvider extends LabelProvider // **************** ILabelProvider implementation ************************** public Image getImage(Object element) { - if (element instanceof IContextModel) { + if (element instanceof ContextModel) { return JptUiPlugin.getPlugin().getImage(JptUiIcons.JPA_CONTENT); } - if (element instanceof PersistenceXml) { + if (element instanceof GeenericPersistenceXml) { return JptUiPlugin.getPlugin().getImage(JptUiIcons.JPA_FILE); } @@ -59,11 +59,11 @@ public class BaseJpaNavigatorLabelProvider extends LabelProvider } public String getText(Object element) { - if (element instanceof IContextModel) { + if (element instanceof ContextModel) { return "JPA Content"; } - if (element instanceof PersistenceXml) { + if (element instanceof GeenericPersistenceXml) { return "persistence.xml"; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java index 9f569f7bdf..9e46a83104 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java @@ -15,58 +15,58 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaJpaContextNode; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.DefaultBasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.DefaultEmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; import org.eclipse.jpt.ui.internal.java.details.JavaDetailsProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.DefaultBasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.DefaultEmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.NullTypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.java.details.NullTypeMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.orm.details.OrmDetailsProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.jpt.ui.internal.structure.JavaResourceModelStructureProvider; import org.eclipse.jpt.ui.internal.structure.OrmResourceModelStructureProvider; import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStructureProvider; -import org.eclipse.jpt.ui.internal.xml.details.XmlDetailsProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.ui.navigator.ICommonContentProvider; import org.eclipse.ui.navigator.ICommonLabelProvider; -public abstract class BaseJpaPlatformUi implements IJpaPlatformUi +public abstract class BaseJpaPlatformUi implements JpaPlatformUi { // TODO: Transformed into a List for testing - private List<IJpaDetailsProvider> detailsProviders; + private List<JpaDetailsProvider> detailsProviders; - private List<ITypeMappingUiProvider<? extends ITypeMapping>> javaTypeMappingUiProviders; - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> javaAttributeMappingUiProviders; - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultJavaAttributeMappingUiProviders; + private List<TypeMappingUiProvider<? extends TypeMapping>> javaTypeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> javaAttributeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> defaultJavaAttributeMappingUiProviders; - private IJpaUiFactory jpaUiFactory; + private JpaUiFactory jpaUiFactory; protected BaseJpaPlatformUi() { @@ -88,17 +88,17 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // **************** structure view content ********************************* - public IJpaStructureProvider buildStructureProvider(IJpaFile jpaFile) { - IResourceModel resourceModel = jpaFile.getResourceModel(); + public JpaStructureProvider buildStructureProvider(JpaFile jpaFile) { + ResourceModel resourceModel = jpaFile.getResourceModel(); String resourceType = resourceModel.getResourceType(); - if (resourceType == IResourceModel.JAVA_RESOURCE_TYPE) { + if (resourceType == ResourceModel.JAVA_RESOURCE_TYPE) { return new JavaResourceModelStructureProvider((JavaResourceModel) resourceModel); } - else if (resourceType == IResourceModel.ORM_RESOURCE_TYPE) { + else if (resourceType == ResourceModel.ORM_RESOURCE_TYPE) { return new OrmResourceModelStructureProvider((OrmResourceModel) resourceModel); } - else if (resourceType == IResourceModel.PERSISTENCE_RESOURCE_TYPE) { + else if (resourceType == ResourceModel.PERSISTENCE_RESOURCE_TYPE) { return new PersistenceResourceModelStructureProvider((PersistenceResourceModel) resourceModel); } @@ -108,33 +108,33 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // ********** behavior ********** - protected abstract IJpaUiFactory createJpaUiFactory(); + protected abstract JpaUiFactory createJpaUiFactory(); - public IJpaUiFactory getJpaUiFactory() { + public JpaUiFactory getJpaUiFactory() { return this.jpaUiFactory; } - public Iterator<IJpaDetailsProvider> detailsProviders() { + public Iterator<JpaDetailsProvider> detailsProviders() { if (this.detailsProviders == null) { - this.detailsProviders = new ArrayList<IJpaDetailsProvider>(); + this.detailsProviders = new ArrayList<JpaDetailsProvider>(); this.addDetailsProvidersTo(this.detailsProviders); } - return new CloneIterator<IJpaDetailsProvider>(this.detailsProviders); + return new CloneIterator<JpaDetailsProvider>(this.detailsProviders); } /** * Override this to specify more or different details providers. * The default includes the JPA spec-defined java and orm.xml */ - protected void addDetailsProvidersTo(Collection<IJpaDetailsProvider> providers) { + protected void addDetailsProvidersTo(Collection<JpaDetailsProvider> providers) { providers.add(new JavaDetailsProvider()); - providers.add(new XmlDetailsProvider()); + providers.add(new OrmDetailsProvider()); } - public IJpaDetailsProvider detailsProvider(IJpaStructureNode structureNode) { + public JpaDetailsProvider detailsProvider(JpaStructureNode structureNode) { // TODO: To implement, this is written only for testing detailsProviders(); - if (structureNode instanceof IJavaJpaContextNode) { + if (structureNode instanceof JavaJpaContextNode) { return detailsProviders.get(0); } else { @@ -149,12 +149,12 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // return null; } - public ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> javaTypeMappingUiProviders() { + public ListIterator<TypeMappingUiProvider<? extends TypeMapping>> javaTypeMappingUiProviders() { if (this.javaTypeMappingUiProviders == null) { - this.javaTypeMappingUiProviders = new ArrayList<ITypeMappingUiProvider<? extends ITypeMapping>>(); + this.javaTypeMappingUiProviders = new ArrayList<TypeMappingUiProvider<? extends TypeMapping>>(); this.addJavaTypeMappingUiProvidersTo(this.javaTypeMappingUiProviders); } - return new CloneListIterator<ITypeMappingUiProvider<? extends ITypeMapping>>( + return new CloneListIterator<TypeMappingUiProvider<? extends TypeMapping>>( this.javaTypeMappingUiProviders ); } @@ -164,20 +164,20 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * The default includes the JPA spec-defined entity, mapped superclass, embeddable, * and null (when the others don't apply) */ - protected void addJavaTypeMappingUiProvidersTo(List<ITypeMappingUiProvider<? extends ITypeMapping>> providers) { + protected void addJavaTypeMappingUiProvidersTo(List<TypeMappingUiProvider<? extends TypeMapping>> providers) { providers.add(NullTypeMappingUiProvider.instance()); providers.add(EntityUiProvider.instance()); providers.add(MappedSuperclassUiProvider.instance()); providers.add(EmbeddableUiProvider.instance()); } - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> javaAttributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> javaAttributeMappingUiProviders() { if (this.javaAttributeMappingUiProviders == null) { - this.javaAttributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.javaAttributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addJavaAttributeMappingUiProvidersTo(this.javaAttributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.javaAttributeMappingUiProviders ); } @@ -187,7 +187,7 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * The default includes the JPA spec-defined basic, embedded, embeddedId, id, * manyToMany, manyToOne, oneToMany, oneToOne, transient, and version */ - protected void addJavaAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addJavaAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(BasicMappingUiProvider.instance()); providers.add(EmbeddedMappingUiProvider.instance()); providers.add(EmbeddedIdMappingUiProvider.instance()); @@ -200,13 +200,13 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi providers.add(VersionMappingUiProvider.instance()); } - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultJavaAttributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultJavaAttributeMappingUiProviders() { if (this.defaultJavaAttributeMappingUiProviders == null) { - this.defaultJavaAttributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.defaultJavaAttributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addDefaultJavaAttributeMappingUiProvidersTo(this.defaultJavaAttributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.defaultJavaAttributeMappingUiProviders ); } @@ -215,12 +215,12 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * Override this to specify more or different default java attribute mapping ui providers. * The default includes the JPA spec-defined basic, embedded */ - protected void addDefaultJavaAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addDefaultJavaAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(DefaultBasicMappingUiProvider.instance()); providers.add(DefaultEmbeddedMappingUiProvider.instance()); } - public void generateEntities(IJpaProject project, IStructuredSelection selection) { + public void generateEntities(JpaProject project, IStructuredSelection selection) { EntitiesGenerator.generate(project, selection); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java index dbffba75c4..898b2eff76 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java @@ -23,9 +23,9 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; import org.eclipse.jpt.core.internal.synch.SynchronizeClassesJob; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.gen.internal.EntityGenerator; @@ -47,12 +47,12 @@ import org.eclipse.swt.widgets.Shell; */ public class EntitiesGenerator { - private IJpaProject project; + private JpaProject project; private IStructuredSelection selection; // ********** constructors ********** - static public void generate( IJpaProject project, IStructuredSelection selection) { + static public void generate( JpaProject project, IStructuredSelection selection) { if(project == null) { throw new NullPointerException(); } @@ -63,7 +63,7 @@ public class EntitiesGenerator super(); } - private EntitiesGenerator( IJpaProject project, IStructuredSelection selection) { + private EntitiesGenerator( JpaProject project, IStructuredSelection selection) { super(); this.project = project; this.selection = selection; @@ -103,14 +103,14 @@ public class EntitiesGenerator private final Collection<Table> selectedTables; private final boolean synchronizePersistenceXml; private final EntityGenerator.OverwriteConfirmer overwriteConfirmer; - private final IJpaProject project; + private final JpaProject project; GenerateEntitiesRunnable( PackageGenerator.Config packageConfig, EntityGenerator.Config entityConfig, Collection<Table> selectedTables, boolean synchronizePersistenceXml, - IJpaProject project, + JpaProject project, EntityGenerator.OverwriteConfirmer overwriteConfirmer ) { super("Generating Entities"); @@ -132,7 +132,7 @@ public class EntitiesGenerator // we currently only support *one* persistence.xml file per project //TODO casting to IBaseJpaContent, IContextModel doesn't seem useful to me //just trying to get rid of all compiler errors for now KFB - IPersistenceXml persistenceXml = ((IBaseJpaContent) this.project.contextModel()).getPersistenceXml(); + PersistenceXml persistenceXml = ((IBaseJpaContent) this.project.contextModel()).getPersistenceXml(); if (persistenceXml != null) { //TODO casting to IFile - just trying to get rid of all compiler errors for now SynchronizeClassesJob job = new SynchronizeClassesJob((IFile) persistenceXml.resource()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java index 22c391c871..3979cf98fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.ui.internal.platform.generic; import java.text.MessageFormat; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.ui.JpaUiFactory; import org.eclipse.jpt.ui.internal.GenericJpaUiFactory; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; import org.eclipse.swt.widgets.Display; @@ -27,11 +27,11 @@ public class GenericPlatformUi extends BaseJpaPlatformUi } @Override - protected IJpaUiFactory createJpaUiFactory() { + protected JpaUiFactory createJpaUiFactory() { return new GenericJpaUiFactory(); } - public void generateDDL(IJpaProject project, IStructuredSelection selection) { + public void generateDDL(JpaProject project, IStructuredSelection selection) { this.displayNotSupportedMessage(JptUiMessages.GenericPlatformUiDialog_notSupportedMessageTitle, JptUiMessages.GenericPlatformUiDialog_notSupportedMessageText); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java index 669418d54e..39199fc32e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.internal.ui.preferences.UserLibraryPreferencePage; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.CollectionTools; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java index d82512e6b8..6099e8af24 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java @@ -25,17 +25,17 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.JpaModelManager; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.facet.IJpaFacetDataModelProperties; +import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider; import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -59,7 +59,7 @@ import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; public class JpaProjectPropertiesPage extends DataModelPropertyPage - implements IJpaFacetDataModelProperties + implements JpaFacetDataModelProperties { private PlatformGroup platformGroup; @@ -89,7 +89,7 @@ public class JpaProjectPropertiesPage setRuntime(); Dialog.applyDialogFont(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE); return composite; } @@ -104,20 +104,20 @@ public class JpaProjectPropertiesPage return; } IRuntime runtime = facetedProject.getPrimaryRuntime(); - model.setProperty(IJpaFacetDataModelProperties.RUNTIME, runtime); + model.setProperty(JpaFacetDataModelProperties.RUNTIME, runtime); } @Override protected String[] getValidationPropertyNames() { return new String[] { - IJpaFacetDataModelProperties.PLATFORM_ID, - IJpaFacetDataModelProperties.CONNECTION, - IJpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES + JpaFacetDataModelProperties.PLATFORM_ID, + JpaFacetDataModelProperties.CONNECTION, + JpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES }; } - protected IJpaProject getJpaProject() { - return (IJpaProject) this.getElement().getAdapter(IJpaProject.class); + protected JpaProject getJpaProject() { + return (JpaProject) this.getElement().getAdapter(JpaProject.class); } Combo createCombo(Composite container, boolean fillHorizontal) { @@ -149,7 +149,7 @@ public class JpaProjectPropertiesPage @Override public boolean performOk() { - IJpaProject jpaProject = this.getJpaProject(); + JpaProject jpaProject = this.getJpaProject(); if (jpaProject == null) { return true; // the facet has been uninstalled during our trip to the properties } @@ -159,21 +159,21 @@ public class JpaProjectPropertiesPage IProject project = jpaProject.project(); - String platform = this.model.getStringProperty(IJpaFacetDataModelProperties.PLATFORM_ID); + String platform = this.model.getStringProperty(JpaFacetDataModelProperties.PLATFORM_ID); if ( ! platform.equals(jpaProject.jpaPlatform().getId())) { change = true; platformChange = true; JptCorePlugin.setJpaPlatformId(project, platform); } - String connection = this.model.getStringProperty(IJpaFacetDataModelProperties.CONNECTION); + String connection = this.model.getStringProperty(JpaFacetDataModelProperties.CONNECTION); if ( ! connection.equals(jpaProject.dataSource().connectionProfileName())) { change = true; jpaProject.dataSource().setConnectionProfileName(connection); JptCorePlugin.setConnectionProfileName(project, connection); } - boolean discover = this.model.getBooleanProperty(IJpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES); + boolean discover = this.model.getBooleanProperty(JpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES); if (discover != jpaProject.discoversAnnotatedClasses()) { change = true; jpaProject.setDiscoversAnnotatedClasses(discover); @@ -298,7 +298,7 @@ public class JpaProjectPropertiesPage group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); connectionCombo = createCombo(group, true); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); connectionCombo.addSelectionListener( new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { @@ -371,7 +371,7 @@ public class JpaProjectPropertiesPage group.setText(JptUiMessages.JpaFacetWizardPage_persistentClassManagementLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); discoverClassesButton = createButton(group, 1, JptUiMessages.JpaFacetWizardPage_discoverClassesButton, SWT.RADIO); discoverClassesButton.addSelectionListener( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java new file mode 100644 index 0000000000..3fb614992a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.selection; + +import org.eclipse.jpt.core.JpaStructureNode; + +public class DefaultJpaSelection + implements JpaSelection +{ + private JpaStructureNode selectedNode; + + + public DefaultJpaSelection(JpaStructureNode selectedNode) { + if (selectedNode == null) { + throw new NullPointerException("A 'selectedNode' is required; otherwise use NULL_SELECTION."); + } + this.selectedNode = selectedNode; + } + + public JpaStructureNode getSelectedNode() { + return this.selectedNode; + } + + public boolean isEmpty() { + // by definition, this selection is never empty + // use IJpaSelection.NULL_SELECTION for empty selections + return false; + } + + @Override + public boolean equals(Object obj) { + if (! (obj instanceof DefaultJpaSelection)) { + return false; + } + + return this.selectedNode.equals(((DefaultJpaSelection) obj).selectedNode); + } + + @Override + public int hashCode() { + return this.selectedNode.hashCode(); + } + + @Override + public String toString() { + return this.selectedNode.toString(); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java new file mode 100644 index 0000000000..4d5f0b59fc --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java @@ -0,0 +1,298 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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.selection; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import org.eclipse.jpt.utility.internal.iterators.CloneIterator; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IPageListener; +import org.eclipse.ui.IPartListener2; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchPartReference; +import org.eclipse.ui.IWorkbenchWindow; + +/** + * A {@link JpaSelectionManager} stores the current {@link JpaSelection} and + * notifies <code>ISelectionListener</code>s when the selection changes. + */ +public class DefaultJpaSelectionManager + implements JpaSelectionManager +{ + /* The window for which this object manages selections */ + private IWorkbenchWindow window; + + /* The set of pages for which this object is managing selections */ + private Set<IWorkbenchPage> pages; + + /* The active editor part */ + private IEditorPart activeEditor; + + private JpaSelection currentSelection; + + /* The map of <code>IJpaSelectionParticipant</code>s (keyed by part) */ + private Map<IWorkbenchPart, JpaSelectionParticipant> selectionParticipants; + + private IPageListener pageListener; + + private IPartListener2 partListener; + + + public DefaultJpaSelectionManager() { + super(); + pages = Collections.synchronizedSet(new HashSet<IWorkbenchPage>()); + selectionParticipants = Collections.synchronizedMap(new HashMap<IWorkbenchPart, JpaSelectionParticipant>()); + pageListener = new PageListener(); + partListener = new PartListener(); + currentSelection = DefaultJpaSelection.NULL_SELECTION; + } + + void init(IWorkbenchWindow aWindow) { + window = aWindow; + aWindow.addPageListener(pageListener); + initPage(aWindow.getActivePage()); + } + + private void initPage(IWorkbenchPage page) { + if ((page != null) && (! pages.contains(page))) { + page.addPartListener(partListener); + pages.add(page); + activateEditor(page.getActiveEditor()); + } + } + + private void disposePage(IWorkbenchPage page) { + if ((page != null) && (pages.contains(page))) { + page.removePartListener(partListener); + pages.remove(page); + } + } + + private void activateEditor(IEditorPart editor) { + if (editor == activeEditor) { + return; + } + if (activeEditor != null) { + inactivateEditor(activeEditor); + } + initPart(editor); + activeEditor = editor; + selectEditor(activeEditor); + } + + private void inactivateEditor(IEditorPart editor) { + + } + + void initPart(IWorkbenchPart part) { + if (part != null) { + if (selectionParticipants.get(part) == null) { + JpaSelectionParticipant selectionParticipant = + (JpaSelectionParticipant) part.getAdapter(JpaSelectionParticipant.class); + if (selectionParticipant != null) { + selectionParticipants.put(part, selectionParticipant); + } + } + } + } + + private void selectEditor(IEditorPart editor) { + selectPart(editor); + } + + void selectPart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if (selectionParticipant != null) { + select(selectionParticipant.getSelection()); + } + } + + void hidePart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if ((selectionParticipant != null) && (selectionParticipant.disposeOnHide())) { + closePart(part); + } + } + + void closePart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if (selectionParticipant != null) { + disposePart(part); + checkForNoEditors(); + } + } + + void disposePart(IWorkbenchPart part) { + if ((part != null) && (selectionParticipants.containsKey(part))) { + selectionParticipants.remove(part).dispose(); + } + } + + void checkForNoEditors() { + IWorkbenchPage activePage = window.getActivePage(); + if ((activePage == null) + || (activePage.getActiveEditor() == null)) { + select(DefaultJpaSelection.NULL_SELECTION); + } + } + + /** + * This may be used to register a part with the selection manager if the part + * is known to need access to the selection manager before it is ever activated + * or in the case it may be activated prior to the selection manager being + * created. + * + * It should not be necessary to deregister a part, as that happens when the + * part is closed. + */ + public void register(IWorkbenchPart part) { + initPart(part); + } + + /** + * Not to be called lightly, this will affect the selection for all interested + * objects in a window. + * The newSelection will be selected. + */ + public void select(JpaSelection newSelection) { + if (currentSelection.equals(newSelection)) { + return; + } + + currentSelection = newSelection; + fireSelectionChange( + new JpaSelectionEvent(newSelection, JpaSelectionEvent.SELECTION, this) + ); + } + + /** + * Not to be called lightly, this will affect the selection for all interested + * objects in a window. + * The oldSelection will be deselected, iff it matches the current selection. + */ + public void deselect(JpaSelection oldSelection) { + if (currentSelection.equals(oldSelection)) { + currentSelection = DefaultJpaSelection.NULL_SELECTION; + fireSelectionChange( + new JpaSelectionEvent(oldSelection, JpaSelectionEvent.DESELECTION, this) + ); + } + } + + private void fireSelectionChange(JpaSelectionEvent event) { + for (JpaSelectionParticipant sp : selectionParticipants.values()) { + sp.selectionChanged(event); + } + } + + private JpaSelectionParticipant getSelectionParticipant(IWorkbenchPart part) { + return selectionParticipants.get(part); + } + + public JpaSelection getCurrentSelection() { + return currentSelection; + } + + public void dispose() { + window.removePageListener(pageListener); + selectionParticipants.clear(); + + for (Iterator<IWorkbenchPage> stream = new CloneIterator<IWorkbenchPage>(this.pages); stream.hasNext(); ) { + this.disposePage(stream.next()); + } + + for (Iterator<IWorkbenchPart> stream = new CloneIterator<IWorkbenchPart>(selectionParticipants.keySet()); stream.hasNext(); ) { + this.disposePart(stream.next()); + } + } + + + private class PageListener implements IPageListener + { + public void pageActivated(IWorkbenchPage page) { + // nop + } + + PageListener() { + super(); + } + + public void pageClosed(IWorkbenchPage page) { + DefaultJpaSelectionManager.this.disposePage(page); + } + + public void pageOpened(IWorkbenchPage page) { + DefaultJpaSelectionManager.this.initPage(page); + } + } + + + private class PartListener implements IPartListener2 + { + PartListener() { + super(); + } + + public void partActivated(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.initPart(part); + DefaultJpaSelectionManager.this.selectPart(part); + } + } + + public void partBroughtToTop(IWorkbenchPartReference partRef) { + // nop + } + + public void partClosed(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.closePart(part); + DefaultJpaSelectionManager.this.disposePart(part); + DefaultJpaSelectionManager.this.checkForNoEditors(); + } + } + + public void partDeactivated(IWorkbenchPartReference partRef) { + // nop + } + + public void partHidden(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.hidePart(part); + } + } + + public void partInputChanged(IWorkbenchPartReference partRef) { + // nop + } + + public void partOpened(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + initPart(part); + } + } + + public void partVisible(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + initPart(part); + } + } + } +} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java deleted file mode 100644 index a5eecdead0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.selection; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jpt.core.internal.IJpaStructureNode; - -@SuppressWarnings("nls") -public interface IJpaSelection extends ISelection -{ - static IJpaSelection NULL_SELECTION = - new IJpaSelection() { - public IJpaStructureNode getSelectedNode() { - return null; - } - - public boolean isEmpty() { - return true; - } - - @Override - public String toString() { - return "NULL SELECTION"; - } - }; - - - IJpaStructureNode getSelectedNode(); -} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java deleted file mode 100644 index 294040971f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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.selection; - -import org.eclipse.ui.IWorkbenchPart; - -public interface IJpaSelectionManager -{ - /** - * Return the current selection. - * This will never be null, but it may be <code>JpaSelection.NULL_SELECTION</code>. - */ - public IJpaSelection getCurrentSelection(); - - /** - * Not to be called lightly, this will affect the selection for all interested - * objects in a window. - * The newSelection will be selected. - */ - public void select(IJpaSelection newSelection); - - /** - * Not to be called lightly, this will affect the selection for all interested - * objects in a window. - * The oldSelection will be deselected, iff it matches the current selection. - */ - public void deselect(IJpaSelection oldSelection); - - /** - * This may be used to register a part with the selection manager if the part - * is known to need access to the selection manager before it is ever activated - * or in the case it may be activated prior to the selection manager being - * created. - * - * It should not be necessary to deregister a part, as that happens when the - * part is closed. - */ - public void register(IWorkbenchPart part); - -} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java index 53f8b955f3..b708d03d0c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.ui.internal.views.JpaDetailsView; public class JpaDetailsSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { private final JpaDetailsView detailsView; @@ -23,7 +23,7 @@ public class JpaDetailsSelectionParticipant this.detailsView = detailsView; } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.detailsView.getSelection(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java index 15b0c5e9b1..8655651a68 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java @@ -1,55 +1,37 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 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. + * Copyright (c) 2007 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 - ******************************************************************************/ + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jpt.core.JpaStructureNode; -public class JpaSelection - implements IJpaSelection +@SuppressWarnings("nls") +public interface JpaSelection extends ISelection { - private IJpaStructureNode selectedNode; + static JpaSelection NULL_SELECTION = + new JpaSelection() { + public JpaStructureNode getSelectedNode() { + return null; + } + public boolean isEmpty() { + return true; + } - public JpaSelection(IJpaStructureNode selectedNode) { - if (selectedNode == null) { - throw new NullPointerException("A 'selectedNode' is required; otherwise use NULL_SELECTION."); - } - this.selectedNode = selectedNode; - } + @Override + public String toString() { + return "NULL SELECTION"; + } + }; - public IJpaStructureNode getSelectedNode() { - return this.selectedNode; - } - public boolean isEmpty() { - // by definition, this selection is never empty - // use IJpaSelection.NULL_SELECTION for empty selections - return false; - } - - @Override - public boolean equals(Object obj) { - if (! (obj instanceof JpaSelection)) { - return false; - } - - return this.selectedNode.equals(((JpaSelection) obj).selectedNode); - } - - @Override - public int hashCode() { - return this.selectedNode.hashCode(); - } - - @Override - public String toString() { - return this.selectedNode.toString(); - } + JpaStructureNode getSelectedNode(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java index 44fbabad84..80c57c2a24 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java @@ -34,7 +34,7 @@ public class JpaSelectionEvent extends EventObject /** * The selection object whose selection status has changed */ - private IJpaSelection selection; + private JpaSelection selection; /** * The type of the selection event, either a SELECTION or a DESELECTION @@ -42,7 +42,7 @@ public class JpaSelectionEvent extends EventObject private int type; - public JpaSelectionEvent(IJpaSelection theSelection, int theType, Object source) { + public JpaSelectionEvent(JpaSelection theSelection, int theType, Object source) { super(source); selection = theSelection; type = theType; @@ -51,7 +51,7 @@ public class JpaSelectionEvent extends EventObject /** * Return the selection object whose selection status has changed */ - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return selection; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java index d23d80d142..19dd3dd13f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java @@ -9,290 +9,39 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import org.eclipse.jpt.utility.internal.iterators.CloneIterator; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IPageListener; -import org.eclipse.ui.IPartListener2; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchPartReference; -import org.eclipse.ui.IWorkbenchWindow; -/** - * A <code>JpaSelectionManager</code> stores the current <code>JpaSelection</code> and - * notifies <code>ISelectionListener</code>s when the selection changes. - */ -public class JpaSelectionManager - implements IJpaSelectionManager -{ - /* The window for which this object manages selections */ - private IWorkbenchWindow window; - - /* The set of pages for which this object is managing selections */ - private Set<IWorkbenchPage> pages; - - /* The active editor part */ - private IEditorPart activeEditor; - - private IJpaSelection currentSelection; - - /* The map of <code>IJpaSelectionParticipant</code>s (keyed by part) */ - private Map<IWorkbenchPart, IJpaSelectionParticipant> selectionParticipants; - - private IPageListener pageListener; - - private IPartListener2 partListener; - - - public JpaSelectionManager() { - super(); - pages = Collections.synchronizedSet(new HashSet<IWorkbenchPage>()); - selectionParticipants = Collections.synchronizedMap(new HashMap<IWorkbenchPart, IJpaSelectionParticipant>()); - pageListener = new PageListener(); - partListener = new PartListener(); - currentSelection = JpaSelection.NULL_SELECTION; - } - - void init(IWorkbenchWindow aWindow) { - window = aWindow; - aWindow.addPageListener(pageListener); - initPage(aWindow.getActivePage()); - } - - private void initPage(IWorkbenchPage page) { - if ((page != null) && (! pages.contains(page))) { - page.addPartListener(partListener); - pages.add(page); - activateEditor(page.getActiveEditor()); - } - } - - private void disposePage(IWorkbenchPage page) { - if ((page != null) && (pages.contains(page))) { - page.removePartListener(partListener); - pages.remove(page); - } - } - - private void activateEditor(IEditorPart editor) { - if (editor == activeEditor) { - return; - } - if (activeEditor != null) { - inactivateEditor(activeEditor); - } - initPart(editor); - activeEditor = editor; - selectEditor(activeEditor); - } - - private void inactivateEditor(IEditorPart editor) { - - } - - void initPart(IWorkbenchPart part) { - if (part != null) { - if (selectionParticipants.get(part) == null) { - IJpaSelectionParticipant selectionParticipant = - (IJpaSelectionParticipant) part.getAdapter(IJpaSelectionParticipant.class); - if (selectionParticipant != null) { - selectionParticipants.put(part, selectionParticipant); - } - } - } - } - - private void selectEditor(IEditorPart editor) { - selectPart(editor); - } - - void selectPart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if (selectionParticipant != null) { - select(selectionParticipant.getSelection()); - } - } - - void hidePart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if ((selectionParticipant != null) && (selectionParticipant.disposeOnHide())) { - closePart(part); - } - } - - void closePart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if (selectionParticipant != null) { - disposePart(part); - checkForNoEditors(); - } - } - - void disposePart(IWorkbenchPart part) { - if ((part != null) && (selectionParticipants.containsKey(part))) { - selectionParticipants.remove(part).dispose(); - } - } - - void checkForNoEditors() { - IWorkbenchPage activePage = window.getActivePage(); - if ((activePage == null) - || (activePage.getActiveEditor() == null)) { - select(JpaSelection.NULL_SELECTION); - } - } - +public interface JpaSelectionManager +{ /** - * This may be used to register a part with the selection manager if the part - * is known to need access to the selection manager before it is ever activated - * or in the case it may be activated prior to the selection manager being - * created. - * - * It should not be necessary to deregister a part, as that happens when the - * part is closed. + * Return the current selection. + * This will never be null, but it may be <code>JpaSelection.NULL_SELECTION</code>. */ - public void register(IWorkbenchPart part) { - initPart(part); - } + public JpaSelection getCurrentSelection(); /** * Not to be called lightly, this will affect the selection for all interested * objects in a window. * The newSelection will be selected. */ - public void select(IJpaSelection newSelection) { - if (currentSelection.equals(newSelection)) { - return; - } - - currentSelection = newSelection; - fireSelectionChange( - new JpaSelectionEvent(newSelection, JpaSelectionEvent.SELECTION, this) - ); - } + public void select(JpaSelection newSelection); /** * Not to be called lightly, this will affect the selection for all interested * objects in a window. * The oldSelection will be deselected, iff it matches the current selection. */ - public void deselect(IJpaSelection oldSelection) { - if (currentSelection.equals(oldSelection)) { - currentSelection = JpaSelection.NULL_SELECTION; - fireSelectionChange( - new JpaSelectionEvent(oldSelection, JpaSelectionEvent.DESELECTION, this) - ); - } - } + public void deselect(JpaSelection oldSelection); - private void fireSelectionChange(JpaSelectionEvent event) { - for (IJpaSelectionParticipant sp : selectionParticipants.values()) { - sp.selectionChanged(event); - } - } - - private IJpaSelectionParticipant getSelectionParticipant(IWorkbenchPart part) { - return selectionParticipants.get(part); - } - - public IJpaSelection getCurrentSelection() { - return currentSelection; - } - - public void dispose() { - window.removePageListener(pageListener); - selectionParticipants.clear(); - - for (Iterator<IWorkbenchPage> stream = new CloneIterator<IWorkbenchPage>(this.pages); stream.hasNext(); ) { - this.disposePage(stream.next()); - } + /** + * This may be used to register a part with the selection manager if the part + * is known to need access to the selection manager before it is ever activated + * or in the case it may be activated prior to the selection manager being + * created. + * + * It should not be necessary to deregister a part, as that happens when the + * part is closed. + */ + public void register(IWorkbenchPart part); - for (Iterator<IWorkbenchPart> stream = new CloneIterator<IWorkbenchPart>(selectionParticipants.keySet()); stream.hasNext(); ) { - this.disposePart(stream.next()); - } - } - - - private class PageListener implements IPageListener - { - public void pageActivated(IWorkbenchPage page) { - // nop - } - - PageListener() { - super(); - } - - public void pageClosed(IWorkbenchPage page) { - JpaSelectionManager.this.disposePage(page); - } - - public void pageOpened(IWorkbenchPage page) { - JpaSelectionManager.this.initPage(page); - } - } - - - private class PartListener implements IPartListener2 - { - PartListener() { - super(); - } - - public void partActivated(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.initPart(part); - JpaSelectionManager.this.selectPart(part); - } - } - - public void partBroughtToTop(IWorkbenchPartReference partRef) { - // nop - } - - public void partClosed(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.closePart(part); - JpaSelectionManager.this.disposePart(part); - JpaSelectionManager.this.checkForNoEditors(); - } - } - - public void partDeactivated(IWorkbenchPartReference partRef) { - // nop - } - - public void partHidden(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.hidePart(part); - } - } - - public void partInputChanged(IWorkbenchPartReference partRef) { - // nop - } - - public void partOpened(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - initPart(part); - } - } - - public void partVisible(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - initPart(part); - } - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionParticipant.java index 249207026c..1a849013ff 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionParticipant.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -public interface IJpaSelectionParticipant +public interface JpaSelectionParticipant { /** * Return the current selection of the participant */ - IJpaSelection getSelection(); + JpaSelection getSelection(); /** * The selection has changed in the central selection manager. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java index c5343daec8..86df5d0753 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java @@ -14,18 +14,18 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jpt.ui.internal.views.structure.JpaStructureView; public class JpaStructureSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { final JpaStructureView structureView; - public JpaStructureSelectionParticipant(IJpaSelectionManager selectionManager, JpaStructureView structureView) { + public JpaStructureSelectionParticipant(JpaSelectionManager selectionManager, JpaStructureView structureView) { super(); this.structureView = structureView; structureView.addSelectionChangedListener(new StructureViewSelectionListener(selectionManager, structureView)); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.structureView.getSelection(); } @@ -47,9 +47,9 @@ public class JpaStructureSelectionParticipant private class StructureViewSelectionListener implements ISelectionChangedListener { - private final IJpaSelectionManager selectionManager; + private final JpaSelectionManager selectionManager; - StructureViewSelectionListener(IJpaSelectionManager selectionManager, JpaStructureView structureView) { + StructureViewSelectionListener(JpaSelectionManager selectionManager, JpaStructureView structureView) { super(); this.selectionManager = selectionManager; } @@ -60,7 +60,7 @@ public class JpaStructureSelectionParticipant } } - private IJpaSelection structureViewSelection() { + private JpaSelection structureViewSelection() { return JpaStructureSelectionParticipant.this.structureView.getSelection(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java index 8f3811b097..25a5d37257 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java @@ -32,7 +32,7 @@ public class SelectionManagerFactory * @return The <code>JpaSelectionManager</code> associated with the current * <code>IWorkbenchWindow</code> */ - public static IJpaSelectionManager getSelectionManager(IWorkbenchWindow window) { + public static JpaSelectionManager getSelectionManager(IWorkbenchWindow window) { if (INSTANCE == null) { // this is thread safe for now. you never know whats comming synchronized (MUTEX) { @@ -48,13 +48,13 @@ public class SelectionManagerFactory } - private Map<IWorkbenchWindow, JpaSelectionManager> managers; + private Map<IWorkbenchWindow, DefaultJpaSelectionManager> managers; private WindowListener windowListener; private SelectionManagerFactory() { - managers = new HashMap<IWorkbenchWindow, JpaSelectionManager>(); + managers = new HashMap<IWorkbenchWindow, DefaultJpaSelectionManager>(); windowListener = new WindowListener(); } @@ -67,13 +67,13 @@ public class SelectionManagerFactory * Returns the JpaSelectionManager for the IWorkbenchWindow. * Creates a new one if none exists yet. */ - private JpaSelectionManager internalGetSelectionManager(IWorkbenchWindow window) { + private DefaultJpaSelectionManager internalGetSelectionManager(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException("The IWorkbenchWindow cannot be null"); } if (! managers.containsKey(window)) { - JpaSelectionManager manager = new JpaSelectionManager(); + DefaultJpaSelectionManager manager = new DefaultJpaSelectionManager(); this.managers.put(window, manager); manager.init(window); } @@ -87,7 +87,7 @@ public class SelectionManagerFactory public void windowOpened(IWorkbenchWindow aWindow) {} public void windowClosed(IWorkbenchWindow aWindow) { - JpaSelectionManager manager = internalGetSelectionManager(aWindow); + DefaultJpaSelectionManager manager = internalGetSelectionManager(aWindow); manager.dispose(); managers.remove(aWindow); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java index 906cc7e26b..7d3dd5a7f7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java @@ -19,7 +19,7 @@ public class SelectionParticipantFactory implements IAdapterFactory { @SuppressWarnings("unchecked") - private static final Class[] ADAPTER_LIST = new Class[] { IJpaSelectionParticipant.class }; + private static final Class[] ADAPTER_LIST = new Class[] { JpaSelectionParticipant.class }; @SuppressWarnings("unchecked") public Class[] getAdapterList() { @@ -32,7 +32,7 @@ public class SelectionParticipantFactory return null; } - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(((IWorkbenchPart) adaptableObject).getSite().getWorkbenchWindow()); if (adaptableObject instanceof ITextEditor) { return new TextEditorSelectionParticipant(selectionManager, (ITextEditor) adaptableObject); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java index 3540fd1c28..e8705161b1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java @@ -14,10 +14,10 @@ import org.eclipse.jface.viewers.IPostSelectionProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; @@ -25,9 +25,9 @@ import org.eclipse.ui.IPropertyListener; import org.eclipse.ui.texteditor.ITextEditor; public class TextEditorSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { - private final IJpaSelectionManager selectionManager; + private final JpaSelectionManager selectionManager; final ITextEditor textEditor; @@ -35,12 +35,12 @@ public class TextEditorSelectionParticipant private final ISelectionChangedListener editorSelectionListener; - private IJpaSelection currentSelection; + private JpaSelection currentSelection; private boolean forwardSelection = true; // TODO this just smells wrong ~bjv - public TextEditorSelectionParticipant(IJpaSelectionManager selectionManager, ITextEditor textEditor) { + public TextEditorSelectionParticipant(JpaSelectionManager selectionManager, ITextEditor textEditor) { super(); this.selectionManager = selectionManager; this.textEditor = textEditor; @@ -53,20 +53,20 @@ public class TextEditorSelectionParticipant // ********** IJpaSelectionParticipant implementation ********** - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.currentSelection; } public void selectionChanged(JpaSelectionEvent evt) { - IJpaSelection newSelection = evt.getSelection(); + JpaSelection newSelection = evt.getSelection(); - if ((newSelection == IJpaSelection.NULL_SELECTION) + if ((newSelection == JpaSelection.NULL_SELECTION) || newSelection.equals(this.currentSelection)) { return; } this.forwardSelection = false; - ITextRange textRange = newSelection.getSelectedNode().selectionTextRange(); + TextRange textRange = newSelection.getSelectedNode().selectionTextRange(); if (textRange != null) { this.textEditor.selectAndReveal(textRange.getOffset(), textRange.getLength()); } @@ -85,26 +85,26 @@ public class TextEditorSelectionParticipant // ********** internal methods ********** - private IJpaSelection calculateSelection() { + private JpaSelection calculateSelection() { ISelection selection = this.textEditor.getSelectionProvider().getSelection(); if (! (selection instanceof ITextSelection)) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - IJpaFile jpaFile = this.jpaFile(); + JpaFile jpaFile = this.jpaFile(); if (jpaFile == null) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - IJpaStructureNode selectedNode = jpaFile.structureNode(((ITextSelection) selection).getOffset()); + JpaStructureNode selectedNode = jpaFile.structureNode(((ITextSelection) selection).getOffset()); if (selectedNode == null) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - return new JpaSelection(selectedNode); + return new DefaultJpaSelection(selectedNode); } - private IJpaFile jpaFile() { + private JpaFile jpaFile() { IEditorInput input = this.textEditor.getEditorInput(); if ( ! (input instanceof IFileEditorInput)) { return null; @@ -120,7 +120,7 @@ public class TextEditorSelectionParticipant // ********** listener callbacks ********** void editorInputChanged() { - IJpaSelection newSelection = this.calculateSelection(); + JpaSelection newSelection = this.calculateSelection(); if (newSelection.equals(this.currentSelection)) { return; } @@ -132,7 +132,7 @@ public class TextEditorSelectionParticipant } void editorSelectionChanged(SelectionChangedEvent event) { - IJpaSelection newSelection = this.calculateSelection(); + JpaSelection newSelection = this.calculateSelection(); if (newSelection.equals(this.currentSelection)) { return; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java index ebbcf8ad14..c62cd3beaa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java @@ -10,30 +10,30 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public abstract class GeneralJpaMappingItemContentProviderFactory - implements ITreeItemContentProviderFactory + implements TreeItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider; - if (item instanceof IPersistentType) { - return buildPersistentTypeItemContentProvider((IPersistentType) item, treeContentProvider); + if (item instanceof PersistentType) { + return buildPersistentTypeItemContentProvider((PersistentType) item, treeContentProvider); } - else if (item instanceof IPersistentAttribute) { - return new PersistentAttributeItemContentProvider((IPersistentAttribute) item, treeContentProvider); + else if (item instanceof PersistentAttribute) { + return new PersistentAttributeItemContentProvider((PersistentAttribute) item, treeContentProvider); } return null; } - protected abstract ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider); + protected abstract TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider); @@ -41,13 +41,13 @@ public abstract class GeneralJpaMappingItemContentProviderFactory public static class PersistentAttributeItemContentProvider extends AbstractTreeItemContentProvider { public PersistentAttributeItemContentProvider( - IPersistentAttribute persistentAttribute, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistentAttribute persistentAttribute, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentAttribute, contentProvider); } @Override public Object getParent() { - return ((IPersistentAttribute) model()).parent(); + return ((PersistentAttribute) model()).parent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java index c4f5fd88a8..ef72f672cc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java @@ -10,28 +10,28 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.ui.internal.JpaMappingImageHelper; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.graphics.Image; public abstract class GeneralJpaMappingItemLabelProviderFactory - implements IItemLabelProviderFactory + implements ItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider labelProvider) { - if (item instanceof IPersistentType) { - return new PersistentTypeItemLabelProvider((IPersistentType) item, labelProvider); + if (item instanceof PersistentType) { + return new PersistentTypeItemLabelProvider((PersistentType) item, labelProvider); } - else if (item instanceof IPersistentAttribute) { - return new PersistentAttributeItemLabelProvider((IPersistentAttribute) item, labelProvider); + else if (item instanceof PersistentAttribute) { + return new PersistentAttributeItemLabelProvider((PersistentAttribute) item, labelProvider); } return null; } @@ -40,13 +40,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory public static class PersistentTypeItemLabelProvider extends AbstractItemLabelProvider { public PersistentTypeItemLabelProvider( - IPersistentType persistentType, DelegatingContentAndLabelProvider labelProvider) { + PersistentType persistentType, DelegatingContentAndLabelProvider labelProvider) { super(persistentType, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistentType, String>(IPersistentType.NAME_PROPERTY, (IPersistentType) model()) { + return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, (PersistentType) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -56,7 +56,7 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { - return new PropertyAspectAdapter<IPersistentType, Image>(IPersistentType.MAPPING_PROPERTY, (IPersistentType) model()) { + return new PropertyAspectAdapter<PersistentType, Image>(PersistentType.MAPPING_PROPERTY, (PersistentType) model()) { @Override protected Image buildValue_() { return JpaMappingImageHelper.imageForTypeMapping(subject.mappingKey()); @@ -69,13 +69,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory public static class PersistentAttributeItemLabelProvider extends AbstractItemLabelProvider { public PersistentAttributeItemLabelProvider( - IPersistentAttribute persistentAttribute, DelegatingContentAndLabelProvider labelProvider) { + PersistentAttribute persistentAttribute, DelegatingContentAndLabelProvider labelProvider) { super(persistentAttribute, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistentAttribute, String>(IPersistentAttribute.NAME_PROPERTY, (IPersistentAttribute) model()) { + return new PropertyAspectAdapter<PersistentAttribute, String>(PersistentAttribute.NAME_PROPERTY, (PersistentAttribute) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -85,13 +85,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { - return new PropertyAspectAdapter<IPersistentAttribute, Image>( - new String[] {IPersistentAttribute.DEFAULT_MAPPING_PROPERTY, IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY}, - (IPersistentAttribute) model()) { + return new PropertyAspectAdapter<PersistentAttribute, Image>( + new String[] {PersistentAttribute.DEFAULT_MAPPING_PROPERTY, PersistentAttribute.SPECIFIED_MAPPING_PROPERTY}, + (PersistentAttribute) model()) { @Override protected Image buildValue_() { Image image = JpaMappingImageHelper.imageForAttributeMapping(subject.mappingKey()); - if (((IPersistentAttribute) model()).isVirtual()) { + if (((PersistentAttribute) model()).isVirtual()) { return JptUiIcons.ghost(image); } return image; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java index 704886f757..ab3a31c21e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java @@ -11,15 +11,15 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.ListValueModel; @@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.model.value.ListValueModel; public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContentProviderFactory { @Override - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentProvider; if (item instanceof JavaResourceModel) { @@ -37,27 +37,27 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent } @Override - protected ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { + protected TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { return new PersistentTypeItemContentProvider(persistentType, treeContentProvider); } - public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<IPersistentAttribute> + public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<PersistentAttribute> { public PersistentTypeItemContentProvider( - IPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentType, contentProvider); } @Override public Object getParent() { - return ((IPersistentType) model()).parent(); + return ((PersistentType) model()).parent(); } @Override - protected ListValueModel<IPersistentAttribute> buildChildrenModel() { - return new ListAspectAdapter<IPersistentType, IPersistentAttribute>(new String[]{IPersistentType.SPECIFIED_ATTRIBUTES_LIST}, (IPersistentType) model()) { + protected ListValueModel<PersistentAttribute> buildChildrenModel() { + return new ListAspectAdapter<PersistentType, PersistentAttribute>(new String[]{PersistentType.SPECIFIED_ATTRIBUTES_LIST}, (PersistentType) model()) { @Override - protected ListIterator<IPersistentAttribute> listIterator_() { + protected ListIterator<PersistentAttribute> listIterator_() { return subject.attributes(); } @@ -68,7 +68,7 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent }; } } - public static class JavaResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class JavaResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public JavaResourceModelItemContentProvider( JavaResourceModel javaResourceModel, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -81,11 +81,11 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<JavaResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (JavaResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<JavaResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (JavaResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java index 22b7a499c2..fd9ffbcbf0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.ui.internal.structure; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class JavaResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class JavaResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new JavaItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new JavaItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/IJpaStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JpaStructureProvider.java index cea72b7589..553a57e2fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/IJpaStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JpaStructureProvider.java @@ -8,23 +8,23 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; -public interface IJpaStructureProvider +public interface JpaStructureProvider { // TODO - change this Object getInput(); /** - * Build an factory to create {@link ITreeItemContentProvider}s + * Build an factory to create {@link TreeItemContentProvider}s */ - ITreeItemContentProviderFactory treeItemContentProviderFactory(); + TreeItemContentProviderFactory treeItemContentProviderFactory(); /** - * Build a factory to create {@link IItemLabelProvider}s + * Build a factory to create {@link ItemLabelProvider}s */ - IItemLabelProviderFactory itemLabelProviderFactory(); + ItemLabelProviderFactory itemLabelProviderFactory(); void dispose(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java index 11c047c8a1..49ee6957ef 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java @@ -12,17 +12,17 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ArrayList; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.ListValueModel; @@ -30,7 +30,7 @@ import org.eclipse.jpt.utility.internal.model.value.ListValueModel; public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentProviderFactory { @Override - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentProvider; if (item instanceof OrmResourceModel) { @@ -44,35 +44,35 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP @Override - protected ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { - return new PersistentTypeItemContentProvider((XmlPersistentType) persistentType, treeContentProvider); + protected TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { + return new PersistentTypeItemContentProvider((OrmPersistentType) persistentType, treeContentProvider); } - public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<XmlPersistentAttribute> + public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<OrmPersistentAttribute> { public PersistentTypeItemContentProvider( - XmlPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { + OrmPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentType, contentProvider); } @Override public Object getParent() { - return ((XmlPersistentType) model()).parent(); + return ((OrmPersistentType) model()).parent(); } @Override - protected ListValueModel<XmlPersistentAttribute> buildChildrenModel() { - java.util.List<ListValueModel<XmlPersistentAttribute>> list = new ArrayList<ListValueModel<XmlPersistentAttribute>>(); + protected ListValueModel<OrmPersistentAttribute> buildChildrenModel() { + java.util.List<ListValueModel<OrmPersistentAttribute>> list = new ArrayList<ListValueModel<OrmPersistentAttribute>>(); list.add(buildSpecifiedPersistentAttributesListHolder()); list.add(buildVirtualPersistentAttributesListHolder()); - return new CompositeListValueModel<ListValueModel<XmlPersistentAttribute>, XmlPersistentAttribute>(list); + return new CompositeListValueModel<ListValueModel<OrmPersistentAttribute>, OrmPersistentAttribute>(list); } - protected ListValueModel<XmlPersistentAttribute> buildSpecifiedPersistentAttributesListHolder() { - return new ListAspectAdapter<XmlPersistentType, XmlPersistentAttribute>(new String[]{IPersistentType.SPECIFIED_ATTRIBUTES_LIST}, (XmlPersistentType) model()) { + protected ListValueModel<OrmPersistentAttribute> buildSpecifiedPersistentAttributesListHolder() { + return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(new String[]{PersistentType.SPECIFIED_ATTRIBUTES_LIST}, (OrmPersistentType) model()) { @Override - protected ListIterator<XmlPersistentAttribute> listIterator_() { + protected ListIterator<OrmPersistentAttribute> listIterator_() { return subject.specifiedAttributes(); } @Override @@ -82,10 +82,10 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP }; } - protected ListValueModel<XmlPersistentAttribute> buildVirtualPersistentAttributesListHolder() { - return new ListAspectAdapter<XmlPersistentType, XmlPersistentAttribute>(new String[]{XmlPersistentType.VIRTUAL_ATTRIBUTES_LIST}, (XmlPersistentType) model()) { + protected ListValueModel<OrmPersistentAttribute> buildVirtualPersistentAttributesListHolder() { + return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(new String[]{OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST}, (OrmPersistentType) model()) { @Override - protected ListIterator<XmlPersistentAttribute> listIterator_() { + protected ListIterator<OrmPersistentAttribute> listIterator_() { return subject.virtualAttributes(); } @Override @@ -97,7 +97,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } - public static class OrmResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class OrmResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public OrmResourceModelItemContentProvider( OrmResourceModel ormResourceModel, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -110,11 +110,11 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<OrmResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (OrmResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<OrmResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (OrmResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; @@ -122,7 +122,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } - public static class EntityMappingsItemContentProvider extends AbstractTreeItemContentProvider<XmlPersistentType> + public static class EntityMappingsItemContentProvider extends AbstractTreeItemContentProvider<OrmPersistentType> { public EntityMappingsItemContentProvider( EntityMappings entityMappings, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -138,12 +138,12 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } @Override - protected ListValueModel<XmlPersistentType> buildChildrenModel() { - return new ListAspectAdapter<EntityMappings, XmlPersistentType>( + protected ListValueModel<OrmPersistentType> buildChildrenModel() { + return new ListAspectAdapter<EntityMappings, OrmPersistentType>( EntityMappings.PERSISTENT_TYPES_LIST, (EntityMappings) model()) { @Override - protected ListIterator<XmlPersistentType> listIterator_() { - return subject.xmlPersistentTypes(); + protected ListIterator<OrmPersistentType> listIterator_() { + return subject.ormPersistentTypes(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java index 6d743fe7af..42af3fe33c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.swt.graphics.Image; public class OrmItemLabelProviderFactory extends GeneralJpaMappingItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider labelProvider) { if (item instanceof EntityMappings) { return new EntityMappingsItemLabelProvider((EntityMappings) item, labelProvider); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java index 95b1525ac1..c6739df3e5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class OrmResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class OrmResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new OrmItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new OrmItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java index ee4d2dc7fc..3c5884aa03 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java @@ -13,18 +13,18 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator; import org.eclipse.jpt.utility.internal.model.value.CollectionListValueModelAdapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -34,31 +34,31 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyCollectionValueModelAdapter; public class PersistenceItemContentProviderFactory - implements ITreeItemContentProviderFactory + implements TreeItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider; if (item instanceof PersistenceResourceModel) { return new PersistenceResourceModelItemContentProvider((PersistenceResourceModel) item, treeContentProvider); } - else if (item instanceof IPersistence) { - return new PersistenceItemContentProvider((IPersistence) item, treeContentProvider); + else if (item instanceof Persistence) { + return new PersistenceItemContentProvider((Persistence) item, treeContentProvider); } - else if (item instanceof IPersistenceUnit) { - return new PersistenceUnitItemContentProvider((IPersistenceUnit) item, treeContentProvider); + else if (item instanceof PersistenceUnit) { + return new PersistenceUnitItemContentProvider((PersistenceUnit) item, treeContentProvider); } - else if (item instanceof IMappingFileRef) { - return new MappingFileRefItemContentProvider((IMappingFileRef) item, treeContentProvider); + else if (item instanceof MappingFileRef) { + return new MappingFileRefItemContentProvider((MappingFileRef) item, treeContentProvider); } - else if (item instanceof IClassRef) { - return new ClassRefItemContentProvider((IClassRef) item, treeContentProvider); + else if (item instanceof ClassRef) { + return new ClassRefItemContentProvider((ClassRef) item, treeContentProvider); } return null; } - public static class PersistenceResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class PersistenceResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public PersistenceResourceModelItemContentProvider( PersistenceResourceModel persistenceResourceModel, @@ -72,11 +72,11 @@ public class PersistenceItemContentProviderFactory } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<PersistenceResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (PersistenceResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<PersistenceResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (PersistenceResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; @@ -84,10 +84,10 @@ public class PersistenceItemContentProviderFactory } - public static class PersistenceItemContentProvider extends AbstractTreeItemContentProvider<IPersistenceUnit> + public static class PersistenceItemContentProvider extends AbstractTreeItemContentProvider<PersistenceUnit> { public PersistenceItemContentProvider( - IPersistence persistence, DelegatingTreeContentAndLabelProvider contentProvider) { + Persistence persistence, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistence, contentProvider); } @@ -100,11 +100,11 @@ public class PersistenceItemContentProviderFactory } @Override - protected ListValueModel<IPersistenceUnit> buildChildrenModel() { - return new ListAspectAdapter<IPersistence, IPersistenceUnit>( - IPersistence.PERSISTENCE_UNITS_LIST, (IPersistence) model()) { + protected ListValueModel<PersistenceUnit> buildChildrenModel() { + return new ListAspectAdapter<Persistence, PersistenceUnit>( + Persistence.PERSISTENCE_UNITS_LIST, (Persistence) model()) { @Override - protected ListIterator<IPersistenceUnit> listIterator_() { + protected ListIterator<PersistenceUnit> listIterator_() { return subject.persistenceUnits(); } }; @@ -112,57 +112,57 @@ public class PersistenceItemContentProviderFactory } - public static class PersistenceUnitItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class PersistenceUnitItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public PersistenceUnitItemContentProvider( - IPersistenceUnit persistenceUnit, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistenceUnit persistenceUnit, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistenceUnit, contentProvider); } @Override - public Object getParent() { - return ((IPersistenceUnit) model()).persistence(); + public Persistence getParent() { + return ((PersistenceUnit) model()).parent(); } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - ListValueModel<IJpaStructureNode> specifiedMappingFileLvm = - new ListAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - IPersistenceUnit.SPECIFIED_MAPPING_FILE_REF_LIST, - (IPersistenceUnit) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + ListValueModel<JpaStructureNode> specifiedMappingFileLvm = + new ListAspectAdapter<PersistenceUnit, JpaStructureNode>( + PersistenceUnit.SPECIFIED_MAPPING_FILE_REF_LIST, + (PersistenceUnit) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { - return new ReadOnlyCompositeListIterator<IJpaStructureNode>( + protected ListIterator<JpaStructureNode> listIterator_() { + return new ReadOnlyCompositeListIterator<JpaStructureNode>( subject.specifiedMappingFileRefs()); } }; - ListValueModel<IJpaStructureNode> impliedMappingFileLvm = - new CollectionListValueModelAdapter<IJpaStructureNode>( - new PropertyCollectionValueModelAdapter<IJpaStructureNode>( - new PropertyAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - IPersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY, - (IPersistenceUnit) model()) { + ListValueModel<JpaStructureNode> impliedMappingFileLvm = + new CollectionListValueModelAdapter<JpaStructureNode>( + new PropertyCollectionValueModelAdapter<JpaStructureNode>( + new PropertyAspectAdapter<PersistenceUnit, JpaStructureNode>( + PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY, + (PersistenceUnit) model()) { @Override - protected IJpaStructureNode buildValue_() { + protected JpaStructureNode buildValue_() { return subject.getImpliedMappingFileRef(); } })); - ListValueModel<IJpaStructureNode> classLvm = - new ListAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - new String[] {IPersistenceUnit.SPECIFIED_CLASS_REF_LIST, IPersistenceUnit.IMPLIED_CLASS_REF_LIST}, - (IPersistenceUnit) model()) { + ListValueModel<JpaStructureNode> classLvm = + new ListAspectAdapter<PersistenceUnit, JpaStructureNode>( + new String[] {PersistenceUnit.SPECIFIED_CLASS_REF_LIST, PersistenceUnit.IMPLIED_CLASS_REF_LIST}, + (PersistenceUnit) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { - return new ReadOnlyCompositeListIterator<IJpaStructureNode>( + protected ListIterator<JpaStructureNode> listIterator_() { + return new ReadOnlyCompositeListIterator<JpaStructureNode>( subject.classRefs()); } }; - List<ListValueModel<IJpaStructureNode>> list = new ArrayList<ListValueModel<IJpaStructureNode>>(); + List<ListValueModel<JpaStructureNode>> list = new ArrayList<ListValueModel<JpaStructureNode>>(); list.add(specifiedMappingFileLvm); list.add(impliedMappingFileLvm); list.add(classLvm); - return new CompositeListValueModel<ListValueModel<IJpaStructureNode>, IJpaStructureNode>(list); + return new CompositeListValueModel<ListValueModel<JpaStructureNode>, JpaStructureNode>(list); } } @@ -171,13 +171,13 @@ public class PersistenceItemContentProviderFactory public static class MappingFileRefItemContentProvider extends AbstractTreeItemContentProvider { public MappingFileRefItemContentProvider( - IMappingFileRef mappingFileRef, DelegatingTreeContentAndLabelProvider contentProvider) { + MappingFileRef mappingFileRef, DelegatingTreeContentAndLabelProvider contentProvider) { super(mappingFileRef, contentProvider); } @Override public Object getParent() { - return ((IMappingFileRef) model()).persistenceUnit(); + return ((MappingFileRef) model()).persistenceUnit(); } @Override @@ -191,13 +191,13 @@ public class PersistenceItemContentProviderFactory public static class ClassRefItemContentProvider extends AbstractTreeItemContentProvider { public ClassRefItemContentProvider( - IClassRef classRef, DelegatingTreeContentAndLabelProvider contentProvider) { + ClassRef classRef, DelegatingTreeContentAndLabelProvider contentProvider) { super(classRef, contentProvider); } @Override public Object getParent() { - return ((IClassRef) model()).persistenceUnit(); + return ((ClassRef) model()).persistenceUnit(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java index 9e882990a0..a72d6e76fa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java @@ -10,38 +10,38 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.swt.graphics.Image; public class PersistenceItemLabelProviderFactory - implements IItemLabelProviderFactory + implements ItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { - if (item instanceof IPersistence) { - return new PersistenceItemLabelProvider((IPersistence) item, contentAndLabelProvider); + if (item instanceof Persistence) { + return new PersistenceItemLabelProvider((Persistence) item, contentAndLabelProvider); } - else if (item instanceof IPersistenceUnit) { - return new PersistenceUnitItemLabelProvider((IPersistenceUnit) item, contentAndLabelProvider); + else if (item instanceof PersistenceUnit) { + return new PersistenceUnitItemLabelProvider((PersistenceUnit) item, contentAndLabelProvider); } - else if (item instanceof IMappingFileRef) { - return new MappingFileRefItemLabelProvider((IMappingFileRef) item, contentAndLabelProvider); + else if (item instanceof MappingFileRef) { + return new MappingFileRefItemLabelProvider((MappingFileRef) item, contentAndLabelProvider); } - else if (item instanceof IClassRef) { - return new ClassRefItemLabelProvider((IClassRef) item, contentAndLabelProvider); + else if (item instanceof ClassRef) { + return new ClassRefItemLabelProvider((ClassRef) item, contentAndLabelProvider); } return null; } @@ -50,7 +50,7 @@ public class PersistenceItemLabelProviderFactory public static class PersistenceItemLabelProvider extends AbstractItemLabelProvider { public PersistenceItemLabelProvider( - IPersistence persistence, DelegatingContentAndLabelProvider labelProvider) { + Persistence persistence, DelegatingContentAndLabelProvider labelProvider) { super(persistence, labelProvider); } @@ -69,13 +69,13 @@ public class PersistenceItemLabelProviderFactory public static class PersistenceUnitItemLabelProvider extends AbstractItemLabelProvider { public PersistenceUnitItemLabelProvider( - IPersistenceUnit persistenceUnit, DelegatingContentAndLabelProvider labelProvider) { + PersistenceUnit persistenceUnit, DelegatingContentAndLabelProvider labelProvider) { super(persistenceUnit, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistenceUnit, String>(IPersistenceUnit.NAME_PROPERTY, (IPersistenceUnit) model()) { + return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, (PersistenceUnit) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -93,13 +93,13 @@ public class PersistenceItemLabelProviderFactory public static class MappingFileRefItemLabelProvider extends AbstractItemLabelProvider { public MappingFileRefItemLabelProvider( - IMappingFileRef mappingFileRef, DelegatingContentAndLabelProvider labelProvider) { + MappingFileRef mappingFileRef, DelegatingContentAndLabelProvider labelProvider) { super(mappingFileRef, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IMappingFileRef, String>(IMappingFileRef.FILE_NAME_PROPERTY, (IMappingFileRef) model()) { + return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, (MappingFileRef) model()) { @Override protected String buildValue_() { return subject.getFileName(); @@ -110,7 +110,7 @@ public class PersistenceItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { Image image = JptUiPlugin.getImage(JptUiIcons.MAPPING_FILE_REF); - if (((IMappingFileRef) model()).isVirtual()) { + if (((MappingFileRef) model()).isVirtual()) { image = JptUiIcons.ghost(image); } return new StaticPropertyValueModel<Image>(image); @@ -121,13 +121,13 @@ public class PersistenceItemLabelProviderFactory public static class ClassRefItemLabelProvider extends AbstractItemLabelProvider { public ClassRefItemLabelProvider( - IClassRef classRef, DelegatingContentAndLabelProvider labelProvider) { + ClassRef classRef, DelegatingContentAndLabelProvider labelProvider) { super(classRef, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IClassRef, String>(IClassRef.CLASS_NAME_PROPERTY, (IClassRef) model()) { + return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, (ClassRef) model()) { @Override protected String buildValue_() { return subject.getClassName(); @@ -138,7 +138,7 @@ public class PersistenceItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { Image image = JptUiPlugin.getImage(JptUiIcons.CLASS_REF); - if (((IClassRef) model()).isVirtual()) { + if (((ClassRef) model()).isVirtual()) { image = JptUiIcons.ghost(image); } return new StaticPropertyValueModel<Image>(image); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java index cbcb257fd0..5cdc82babd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class PersistenceResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class PersistenceResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new PersistenceItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new PersistenceItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java index e2b2df4229..11a2a27115 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.IResourceModel; +import org.eclipse.jpt.core.ResourceModel; public abstract class ResourceModelStructureProvider - implements IJpaStructureProvider + implements JpaStructureProvider { - protected IResourceModel resourceModel; + protected ResourceModel resourceModel; - public ResourceModelStructureProvider(IResourceModel resourceModel) { + public ResourceModelStructureProvider(ResourceModel resourceModel) { this.resourceModel = resourceModel; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java index 96c28f489c..8d729c6ca6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java @@ -8,8 +8,8 @@ ********************************************************************************/ package org.eclipse.jpt.ui.internal.views; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; -import org.eclipse.jpt.ui.internal.selection.IJpaSelectionManager; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelectionManager; import org.eclipse.jpt.ui.internal.selection.SelectionManagerFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -25,7 +25,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * This is the abstract implementation of the JPA view. The selection is changed * by receiving a <code>IJpaSelection</code>. * - * @see IJpaSelection + * @see JpaSelection * * @version 2.0 * @since 1.0 @@ -82,7 +82,7 @@ public abstract class AbstractJpaView extends ViewPart subcreatePartControl(parent); - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(getViewSite().getWorkbenchWindow()); selectionManager.register(this); @@ -110,7 +110,7 @@ public abstract class AbstractJpaView extends ViewPart * * @param jpaSelection The new selection used to update this JPA view */ - public abstract void select(IJpaSelection jpaSelection); + public abstract void select(JpaSelection jpaSelection); /* * (non-Javadoc) diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java index 88aa508f36..8e225fbb38 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java @@ -10,15 +10,15 @@ package org.eclipse.jpt.ui.internal.views; import java.util.HashMap; import java.util.Map; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; @@ -36,17 +36,17 @@ public class JpaDetailsView extends AbstractJpaView * The current <code>IJpaDetailsPage</code> that was retrieve based on the * current selection. */ - private IJpaDetailsPage<IJpaStructureNode> currentPage; + private JpaDetailsPage<JpaStructureNode> currentPage; /** * The current selection used to show the right <code>IJpaDetailsPage</code>. */ - private IJpaSelection currentSelection; + private JpaSelection currentSelection; /** * key: Object content node id, value: Composite page. */ - private Map<Object, IJpaDetailsPage<? extends IJpaStructureNode>> detailsPages; + private Map<Object, JpaDetailsPage<? extends JpaStructureNode>> detailsPages; /** * Creates a new <code>JpaDetailsView</code>. @@ -55,8 +55,8 @@ public class JpaDetailsView extends AbstractJpaView super(JptUiMessages.JpaDetailsView_viewNotAvailable); } - private IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage(IJpaStructureNode structureNode) { - IJpaDetailsProvider detailsProvider = getDetailsProvider(structureNode); + private JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage(JpaStructureNode structureNode) { + JpaDetailsProvider detailsProvider = getDetailsProvider(structureNode); if (detailsProvider == null) { return null; @@ -67,7 +67,7 @@ public class JpaDetailsView extends AbstractJpaView Composite container = getWidgetFactory().createComposite(getPageBook()); container.setLayout(new FillLayout(SWT.HORIZONTAL)); - IJpaDetailsPage<? extends IJpaStructureNode> page = detailsProvider.buildDetailsPage( + JpaDetailsPage<? extends JpaStructureNode> page = detailsProvider.buildDetailsPage( container, id, getWidgetFactory() @@ -88,15 +88,15 @@ public class JpaDetailsView extends AbstractJpaView detailsPages.clear(); - currentSelection = IJpaSelection.NULL_SELECTION; + currentSelection = JpaSelection.NULL_SELECTION; currentPage = null; super.dispose(); } - private IJpaDetailsPage<? extends IJpaStructureNode> getDetailsPage(IJpaStructureNode structureNode) { + private JpaDetailsPage<? extends JpaStructureNode> getDetailsPage(JpaStructureNode structureNode) { if (detailsPages.containsKey(structureNode.getId())) { - IJpaDetailsPage page = detailsPages.get(structureNode.getId()); + JpaDetailsPage page = detailsPages.get(structureNode.getId()); if ((page != null) && (page.getControl().isDisposed())) { @@ -109,17 +109,17 @@ public class JpaDetailsView extends AbstractJpaView return buildDetailsPage(structureNode); } - private IJpaDetailsProvider getDetailsProvider(IJpaStructureNode structureNode) { + private JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) { String platformId = structureNode.jpaProject().jpaPlatform().getId(); - IJpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); + JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); return jpaPlatformUI.detailsProvider(structureNode); //TODO this view and the detailsProviders Map is not created on a per project basis. //the detailsProviders and their fileContentTypes could overlap across project, this would cause problems with storing this map. } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return currentSelection; } @@ -130,8 +130,8 @@ public class JpaDetailsView extends AbstractJpaView protected void initialize() { super.initialize(); - this.currentSelection = IJpaSelection.NULL_SELECTION; - this.detailsPages = new HashMap<Object, IJpaDetailsPage<? extends IJpaStructureNode>>(); + this.currentSelection = JpaSelection.NULL_SELECTION; + this.detailsPages = new HashMap<Object, JpaDetailsPage<? extends JpaStructureNode>>(); } private void log(String message) { @@ -144,16 +144,16 @@ public class JpaDetailsView extends AbstractJpaView * (non-Javadoc) */ @Override - public void select(IJpaSelection jpaSelection) { + public void select(JpaSelection jpaSelection) { if (jpaSelection.equals(currentSelection)) { return; } currentSelection = jpaSelection; - if (jpaSelection != IJpaSelection.NULL_SELECTION) { - IJpaStructureNode newNode = jpaSelection.getSelectedNode(); - IJpaDetailsPage<? extends IJpaStructureNode> newPage = getDetailsPage(newNode); + if (jpaSelection != JpaSelection.NULL_SELECTION) { + JpaStructureNode newNode = jpaSelection.getSelectedNode(); + JpaDetailsPage<? extends JpaStructureNode> newPage = getDetailsPage(newNode); setCurrentPage(newPage); } else { @@ -166,7 +166,7 @@ public class JpaDetailsView extends AbstractJpaView * * @param newPage The new page to display */ - private void setCurrentPage(IJpaDetailsPage<? extends IJpaStructureNode> page) { + private void setCurrentPage(JpaDetailsPage<? extends JpaStructureNode> page) { // Unpopulate old page if (currentPage != null) { @@ -180,7 +180,7 @@ public class JpaDetailsView extends AbstractJpaView } } - IJpaDetailsPage<IJpaStructureNode> newPage = (IJpaDetailsPage<IJpaStructureNode>) page; + JpaDetailsPage<JpaStructureNode> newPage = (JpaDetailsPage<JpaStructureNode>) page; // Populate new page if (page != null) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java index 351f7f94fe..b4c558ff0e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java @@ -24,11 +24,11 @@ import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; import org.eclipse.jpt.ui.internal.selection.JpaSelection; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.selection.DefaultJpaSelection; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; @@ -41,7 +41,7 @@ import org.eclipse.ui.part.Page; public class JpaStructurePage extends Page implements ISelectionProvider, ISelectionChangedListener { - private IJpaStructureProvider structureProvider; + private JpaStructureProvider structureProvider; private ListenerList selectionChangedListeners; @@ -51,7 +51,7 @@ public class JpaStructurePage extends Page private JpaStructureView jpaStructureView; - public JpaStructurePage(JpaStructureView jpaStructureView, IJpaStructureProvider structureProvider) { + public JpaStructurePage(JpaStructureView jpaStructureView, JpaStructureProvider structureProvider) { this.jpaStructureView = jpaStructureView; this.structureProvider = structureProvider; this.selectionChangedListeners = new ListenerList(); @@ -125,7 +125,7 @@ public class JpaStructurePage extends Page - void select(IJpaSelection selection) { + void select(JpaSelection selection) { if (selection.isEmpty()) { viewer.setSelection(StructuredSelection.EMPTY); } @@ -145,13 +145,13 @@ public class JpaStructurePage extends Page selectionChangedListeners.remove(listener); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { ITreeSelection viewerSelection = (ITreeSelection) viewer.getSelection(); if (viewerSelection.isEmpty() || viewerSelection.size() > 1) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - return new JpaSelection((IJpaStructureNode) viewerSelection.getFirstElement()); + return new DefaultJpaSelection((JpaStructureNode) viewerSelection.getFirstElement()); } public void setSelection(ISelection selection) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java index bf5e6127df..1e0b68c165 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java @@ -9,14 +9,14 @@ package org.eclipse.jpt.ui.internal.views.structure; import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; -import org.eclipse.jpt.ui.internal.selection.IJpaSelectionManager; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelectionManager; import org.eclipse.jpt.ui.internal.selection.SelectionManagerFactory; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; @@ -36,7 +36,7 @@ public class JpaStructureView extends PageBookView public void createPartControl(Composite parent) { super.createPartControl(parent); - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(getViewSite().getWorkbenchWindow()); selectionManager.register(this); @@ -69,7 +69,7 @@ public class JpaStructureView extends PageBookView @Override protected PageRec doCreatePage(IWorkbenchPart part) { - IJpaStructureProvider structureProvider = + JpaStructureProvider structureProvider = structureProvider(part); if (structureProvider != null) { JpaStructurePage page = new JpaStructurePage(this, structureProvider); @@ -80,15 +80,15 @@ public class JpaStructureView extends PageBookView return null; } - private IJpaStructureProvider structureProvider(IWorkbenchPart part) { - IJpaFile jpaFile = - (IJpaFile) part.getAdapter(IJpaFile.class); + private JpaStructureProvider structureProvider(IWorkbenchPart part) { + JpaFile jpaFile = + (JpaFile) part.getAdapter(JpaFile.class); if (jpaFile == null) { return null; } - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.jpaProject().jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.jpaProject().jpaPlatform()); return platformUi.buildStructureProvider(jpaFile); } @@ -100,16 +100,16 @@ public class JpaStructureView extends PageBookView pageRecord.dispose(); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { if (getCurrentPage() != getDefaultPage()) { return ((JpaStructurePage) getCurrentPage()).getSelection(); } else { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } } - public void select(IJpaSelection newSelection) { + public void select(JpaSelection newSelection) { // correct page should be shown if (getCurrentPage() != getDefaultPage()) { ((JpaStructurePage) getCurrentPage()).select(newSelection); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java index 2d9b7d3e8f..002b509f43 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java @@ -89,7 +89,7 @@ abstract class AbstractEnumComboViewer<T extends Model, V> extends AbstractPane< */ AbstractEnumComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java index d7430b9ec8..bfa266b626 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java @@ -106,7 +106,7 @@ public abstract class AbstractFormPane<T extends Model> extends AbstractPane<T> */ protected AbstractFormPane(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java index 326b2a2fab..5a2256590e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java @@ -129,7 +129,7 @@ public abstract class AbstractPane<T extends Model> /** * The factory used to create various common widgets. */ - private IWidgetFactory widgetFactory; + private WidgetFactory widgetFactory; /** * Creates a new <code>AbstractSubjectPane</code>. @@ -229,7 +229,7 @@ public abstract class AbstractPane<T extends Model> */ protected AbstractPane(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(); @@ -2327,7 +2327,7 @@ public abstract class AbstractPane<T extends Model> * * @category Layout */ - protected final IWidgetFactory getWidgetFactory() { + protected final WidgetFactory getWidgetFactory() { return this.widgetFactory; } @@ -2403,7 +2403,7 @@ public abstract class AbstractPane<T extends Model> */ @SuppressWarnings("unchecked") private void initialize(PropertyValueModel<? extends T> subjectHolder, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { Assert.isNotNull(subjectHolder, "The subject holder cannot be null"); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java index 1b5d1ad939..e4ccca8142 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java @@ -27,12 +27,12 @@ import org.eclipse.ui.forms.widgets.Section; * @version 2.0 * @since 2.0 */ -public final class DefaultWidgetFactory implements IWidgetFactory { +public final class DefaultWidgetFactory implements WidgetFactory { /** * The singleton instance of this <code>IWidgetFactory</code> */ - private static final IWidgetFactory INSTANCE = new DefaultWidgetFactory(); + private static final WidgetFactory INSTANCE = new DefaultWidgetFactory(); /** * Creates a new <code>DefaultWidgetFactory</code>. @@ -46,7 +46,7 @@ public final class DefaultWidgetFactory implements IWidgetFactory { * * @return The singleton instance of this <code>IWidgetFactory</code> */ - public static IWidgetFactory instance() { + public static WidgetFactory instance() { return INSTANCE; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java index 1a44304356..4355d92e1b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java @@ -60,7 +60,7 @@ public abstract class EnumDialogComboViewer<T extends Model, V> extends Abstract */ protected EnumDialogComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java index 080970d4d7..2b1066131f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java @@ -59,7 +59,7 @@ public abstract class EnumFormComboViewer<T extends Model, V> extends AbstractEn */ protected EnumFormComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java index 0ef880f15b..668c8a446b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java @@ -36,7 +36,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @since 2.0 */ @SuppressWarnings("nls") -public final class FormWidgetFactory implements IWidgetFactory { +public final class FormWidgetFactory implements WidgetFactory { /** * The actual factory responsible for creating the new widgets. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java index df026d9010..6e77b469b8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java @@ -47,7 +47,7 @@ public final class TriStateCheckBox * @param parent The parent composite * @param widgetFactory The factory used to create the check box */ - public TriStateCheckBox(Composite parent, IWidgetFactory widgetFactory) { + public TriStateCheckBox(Composite parent, WidgetFactory widgetFactory) { this(parent, null, widgetFactory); } @@ -60,7 +60,7 @@ public final class TriStateCheckBox */ public TriStateCheckBox(Composite parent, String text, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(); this.state = TriState.UNCHECKED; this.button = widgetFactory.createCheckBox(parent, text); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/IWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/WidgetFactory.java index 38a0359c37..689f670f59 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/IWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/WidgetFactory.java @@ -28,7 +28,7 @@ import org.eclipse.ui.forms.widgets.Section; * @version 2.0 * @since 2.0 */ -public interface IWidgetFactory { +public interface WidgetFactory { /** * Creates a new regular button. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java index 80509f9f86..4e1c056322 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java @@ -15,7 +15,7 @@ import java.util.Iterator; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionListener; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; @@ -24,7 +24,7 @@ import org.eclipse.jpt.db.internal.JptDbPlugin; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; @@ -41,12 +41,12 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.ui.PlatformUI; public class DatabaseReconnectWizardPage extends WizardPage { - private IJpaProject jpaProject; + private JpaProject jpaProject; private ConnectionProfile profile; private ConnectionListener connectionListener; - public DatabaseReconnectWizardPage( IJpaProject jpaProject) { + public DatabaseReconnectWizardPage( JpaProject jpaProject) { super( "Database Settings"); //$NON-NLS-1$ this.jpaProject = jpaProject; setTitle( JptUiMessages.DatabaseReconnectWizardPage_databaseConnection); @@ -66,7 +66,7 @@ public class DatabaseReconnectWizardPage extends WizardPage { new DatabaseGroup( composite); Dialog.applyDialogFont( parent); // TODO Add Help - testing - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); return composite; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java index 46e5bea98f..4f9be9c803 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.CollectionTools; public class GenerateEntitiesWizard extends Wizard { - private IJpaProject jpaProject; + private JpaProject jpaProject; private IStructuredSelection selection; @@ -44,7 +44,7 @@ public class GenerateEntitiesWizard extends Wizard { private Collection<Table> selectedTables; - public GenerateEntitiesWizard( IJpaProject jpaProject, IStructuredSelection selection) { + public GenerateEntitiesWizard( JpaProject jpaProject, IStructuredSelection selection) { super(); this.jpaProject = jpaProject; this.selection = selection; @@ -116,7 +116,7 @@ public class GenerateEntitiesWizard extends Wizard { return this.jpaProject.connectionProfile(); } - IJpaProject getJpaProject(){ + JpaProject getJpaProject(){ return this.jpaProject; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java index 10e64f2007..7b8036faa3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java @@ -36,7 +36,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.gen.internal.EntityGenerator; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.swt.SWT; @@ -104,7 +104,7 @@ class GenerateEntitiesWizardPage extends NewTypeWizardPage { GridLayout layout = new GridLayout(); layout.numColumns = nColumns; composite.setLayout(layout); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.DIALOG_GENERATE_ENTITIES); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES); createContainerControls(composite, nColumns); createPackageControls(composite, nColumns); @@ -143,7 +143,7 @@ class GenerateEntitiesWizardPage extends NewTypeWizardPage { synchronizeClassesCheckBox.setSelection(!generateEntitiesWizard.getJpaProject().discoversAnnotatedClasses()); setSynchronizePersistenceXml(synchronizeClassesCheckBox.getSelection()); - PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), IJpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES); setControl(composite); this.setPageComplete( false); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java index a200130029..73edc5f566 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java @@ -22,14 +22,14 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.facet.IJpaFacetDataModelProperties; +import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.prefs.JpaPreferencePage; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; @@ -57,7 +57,7 @@ import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage; public class JpaFacetWizardPage extends DataModelFacetInstallPage - implements IJpaFacetDataModelProperties + implements JpaFacetDataModelProperties { public JpaFacetWizardPage() { @@ -83,7 +83,7 @@ public class JpaFacetWizardPage setUpRuntimeListener(); Dialog.applyDialogFont(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJpaHelpContextIds.DIALOG_JPA_FACET); + PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, JpaHelpContextIds.DIALOG_JPA_FACET); return composite; } @@ -165,7 +165,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_platformLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.DIALOG_JPA_PLATFORM); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.DIALOG_JPA_PLATFORM); platformCombo = new ComboViewer(createCombo(group, 1, true)); platformCombo.setContentProvider( @@ -228,7 +228,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_connectionLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE); connectionCombo = createCombo(group, 1, true); connectionCombo.addSelectionListener( @@ -305,7 +305,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_jpaImplementationLabel); group.setLayout(new GridLayout(2, false)); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); boolean useServerLib = model.getBooleanProperty(USE_SERVER_JPA_IMPLEMENTATION); @@ -417,7 +417,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_persistentClassManagementLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); boolean discoverClasses = model.getBooleanProperty(DISCOVER_ANNOTATED_CLASSES); @@ -473,7 +473,7 @@ public class JpaFacetWizardPage Composite group = new Composite(composite, SWT.NONE); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.DIALOG_CREATE_ORM); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.DIALOG_CREATE_ORM); createOrmXmlButton = new Button(group, SWT.CHECK); createOrmXmlButton.setText(JptUiMessages.JpaFacetWizardPage_createOrmXmlButton); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java index 299d2ebb06..b11156e277 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java @@ -8,7 +8,7 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.wizards; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectFirstPage; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -19,6 +19,6 @@ public class NewJpaProjectFirstPage extends UtilityProjectFirstPage super(dataModel, pageName); setTitle(JptUiMessages.NewJpaProjectWizard_firstPage_title); setDescription(JptUiMessages.NewJpaProjectWizard_firstPage_description); - setInfopopID(IJpaHelpContextIds.NEW_JPA_PROJECT); + setInfopopID(JpaHelpContextIds.NEW_JPA_PROJECT); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java index d5f83a3b49..770ba44c6c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.ui.internal.wizards; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java deleted file mode 100644 index 564c994889..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 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.xml.details; - -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.orm.IOrmStructureNodes; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; - -/** - * This provider is responsible for creating the <code>IJpaDetailsPage</code> - * when the information comes from the XML file (either from the persistence - * configuration or from the Mappings Descriptor). - * - * @version 2.0 - * @since 1.0 - */ -public class XmlDetailsProvider - implements IJpaDetailsProvider -{ - /** - * Creates a new <code>XmlDetailsProvider</code>. - */ - public XmlDetailsProvider() { - super(); - } - - /* - * (non-Javadoc) - */ - public IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( - Composite parent, - Object contentNodeId, - TabbedPropertySheetWidgetFactory widgetFactory) { - - if (contentNodeId == IOrmStructureNodes.ENTITY_MAPPINGS_ID) { - return new XmlEntityMappingsDetailsPage(parent, widgetFactory); - } - - if (contentNodeId == IOrmStructureNodes.PERSISTENT_TYPE_ID) { - return new XmlPersistentTypeDetailsPage(parent, widgetFactory); - } - - if (contentNodeId == IOrmStructureNodes.PERSISTENT_ATTRIBUTE_ID) { - return new XmlPersistentAttributeDetailsPage(parent, widgetFactory); - } - - return null; - } -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/AttributeMappingUiProvider.java index c3960c40a4..3259d36e17 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/AttributeMappingUiProvider.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.details; +package org.eclipse.jpt.ui.java.details; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public interface IAttributeMappingUiProvider<T extends IAttributeMapping> +public interface AttributeMappingUiProvider<T extends AttributeMapping> { /** * A unique string that corresponds to the key of a MappingProvider in the core @@ -34,8 +34,8 @@ public interface IAttributeMappingUiProvider<T extends IAttributeMapping> * * @return */ - IJpaComposite<T> buildAttributeMappingComposite( - IJpaUiFactory factory, + JpaComposite<T> buildAttributeMappingComposite( + JpaUiFactory factory, PropertyValueModel<T> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/TypeMappingUiProvider.java index b97cba51cf..b2102ffef1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/TypeMappingUiProvider.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.details; +package org.eclipse.jpt.ui.java.details; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public interface ITypeMappingUiProvider<T extends ITypeMapping> +public interface TypeMappingUiProvider<T extends TypeMapping> { /** * A unique string that corresponds to the key of a MappingProvider in the core @@ -37,7 +37,7 @@ public interface ITypeMappingUiProvider<T extends ITypeMapping> * @param widgetFactory * @return */ - IJpaComposite<T> buildPersistentTypeMappingComposite( + JpaComposite<T> buildPersistentTypeMappingComposite( PropertyValueModel<T> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); |