Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2009-11-24 17:09:37 -0500
committerkmoore2009-11-24 17:09:37 -0500
commit3cb270f2fb73efbd4f5b8ba79521eddffe93ed8a (patch)
treed5e0b39402a8467735921f5b0ebca1ade6a9ae0c
parent269ef309900e8efc479085db5c2cb00386c3fcea (diff)
downloadwebtools.dali-3cb270f2fb73efbd4f5b8ba79521eddffe93ed8a.tar.gz
webtools.dali-3cb270f2fb73efbd4f5b8ba79521eddffe93ed8a.tar.xz
webtools.dali-3cb270f2fb73efbd4f5b8ba79521eddffe93ed8a.zip
renamed some 2_0 xml resource model classes to fit the existing pattern
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/model/orm.ecore11
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlSingleRelationshipMapping.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java136
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable_2_0.java (renamed from jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable2_0.java)10
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlEntity_2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToMany_2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToOne_2_0.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java (renamed from jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable2_0.java)12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore2
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java4
25 files changed, 155 insertions, 154 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
index fdc1348485..406ac2ec9d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.core/model/jpaResourceModels.genmodel
@@ -452,11 +452,11 @@
<genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlUniqueConstraint_2_0">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlUniqueConstraint_2_0/name"/>
</genClasses>
- <genClasses ecoreClass="orm.ecore#//v2_0/XmlCacheable2_0">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable2_0/cacheable"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlCacheable_2_0">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlCacheable_2_0/cacheable"/>
</genClasses>
- <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrphanRemovable2_0">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable2_0/orphanRemoval"/>
+ <genClasses image="false" ecoreClass="orm.ecore#//v2_0/XmlOrphanRemovable_2_0">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute orm.ecore#//v2_0/XmlOrphanRemovable_2_0/orphanRemoval"/>
</genClasses>
</nestedGenPackages>
</genPackages>
diff --git a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
index 3f0fb5df07..f6a3bcc18b 100644
--- a/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.core/model/orm.ecore
@@ -475,7 +475,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlEmbedded_2_0" abstract="true" interface="true"
eSuperTypes="#//XmlAssociationOverrideContainer"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntity_2_0" abstract="true" interface="true"
- eSuperTypes="#//v2_0/XmlCacheable2_0"/>
+ eSuperTypes="#//v2_0/XmlCacheable_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlEntityListener_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
@@ -516,7 +516,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="lockMode" eType="#//v2_0/LockModeType_2_0"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true"
- interface="true" eSuperTypes="#//v2_0/XmlOrphanRemovable2_0">
+ interface="true" eSuperTypes="#//v2_0/XmlOrphanRemovable_2_0">
<eStructuralFeatures xsi:type="ecore:EReference" name="orderColumn" eType="#//XmlOrderColumn"
containment="true" resolveProxies="false"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mapKeyClass" eType="#//XmlMapKeyClass"
@@ -531,7 +531,7 @@
eType="#//XmlJoinColumn" containment="true" resolveProxies="false"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToOne_2_0" abstract="true" interface="true"
- eSuperTypes="#//v2_0/XmlSingleRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable2_0"/>
+ eSuperTypes="#//v2_0/XmlSingleRelationshipMapping_2_0 #//v2_0/XmlOrphanRemovable_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="nullable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
@@ -580,10 +580,11 @@
<eLiterals name="PESSIMISTIC_WRITE" value="6"/>
<eLiterals name="PESSIMISTIC_FORCE_INCREMENT" value="7"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlCacheable2_0" abstract="true" interface="true">
+ <eClassifiers xsi:type="ecore:EClass" name="XmlCacheable_2_0" abstract="true"
+ interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="cacheable" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="XmlOrphanRemovable2_0" abstract="true"
+ <eClassifiers xsi:type="ecore:EClass" name="XmlOrphanRemovable_2_0" abstract="true"
interface="true">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="orphanRemoval" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//BooleanObject"/>
</eClassifiers>
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
index 37d9e3d77a..69a960cb7c 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmXmlContextNodeFactory.java
@@ -173,10 +173,10 @@ import org.eclipse.jpt.core.resource.orm.XmlTransient;
import org.eclipse.jpt.core.resource.orm.XmlTypeMapping;
import org.eclipse.jpt.core.resource.orm.XmlUniqueConstraint;
import org.eclipse.jpt.core.resource.orm.XmlVersion;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.jpt.core.resource.xml.JpaXmlResource;
public abstract class AbstractOrmXmlContextNodeFactory implements OrmXml2_0ContextNodeFactory
@@ -391,11 +391,11 @@ public abstract class AbstractOrmXmlContextNodeFactory implements OrmXml2_0Conte
throw new UnsupportedOperationException();
}
- public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable2_0 resource) {
+ public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable_2_0 resource) {
return new NullOrmCacheable2_0(parent);
}
- public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable2_0 resource) {
+ public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable_2_0 resource) {
return new NullOrmOrphanRemoval2_0(parent);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
index 03907c97fe..da3d2fcb2a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmCacheable2_0.java
@@ -12,20 +12,20 @@ package org.eclipse.jpt.core.internal.jpa2.context.orm;
import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
public class GenericOrmCacheable2_0 extends AbstractOrmXmlContextNode
implements OrmCacheable2_0
{
- protected final XmlCacheable2_0 resource;
+ protected final XmlCacheable_2_0 resource;
protected boolean defaultCacheable;
protected Boolean specifiedCacheable;
- public GenericOrmCacheable2_0(OrmCacheableHolder2_0 parent, XmlCacheable2_0 resource) {
+ public GenericOrmCacheable2_0(OrmCacheableHolder2_0 parent, XmlCacheable_2_0 resource) {
super(parent);
this.resource = resource;
this.specifiedCacheable = this.getResourceCacheable();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
index 42c2f82587..2402b9381a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmOrphanRemoval2_0.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.core.internal.jpa2.context.orm;
import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode;
import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmOrphanRemovalHolder2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
/**
@@ -21,12 +21,12 @@ import org.eclipse.jpt.core.utility.TextRange;
public class GenericOrmOrphanRemoval2_0 extends AbstractOrmXmlContextNode
implements OrmOrphanRemovable2_0
{
- protected final XmlOrphanRemovable2_0 resource;
+ protected final XmlOrphanRemovable_2_0 resource;
protected boolean defaultOrphanRemoval;
protected Boolean specifiedOrphanRemoval;
// ********** constructor **********
- public GenericOrmOrphanRemoval2_0(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable2_0 resource) {
+ public GenericOrmOrphanRemoval2_0(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable_2_0 resource) {
super(parent);
this.resource = resource;
this.specifiedOrphanRemoval = this.getResourceOrphanRemoval();
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
index 7058fd3b67..611795c0ae 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/jpa2/context/orm/GenericOrmXml2_0ContextNodeFactory.java
@@ -60,10 +60,10 @@ 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;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
public class GenericOrmXml2_0ContextNodeFactory extends AbstractOrmXmlContextNodeFactory
{
@@ -119,12 +119,12 @@ public class GenericOrmXml2_0ContextNodeFactory extends AbstractOrmXmlContextNod
}
@Override
- public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable2_0 resource) {
+ public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable_2_0 resource) {
return new GenericOrmCacheable2_0(parent, resource);
}
@Override
- public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable2_0 resource) {
+ public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable_2_0 resource) {
return new GenericOrmOrphanRemoval2_0(parent, resource);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
index a58d31ba44..ce351c0245 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/jpa2/context/orm/OrmXml2_0ContextNodeFactory.java
@@ -16,10 +16,10 @@ import org.eclipse.jpt.core.context.orm.OrmXmlContextNodeFactory;
import org.eclipse.jpt.core.jpa2.context.java.JavaElementCollectionMapping2_0;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
public interface OrmXml2_0ContextNodeFactory extends OrmXmlContextNodeFactory
{
@@ -42,7 +42,7 @@ public interface OrmXml2_0ContextNodeFactory extends OrmXmlContextNodeFactory
XmlElementCollection buildVirtualXmlElementCollection2_0(
OrmTypeMapping ormTypeMapping, JavaElementCollectionMapping2_0 javaMapping);
- OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable2_0 resource);
+ OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable_2_0 resource);
- OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable2_0 resource);
+ OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable_2_0 resource);
}
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlSingleRelationshipMapping.java
index c40d99dd57..cc4fc71665 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlSingleRelationshipMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/AbstractXmlSingleRelationshipMapping.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlSingleRelationshipMapping_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.wst.common.internal.emf.resource.Translator;
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
index f1cb7a705c..5807fda96e 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlEntity.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.core.internal.utility.translators.EmptyTagBooleanTranslat
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -1555,7 +1555,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
* <!-- end-user-doc -->
* @return the value of the '<em>Cacheable</em>' attribute.
* @see #setCacheable(Boolean)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlCacheable2_0_Cacheable()
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlCacheable_2_0_Cacheable()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
@@ -2016,11 +2016,11 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
default: return -1;
}
}
- if (baseClass == XmlCacheable2_0.class)
+ if (baseClass == XmlCacheable_2_0.class)
{
switch (derivedFeatureID)
{
- case OrmPackage.XML_ENTITY__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE2_0__CACHEABLE;
+ case OrmPackage.XML_ENTITY__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
default: return -1;
}
}
@@ -2090,11 +2090,11 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
default: return -1;
}
}
- if (baseClass == XmlCacheable2_0.class)
+ if (baseClass == XmlCacheable_2_0.class)
{
switch (baseFeatureID)
{
- case OrmV2_0Package.XML_CACHEABLE2_0__CACHEABLE: return OrmPackage.XML_ENTITY__CACHEABLE;
+ case OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE: return OrmPackage.XML_ENTITY__CACHEABLE;
default: return -1;
}
}
@@ -2196,7 +2196,7 @@ public class XmlEntity extends AbstractXmlTypeMapping implements XmlQueryContain
}
protected static Translator buildCacheableTranslator() {
- return new Translator(JPA2_0.CACHEABLE, OrmV2_0Package.eINSTANCE.getXmlCacheable2_0_Cacheable(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA2_0.CACHEABLE, OrmV2_0Package.eINSTANCE.getXmlCacheable_2_0_Cacheable(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildTableTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
index c7d7aa1d2a..ba54f9486a 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToMany.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlOneToMany_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.wst.common.internal.emf.resource.Translator;
/**
@@ -513,7 +513,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
* <!-- end-user-doc -->
* @return the value of the '<em>Orphan Removal</em>' attribute.
* @see #setOrphanRemoval(Boolean)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrphanRemovable2_0_OrphanRemoval()
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrphanRemovable_2_0_OrphanRemoval()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
@@ -730,11 +730,11 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrphanRemovable2_0.class)
+ if (baseClass == XmlOrphanRemovable_2_0.class)
{
switch (derivedFeatureID)
{
- case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL: return OrmV2_0Package.XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL;
+ case OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL: return OrmV2_0Package.XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL;
default: return -1;
}
}
@@ -771,11 +771,11 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrphanRemovable2_0.class)
+ if (baseClass == XmlOrphanRemovable_2_0.class)
{
switch (baseFeatureID)
{
- case OrmV2_0Package.XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL: return OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL;
+ case OrmV2_0Package.XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL: return OrmPackage.XML_ONE_TO_MANY__ORPHAN_REMOVAL;
default: return -1;
}
}
@@ -855,7 +855,7 @@ public class XmlOneToMany extends AbstractXmlMultiRelationshipMapping implements
}
protected static Translator buildOrphanRemovalTranslator() {
- return new Translator(JPA2_0.ORPHAN_REMOVAL, OrmV2_0Package.eINSTANCE.getXmlOrphanRemovable2_0_OrphanRemoval(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA2_0.ORPHAN_REMOVAL, OrmV2_0Package.eINSTANCE.getXmlOrphanRemovable_2_0_OrphanRemoval(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildOrderColumnTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java
index 52c98922fc..980050ba84 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/XmlOneToOne.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlOneToOne_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.wst.common.internal.emf.resource.Translator;
@@ -165,7 +165,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
* <!-- end-user-doc -->
* @return the value of the '<em>Orphan Removal</em>' attribute.
* @see #setOrphanRemoval(Boolean)
- * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrphanRemovable2_0_OrphanRemoval()
+ * @see org.eclipse.jpt.core.resource.orm.OrmPackage#getXmlOrphanRemovable_2_0_OrphanRemoval()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
@@ -333,11 +333,11 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrphanRemovable2_0.class)
+ if (baseClass == XmlOrphanRemovable_2_0.class)
{
switch (derivedFeatureID)
{
- case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL: return OrmV2_0Package.XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL;
+ case OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL: return OrmV2_0Package.XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL;
default: return -1;
}
}
@@ -367,11 +367,11 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
default: return -1;
}
}
- if (baseClass == XmlOrphanRemovable2_0.class)
+ if (baseClass == XmlOrphanRemovable_2_0.class)
{
switch (baseFeatureID)
{
- case OrmV2_0Package.XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL: return OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL;
+ case OrmV2_0Package.XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL: return OrmPackage.XML_ONE_TO_ONE__ORPHAN_REMOVAL;
default: return -1;
}
}
@@ -448,7 +448,7 @@ public class XmlOneToOne extends AbstractXmlSingleRelationshipMapping implements
}
protected static Translator buildOrphanRemovalTranslator() {
- return new Translator(JPA2_0.ORPHAN_REMOVAL, OrmV2_0Package.eINSTANCE.getXmlOrphanRemovable2_0_OrphanRemoval(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA2_0.ORPHAN_REMOVAL, OrmV2_0Package.eINSTANCE.getXmlOrphanRemovable_2_0_OrphanRemoval(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildPrimaryKeyJoinColumnTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
index c3921bfe84..c5b8000eee 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/OrmV2_0Package.java
@@ -469,14 +469,14 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_EMBEDDED_20_FEATURE_COUNT = OrmPackage.XML_ASSOCIATION_OVERRIDE_CONTAINER_FEATURE_COUNT + 0;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0 <em>Xml Cacheable2 0</em>}' class.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0 <em>Xml Cacheable 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
* @generated
*/
- public static final int XML_CACHEABLE2_0 = 27;
+ public static final int XML_CACHEABLE_20 = 27;
/**
* The feature id for the '<em><b>Cacheable</b></em>' attribute.
@@ -485,16 +485,16 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_CACHEABLE2_0__CACHEABLE = 0;
+ public static final int XML_CACHEABLE_20__CACHEABLE = 0;
/**
- * The number of structural features of the '<em>Xml Cacheable2 0</em>' class.
+ * The number of structural features of the '<em>Xml Cacheable 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_CACHEABLE2_0_FEATURE_COUNT = 1;
+ public static final int XML_CACHEABLE_20_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlEntity_2_0 <em>Xml Entity 20</em>}' class.
@@ -513,7 +513,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_20__CACHEABLE = XML_CACHEABLE2_0__CACHEABLE;
+ public static final int XML_ENTITY_20__CACHEABLE = XML_CACHEABLE_20__CACHEABLE;
/**
* The number of structural features of the '<em>Xml Entity 20</em>' class.
@@ -522,7 +522,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ENTITY_20_FEATURE_COUNT = XML_CACHEABLE2_0_FEATURE_COUNT + 0;
+ public static final int XML_ENTITY_20_FEATURE_COUNT = XML_CACHEABLE_20_FEATURE_COUNT + 0;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlEntityListener_2_0 <em>Xml Entity Listener 20</em>}' class.
@@ -775,14 +775,14 @@ public class OrmV2_0Package extends EPackageImpl
public static final int XML_NAMED_QUERY_20_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0 <em>Xml Orphan Removable2 0</em>}' class.
+ * The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0 <em>Xml Orphan Removable 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0()
* @generated
*/
- public static final int XML_ORPHAN_REMOVABLE2_0 = 28;
+ public static final int XML_ORPHAN_REMOVABLE_20 = 28;
/**
* The feature id for the '<em><b>Orphan Removal</b></em>' attribute.
@@ -791,16 +791,16 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL = 0;
+ public static final int XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL = 0;
/**
- * The number of structural features of the '<em>Xml Orphan Removable2 0</em>' class.
+ * The number of structural features of the '<em>Xml Orphan Removable 20</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT = 1;
+ public static final int XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT = 1;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class.
@@ -819,7 +819,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__ORPHAN_REMOVAL = XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL;
+ public static final int XML_ONE_TO_MANY_20__ORPHAN_REMOVAL = XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL;
/**
* The feature id for the '<em><b>Order Column</b></em>' containment reference.
@@ -828,7 +828,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__ORDER_COLUMN = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 0;
+ public static final int XML_ONE_TO_MANY_20__ORDER_COLUMN = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Map Key Class</b></em>' containment reference.
@@ -837,7 +837,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_CLASS = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 1;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_CLASS = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Map Key Temporal</b></em>' attribute.
@@ -846,7 +846,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_TEMPORAL = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 2;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_TEMPORAL = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 2;
/**
* The feature id for the '<em><b>Map Key Enumerated</b></em>' attribute.
@@ -855,7 +855,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_ENUMERATED = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 3;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_ENUMERATED = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 3;
/**
* The feature id for the '<em><b>Map Key Attribute Overrides</b></em>' containment reference list.
@@ -864,7 +864,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 4;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_ATTRIBUTE_OVERRIDES = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 4;
/**
* The feature id for the '<em><b>Map Key Column</b></em>' containment reference.
@@ -873,7 +873,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_COLUMN = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 5;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_COLUMN = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 5;
/**
* The feature id for the '<em><b>Map Key Join Columns</b></em>' containment reference list.
@@ -882,7 +882,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20__MAP_KEY_JOIN_COLUMNS = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 6;
+ public static final int XML_ONE_TO_MANY_20__MAP_KEY_JOIN_COLUMNS = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 6;
/**
* The number of structural features of the '<em>Xml One To Many 20</em>' class.
@@ -891,7 +891,7 @@ public class OrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_ONE_TO_MANY_20_FEATURE_COUNT = XML_ORPHAN_REMOVABLE2_0_FEATURE_COUNT + 7;
+ public static final int XML_ONE_TO_MANY_20_FEATURE_COUNT = XML_ORPHAN_REMOVABLE_20_FEATURE_COUNT + 7;
/**
* The meta object id for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlSingleRelationshipMapping_2_0 <em>Xml Single Relationship Mapping 20</em>}' class.
@@ -1440,14 +1440,14 @@ public class OrmV2_0Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- private EClass xmlCacheable2_0EClass = null;
+ private EClass xmlCacheable_2_0EClass = null;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- private EClass xmlOrphanRemovable2_0EClass = null;
+ private EClass xmlOrphanRemovable_2_0EClass = null;
/**
* <!-- begin-user-doc -->
@@ -2725,60 +2725,60 @@ public class OrmV2_0Package extends EPackageImpl
/**
- * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0 <em>Xml Cacheable2 0</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0 <em>Xml Cacheable 20</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Xml Cacheable2 0</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0
+ * @return the meta object for class '<em>Xml Cacheable 20</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0
* @generated
*/
- public EClass getXmlCacheable2_0()
+ public EClass getXmlCacheable_2_0()
{
- return xmlCacheable2_0EClass;
+ return xmlCacheable_2_0EClass;
}
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0#getCacheable <em>Cacheable</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0#getCacheable <em>Cacheable</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Cacheable</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0#getCacheable()
- * @see #getXmlCacheable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0#getCacheable()
+ * @see #getXmlCacheable_2_0()
* @generated
*/
- public EAttribute getXmlCacheable2_0_Cacheable()
+ public EAttribute getXmlCacheable_2_0_Cacheable()
{
- return (EAttribute)xmlCacheable2_0EClass.getEStructuralFeatures().get(0);
+ return (EAttribute)xmlCacheable_2_0EClass.getEStructuralFeatures().get(0);
}
/**
- * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0 <em>Xml Orphan Removable2 0</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0 <em>Xml Orphan Removable 20</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Xml Orphan Removable2 0</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0
+ * @return the meta object for class '<em>Xml Orphan Removable 20</em>'.
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0
* @generated
*/
- public EClass getXmlOrphanRemovable2_0()
+ public EClass getXmlOrphanRemovable_2_0()
{
- return xmlOrphanRemovable2_0EClass;
+ return xmlOrphanRemovable_2_0EClass;
}
/**
- * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0#getOrphanRemoval <em>Orphan Removal</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0#getOrphanRemoval <em>Orphan Removal</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Orphan Removal</em>'.
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0#getOrphanRemoval()
- * @see #getXmlOrphanRemovable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0#getOrphanRemoval()
+ * @see #getXmlOrphanRemovable_2_0()
* @generated
*/
- public EAttribute getXmlOrphanRemovable2_0_OrphanRemoval()
+ public EAttribute getXmlOrphanRemovable_2_0_OrphanRemoval()
{
- return (EAttribute)xmlOrphanRemovable2_0EClass.getEStructuralFeatures().get(0);
+ return (EAttribute)xmlOrphanRemovable_2_0EClass.getEStructuralFeatures().get(0);
}
@@ -2936,11 +2936,11 @@ public class OrmV2_0Package extends EPackageImpl
xmlUniqueConstraint_2_0EClass = createEClass(XML_UNIQUE_CONSTRAINT_20);
createEAttribute(xmlUniqueConstraint_2_0EClass, XML_UNIQUE_CONSTRAINT_20__NAME);
- xmlCacheable2_0EClass = createEClass(XML_CACHEABLE2_0);
- createEAttribute(xmlCacheable2_0EClass, XML_CACHEABLE2_0__CACHEABLE);
+ xmlCacheable_2_0EClass = createEClass(XML_CACHEABLE_20);
+ createEAttribute(xmlCacheable_2_0EClass, XML_CACHEABLE_20__CACHEABLE);
- xmlOrphanRemovable2_0EClass = createEClass(XML_ORPHAN_REMOVABLE2_0);
- createEAttribute(xmlOrphanRemovable2_0EClass, XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL);
+ xmlOrphanRemovable_2_0EClass = createEClass(XML_ORPHAN_REMOVABLE_20);
+ createEAttribute(xmlOrphanRemovable_2_0EClass, XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL);
// Create enums
lockModeType_2_0EEnum = createEEnum(LOCK_MODE_TYPE_20);
@@ -2982,10 +2982,10 @@ public class OrmV2_0Package extends EPackageImpl
xmlAttributeMapping_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAccessHolder());
xmlElementCollection_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlConvertibleMapping());
xmlEmbedded_2_0EClass.getESuperTypes().add(theOrmPackage.getXmlAssociationOverrideContainer());
- xmlEntity_2_0EClass.getESuperTypes().add(this.getXmlCacheable2_0());
- xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable2_0());
+ xmlEntity_2_0EClass.getESuperTypes().add(this.getXmlCacheable_2_0());
+ xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable_2_0());
xmlOneToOne_2_0EClass.getESuperTypes().add(this.getXmlSingleRelationshipMapping_2_0());
- xmlOneToOne_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable2_0());
+ xmlOneToOne_2_0EClass.getESuperTypes().add(this.getXmlOrphanRemovable_2_0());
xmlSingleRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlDerivedId_2_0());
xmlSingleRelationshipMapping_2_0EClass.getESuperTypes().add(this.getXmlMapsId_2_0());
@@ -3098,11 +3098,11 @@ public class OrmV2_0Package extends EPackageImpl
initEClass(xmlUniqueConstraint_2_0EClass, XmlUniqueConstraint_2_0.class, "XmlUniqueConstraint_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getXmlUniqueConstraint_2_0_Name(), theXMLTypePackage.getString(), "name", null, 0, 1, XmlUniqueConstraint_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(xmlCacheable2_0EClass, XmlCacheable2_0.class, "XmlCacheable2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlCacheable2_0_Cacheable(), theXMLTypePackage.getBooleanObject(), "cacheable", null, 0, 1, XmlCacheable2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlCacheable_2_0EClass, XmlCacheable_2_0.class, "XmlCacheable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlCacheable_2_0_Cacheable(), theXMLTypePackage.getBooleanObject(), "cacheable", null, 0, 1, XmlCacheable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(xmlOrphanRemovable2_0EClass, XmlOrphanRemovable2_0.class, "XmlOrphanRemovable2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getXmlOrphanRemovable2_0_OrphanRemoval(), theXMLTypePackage.getBooleanObject(), "orphanRemoval", null, 0, 1, XmlOrphanRemovable2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(xmlOrphanRemovable_2_0EClass, XmlOrphanRemovable_2_0.class, "XmlOrphanRemovable_2_0", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getXmlOrphanRemovable_2_0_OrphanRemoval(), theXMLTypePackage.getBooleanObject(), "orphanRemoval", null, 0, 1, XmlOrphanRemovable_2_0.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(lockModeType_2_0EEnum, LockModeType_2_0.class, "LockModeType_2_0");
@@ -3833,14 +3833,14 @@ public class OrmV2_0Package extends EPackageImpl
public static final EAttribute XML_UNIQUE_CONSTRAINT_20__NAME = eINSTANCE.getXmlUniqueConstraint_2_0_Name();
/**
- * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0 <em>Xml Cacheable2 0</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0 <em>Xml Cacheable 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
* @generated
*/
- public static final EClass XML_CACHEABLE2_0 = eINSTANCE.getXmlCacheable2_0();
+ public static final EClass XML_CACHEABLE_20 = eINSTANCE.getXmlCacheable_2_0();
/**
* The meta object literal for the '<em><b>Cacheable</b></em>' attribute feature.
@@ -3848,17 +3848,17 @@ public class OrmV2_0Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EAttribute XML_CACHEABLE2_0__CACHEABLE = eINSTANCE.getXmlCacheable2_0_Cacheable();
+ public static final EAttribute XML_CACHEABLE_20__CACHEABLE = eINSTANCE.getXmlCacheable_2_0_Cacheable();
/**
- * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0 <em>Xml Orphan Removable2 0</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0 <em>Xml Orphan Removable 20</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0()
* @generated
*/
- public static final EClass XML_ORPHAN_REMOVABLE2_0 = eINSTANCE.getXmlOrphanRemovable2_0();
+ public static final EClass XML_ORPHAN_REMOVABLE_20 = eINSTANCE.getXmlOrphanRemovable_2_0();
/**
* The meta object literal for the '<em><b>Orphan Removal</b></em>' attribute feature.
@@ -3866,7 +3866,7 @@ public class OrmV2_0Package extends EPackageImpl
* <!-- end-user-doc -->
* @generated
*/
- public static final EAttribute XML_ORPHAN_REMOVABLE2_0__ORPHAN_REMOVAL = eINSTANCE.getXmlOrphanRemovable2_0_OrphanRemoval();
+ public static final EAttribute XML_ORPHAN_REMOVABLE_20__ORPHAN_REMOVAL = eINSTANCE.getXmlOrphanRemovable_2_0_OrphanRemoval();
/**
* The meta object literal for the '{@link org.eclipse.jpt.core.resource.orm.v2_0.LockModeType_2_0 <em>Lock Mode Type 20</em>}' enum.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable_2_0.java
index e02ef74cce..0380e277ed 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlCacheable_2_0.java
@@ -21,16 +21,16 @@ import org.eclipse.jpt.core.utility.TextRange;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0#getCacheable <em>Cacheable</em>}</li>
+ * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0#getCacheable <em>Cacheable</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0()
* @model kind="class" interface="true" abstract="true"
* @extends JpaEObject
* @generated
*/
-public interface XmlCacheable2_0 extends JpaEObject
+public interface XmlCacheable_2_0 extends JpaEObject
{
/**
* Returns the value of the '<em><b>Cacheable</b></em>' attribute.
@@ -42,14 +42,14 @@ public interface XmlCacheable2_0 extends JpaEObject
* <!-- end-user-doc -->
* @return the value of the '<em>Cacheable</em>' attribute.
* @see #setCacheable(Boolean)
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable2_0_Cacheable()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlCacheable_2_0_Cacheable()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
Boolean getCacheable();
/**
- * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0#getCacheable <em>Cacheable</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0#getCacheable <em>Cacheable</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Cacheable</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlEntity_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlEntity_2_0.java
index fe0e912b4f..58fefed61d 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlEntity_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlEntity_2_0.java
@@ -20,7 +20,7 @@ package org.eclipse.jpt.core.resource.orm.v2_0;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlEntity_2_0 extends XmlCacheable2_0
+public interface XmlEntity_2_0 extends XmlCacheable_2_0
{
} // XmlEntity_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToMany_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToMany_2_0.java
index 23ecb2a197..35ad912939 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToMany_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToMany_2_0.java
@@ -43,7 +43,7 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlOneToMany_2_0 extends XmlOrphanRemovable2_0
+public interface XmlOneToMany_2_0 extends XmlOrphanRemovable_2_0
{
/**
* Returns the value of the '<em><b>Order Column</b></em>' containment reference.
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToOne_2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToOne_2_0.java
index 13cb9b95b7..03cd5d7679 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToOne_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOneToOne_2_0.java
@@ -21,7 +21,7 @@ package org.eclipse.jpt.core.resource.orm.v2_0;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlOneToOne_2_0 extends XmlSingleRelationshipMapping_2_0, XmlOrphanRemovable2_0
+public interface XmlOneToOne_2_0 extends XmlSingleRelationshipMapping_2_0, XmlOrphanRemovable_2_0
{
} // XmlOneToOne_2_0
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable2_0.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java
index 44a18e6ed3..c070be3d84 100644
--- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/v2_0/XmlOrphanRemovable_2_0.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: XmlOrphanRemovable2_0.java,v 1.1 2009/10/27 16:16:08 kmoore Exp $
+ * $Id: XmlOrphanRemovable_2_0.java,v 1.1 2009/11/24 22:09:30 kmoore Exp $
*/
package org.eclipse.jpt.core.resource.orm.v2_0;
@@ -16,16 +16,16 @@ import org.eclipse.jpt.core.resource.xml.JpaEObject;
* <p>
* The following features are supported:
* <ul>
- * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0#getOrphanRemoval <em>Orphan Removal</em>}</li>
+ * <li>{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0#getOrphanRemoval <em>Orphan Removal</em>}</li>
* </ul>
* </p>
*
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable2_0()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0()
* @model kind="class" interface="true" abstract="true"
* @extends JpaEObject
* @generated
*/
-public interface XmlOrphanRemovable2_0 extends JpaEObject
+public interface XmlOrphanRemovable_2_0 extends JpaEObject
{
/**
* Returns the value of the '<em><b>Orphan Removal</b></em>' attribute.
@@ -37,14 +37,14 @@ public interface XmlOrphanRemovable2_0 extends JpaEObject
* <!-- end-user-doc -->
* @return the value of the '<em>Orphan Removal</em>' attribute.
* @see #setOrphanRemoval(Boolean)
- * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable2_0_OrphanRemoval()
+ * @see org.eclipse.jpt.core.resource.orm.v2_0.OrmV2_0Package#getXmlOrphanRemovable_2_0_OrphanRemoval()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
Boolean getOrphanRemoval();
/**
- * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0#getOrphanRemoval <em>Orphan Removal</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0#getOrphanRemoval <em>Orphan Removal</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Orphan Removal</em>' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
index a5099f92b5..25d99d5eef 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/model/eclipselink_orm.ecore
@@ -317,7 +317,7 @@
<eClassifiers xsi:type="ecore:EClass" name="XmlManyToMany_2_0" abstract="true"
interface="true" eSuperTypes="#//XmlConverterHolder #//v2_0/XmlCollectionMapping_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlMappedSuperclass_2_0" abstract="true"
- interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlCacheable2_0"/>
+ interface="true" eSuperTypes="../../org.eclipse.jpt.core/model/orm.ecore#//v2_0/XmlCacheable_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOneToMany_2_0" abstract="true"
interface="true" eSuperTypes="#//XmlConverterHolder #//v2_0/XmlCollectionMapping_2_0"/>
<eClassifiers xsi:type="ecore:EClass" name="XmlOrderColumn_2_0" abstract="true"
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java
index b9f8f8fc38..ad50a83c0e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkCachingImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheableHolder2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmXml2_0ContextNodeFactory;
import org.eclipse.jpt.core.jpa2.context.persistence.PersistenceUnit2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.utility.TextRange;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCacheCoordinationType;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCacheType;
@@ -68,7 +68,7 @@ public class OrmEclipseLinkCachingImpl
protected final OrmCacheable2_0 cacheable;
- public OrmEclipseLinkCachingImpl(OrmTypeMapping parent, XmlCacheHolder resource, XmlCacheable2_0 cacheableResource, JavaEclipseLinkCaching javaCaching) {
+ public OrmEclipseLinkCachingImpl(OrmTypeMapping parent, XmlCacheHolder resource, XmlCacheable_2_0 cacheableResource, JavaEclipseLinkCaching javaCaching) {
super(parent);
this.resource = resource;
XmlCache resourceCache = getResourceCache();
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java
index e7c8aea031..4b94a8cea5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkEntityImpl.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEntity;
import org.eclipse.jpt.core.jpa2.context.CacheableHolder2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheable2_0;
import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheableHolder2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkChangeTracking;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCustomizer;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkReadOnly;
@@ -52,7 +52,7 @@ public class OrmEclipseLinkEntityImpl extends AbstractOrmEntity
this.readOnly = new OrmEclipseLinkReadOnly(this, (XmlReadOnly) this.resourceTypeMapping, getJavaReadOnly());
this.customizer = new OrmEclipseLinkCustomizer(this, (XmlCustomizerHolder) this.resourceTypeMapping, getJavaCustomizer());
this.changeTracking = new OrmEclipseLinkChangeTracking(this, (XmlChangeTrackingHolder) this.resourceTypeMapping, getJavaChangeTracking());
- this.caching = new OrmEclipseLinkCachingImpl(this, (XmlCacheHolder) this.resourceTypeMapping, (XmlCacheable2_0) this.resourceTypeMapping, getJavaCaching());
+ this.caching = new OrmEclipseLinkCachingImpl(this, (XmlCacheHolder) this.resourceTypeMapping, (XmlCacheable_2_0) this.resourceTypeMapping, getJavaCaching());
this.converterHolder = new OrmEclipseLinkConverterHolder(this, (XmlConvertersHolder) this.resourceTypeMapping);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
index 0f757075fe..e47f616649 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.orm.OrmPersistentType;
import org.eclipse.jpt.core.internal.context.orm.AbstractOrmMappedSuperclass;
import org.eclipse.jpt.core.jpa2.context.Cacheable2_0;
import org.eclipse.jpt.core.jpa2.context.CacheableHolder2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkChangeTracking;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCustomizer;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkReadOnly;
@@ -54,7 +54,7 @@ public class OrmEclipseLinkMappedSuperclassImpl
this.readOnly = new OrmEclipseLinkReadOnly(this, (XmlReadOnly) this.resourceTypeMapping, getJavaReadOnly());
this.customizer = new OrmEclipseLinkCustomizer(this, (XmlCustomizerHolder) this.resourceTypeMapping, getJavaCustomizer());
this.changeTracking = new OrmEclipseLinkChangeTracking(this, (XmlChangeTrackingHolder) this.resourceTypeMapping, getJavaChangeTracking());
- this.caching = new OrmEclipseLinkCachingImpl(this, (XmlCacheHolder) this.resourceTypeMapping, (XmlCacheable2_0) this.resourceTypeMapping, getJavaCaching());
+ this.caching = new OrmEclipseLinkCachingImpl(this, (XmlCacheHolder) this.resourceTypeMapping, (XmlCacheable_2_0) this.resourceTypeMapping, getJavaCaching());
this.converterHolder = new OrmEclipseLinkConverterHolder(this, (XmlConvertersHolder) this.resourceTypeMapping);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
index d722619e3a..5dd3ef0bc3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/v2_0/context/orm/EclipseLinkOrmXml2_0ContextNodeFactory.java
@@ -51,10 +51,10 @@ import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride;
import org.eclipse.jpt.core.resource.orm.XmlAssociationOverrideContainer;
import org.eclipse.jpt.core.resource.orm.XmlElementCollection;
import org.eclipse.jpt.core.resource.orm.XmlNullAttributeMapping;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlDerivedId_2_0;
import org.eclipse.jpt.core.resource.orm.v2_0.XmlMapsId_2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlOrphanRemovable_2_0;
import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkBasicCollectionMapping;
import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkBasicMapMapping;
import org.eclipse.jpt.eclipselink.core.internal.context.java.JavaEclipseLinkTransformationMapping;
@@ -126,12 +126,12 @@ public class EclipseLinkOrmXml2_0ContextNodeFactory extends EclipseLinkOrmXmlCon
}
@Override
- public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable2_0 resource) {
+ public OrmCacheable2_0 buildOrmCacheable(OrmCacheableHolder2_0 parent, XmlCacheable_2_0 resource) {
return new GenericOrmCacheable2_0(parent, resource);
}
@Override
- public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable2_0 resource) {
+ public OrmOrphanRemovable2_0 buildOrmOrphanRemoval(OrmOrphanRemovalHolder2_0 parent, XmlOrphanRemovable_2_0 resource) {
return new GenericOrmOrphanRemoval2_0(parent, resource);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
index 475f54bf0d..34c6c25b0e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/XmlMappedSuperclass.java
@@ -20,7 +20,7 @@ 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.resource.orm.v2_0.OrmV2_0Package;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
import org.eclipse.jpt.core.internal.utility.translators.SimpleTranslator;
import org.eclipse.jpt.core.resource.orm.v2_0.JPA2_0;
import org.eclipse.jpt.core.utility.TextRange;
@@ -969,7 +969,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
* <!-- end-user-doc -->
* @return the value of the '<em>Cacheable</em>' attribute.
* @see #setCacheable(Boolean)
- * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheable2_0_Cacheable()
+ * @see org.eclipse.jpt.eclipselink.core.resource.orm.EclipseLinkOrmPackage#getXmlCacheable_2_0_Cacheable()
* @model dataType="org.eclipse.emf.ecore.xml.type.BooleanObject"
* @generated
*/
@@ -1369,11 +1369,11 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
default: return -1;
}
}
- if (baseClass == XmlCacheable2_0.class)
+ if (baseClass == XmlCacheable_2_0.class)
{
switch (derivedFeatureID)
{
- case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE2_0__CACHEABLE;
+ case EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE: return OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
default: return -1;
}
}
@@ -1455,11 +1455,11 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
default: return -1;
}
}
- if (baseClass == XmlCacheable2_0.class)
+ if (baseClass == XmlCacheable_2_0.class)
{
switch (baseFeatureID)
{
- case OrmV2_0Package.XML_CACHEABLE2_0__CACHEABLE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE;
+ case OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE: return EclipseLinkOrmPackage.XML_MAPPED_SUPERCLASS__CACHEABLE;
default: return -1;
}
}
@@ -1555,7 +1555,7 @@ public class XmlMappedSuperclass extends org.eclipse.jpt.core.resource.orm.XmlMa
}
protected static Translator buildCacheableTranslator() {
- return new Translator(JPA2_0.CACHEABLE, OrmV2_0Package.eINSTANCE.getXmlCacheable2_0_Cacheable(), Translator.DOM_ATTRIBUTE);
+ return new Translator(JPA2_0.CACHEABLE, OrmV2_0Package.eINSTANCE.getXmlCacheable_2_0_Cacheable(), Translator.DOM_ATTRIBUTE);
}
protected static Translator buildReadOnlyTranslator() {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
index f5a3d9accc..05c8709c54 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/EclipseLinkOrmV2_0Package.java
@@ -381,7 +381,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS_20__CACHEABLE = OrmV2_0Package.XML_CACHEABLE2_0__CACHEABLE;
+ public static final int XML_MAPPED_SUPERCLASS_20__CACHEABLE = OrmV2_0Package.XML_CACHEABLE_20__CACHEABLE;
/**
* The number of structural features of the '<em>Xml Mapped Superclass 20</em>' class.
@@ -390,7 +390,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
* @generated
* @ordered
*/
- public static final int XML_MAPPED_SUPERCLASS_20_FEATURE_COUNT = OrmV2_0Package.XML_CACHEABLE2_0_FEATURE_COUNT + 0;
+ public static final int XML_MAPPED_SUPERCLASS_20_FEATURE_COUNT = OrmV2_0Package.XML_CACHEABLE_20_FEATURE_COUNT + 0;
/**
* The meta object id for the '{@link org.eclipse.jpt.eclipselink.core.resource.orm.v2_0.XmlOneToMany_2_0 <em>Xml One To Many 20</em>}' class.
@@ -855,7 +855,7 @@ public class EclipseLinkOrmV2_0Package extends EPackageImpl
xmlElementCollection_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
xmlManyToMany_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConverterHolder());
xmlManyToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
- xmlMappedSuperclass_2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlCacheable2_0());
+ xmlMappedSuperclass_2_0EClass.getESuperTypes().add(theOrmV2_0Package.getXmlCacheable_2_0());
xmlOneToMany_2_0EClass.getESuperTypes().add(theEclipseLinkOrmPackage.getXmlConverterHolder());
xmlOneToMany_2_0EClass.getESuperTypes().add(this.getXmlCollectionMapping_2_0());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
index 0ceb210a8d..f73d9b903c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/resource/orm/v2_0/XmlMappedSuperclass_2_0.java
@@ -9,7 +9,7 @@
******************************************************************************/
package org.eclipse.jpt.eclipselink.core.resource.orm.v2_0;
-import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
+import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable_2_0;
/**
* <!-- begin-user-doc -->
@@ -21,7 +21,7 @@ import org.eclipse.jpt.core.resource.orm.v2_0.XmlCacheable2_0;
* @model kind="class" interface="true" abstract="true"
* @generated
*/
-public interface XmlMappedSuperclass_2_0 extends XmlCacheable2_0
+public interface XmlMappedSuperclass_2_0 extends XmlCacheable_2_0
{
} // XmlMappedSuperclass_2_0

Back to the top