Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Taal2013-01-16 04:28:57 -0500
committerMartin Taal2013-01-16 04:28:57 -0500
commit0b0f6ab205b23d126a5aa50a3f269ed4b0ccd076 (patch)
treec55eaa248de17f6f100be829374f708180c88f19 /plugins/org.eclipse.emf.cdo.tests.hibernate
parent480a2e8dab6da6063a4d7603fc817b684a8a4d28 (diff)
downloadcdo-0b0f6ab205b23d126a5aa50a3f269ed4b0ccd076.tar.gz
cdo-0b0f6ab205b23d126a5aa50a3f269ed4b0ccd076.tar.xz
cdo-0b0f6ab205b23d126a5aa50a3f269ed4b0ccd076.zip
Related to issues [398057] and [397682]
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.hibernate')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.ecore26
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.genmodel13
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java14
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java63
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java108
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java72
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java18
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java260
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java323
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java237
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java47
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java131
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java36
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java42
19 files changed, 1398 insertions, 109 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.ecore b/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.ecore
index 944d0a4263..1fd8727cf0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.ecore
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.ecore
@@ -57,7 +57,7 @@
</eAnnotations>
<eStructuralFeatures xsi:type="ecore:EReference" name="listOfB" upperBound="-1"
eType="#//Bz398057B" containment="true" eOpposite="#//Bz398057B/refToClassA"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dbId" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="teneo.jpa">
<details key="value" value="@Id"/>
</eAnnotations>
@@ -71,7 +71,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="refToClassA" eType="#//Bz398057A"
eOpposite="#//Bz398057A/listOfB"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dbId" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="teneo.jpa">
<details key="value" value="@Id"/>
</eAnnotations>
@@ -80,4 +80,26 @@
<eClassifiers xsi:type="ecore:EClass" name="Bz398057B1" eSuperTypes="#//Bz398057B">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="valueStr" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Bz397682P">
+ <eAnnotations source="teneo.jpa">
+ <details key="value" value="@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dbId" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="teneo.jpa">
+ <details key="value" value="@Id"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="listOfC" upperBound="-1"
+ eType="#//Bz397682C" containment="true" eOpposite="#//Bz397682C/refToP"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Bz397682C">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="refToP" eType="#//Bz397682P"
+ eOpposite="#//Bz397682P/listOfC"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="refToC" eType="#//Bz397682C"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dbId" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="teneo.jpa">
+ <details key="value" value="@Id"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.genmodel b/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.genmodel
index 0d9b2f67e3..472d1932a8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.genmodel
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/model/hibernate-test.genmodel
@@ -40,16 +40,25 @@
</genClasses>
<genClasses ecoreClass="hibernate-test.ecore#//Bz398057A">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz398057A/listOfB"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057A/id"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057A/dbId"/>
</genClasses>
<genClasses ecoreClass="hibernate-test.ecore#//Bz398057A1"/>
<genClasses ecoreClass="hibernate-test.ecore#//Bz398057B">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz398057B/refToClassA"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057B/value"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057B/id"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057B/dbId"/>
</genClasses>
<genClasses ecoreClass="hibernate-test.ecore#//Bz398057B1">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057B1/valueStr"/>
</genClasses>
+ <genClasses ecoreClass="hibernate-test.ecore#//Bz397682P">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz397682P/dbId"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz397682P/listOfC"/>
+ </genClasses>
+ <genClasses ecoreClass="hibernate-test.ecore#//Bz397682C">
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz397682C/refToP"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz397682C/refToC"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz397682C/dbId"/>
+ </genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
index 21d388b3d6..f88057ce8c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AllTestsHibernate.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.cdo.tests.LockingManagerRestartTransactionTest;
import org.eclipse.emf.cdo.tests.LockingManagerTest;
import org.eclipse.emf.cdo.tests.LockingNotificationsTest;
import org.eclipse.emf.cdo.tests.MEMStoreQueryTest;
+import org.eclipse.emf.cdo.tests.MapTest;
import org.eclipse.emf.cdo.tests.MultiValuedOfAttributeTest;
import org.eclipse.emf.cdo.tests.PackageRegistryTest;
import org.eclipse.emf.cdo.tests.SecurityManagerTest;
@@ -77,11 +78,14 @@ public class AllTestsHibernate extends AllConfigs
@Override
protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario)
{
- // testClasses.clear();
- // if (true)
- // {
- // return;
- // }
+ testClasses.clear();
+ testClasses.add(MapTest.class);
+ // testClasses.add(ComplexTest.class);
+ // testClasses.add(HibernateBugzilla_397682_Test.class);
+ if (true)
+ {
+ return;
+ }
testClasses.add(Hibernate_Failure_Test.class);
testClasses.add(Hibernate_Export_Test.class);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java
new file mode 100644
index 0000000000..cbfd24cee4
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_397682_Test.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.
+ * 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:
+ * Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.hibernate;
+
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.Requires;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestFactory;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+
+/**
+ * @author Martin Taal
+ */
+@CleanRepositoriesBefore
+@Requires(IRepositoryConfig.CAPABILITY_AUDITING)
+public class HibernateBugzilla_397682_Test extends AbstractCDOTest
+{
+
+ public void testIssue() throws Exception
+ {
+ CDOSession session = openSession();
+ {
+ CDOTransaction transaction = session.openTransaction();
+ CDOResource resource = transaction.createResource(getResourcePath("/res1"));
+ Bz397682P p = HibernateTestFactory.eINSTANCE.createBz397682P();
+ p.setDbId("1");
+ Bz397682C c1 = HibernateTestFactory.eINSTANCE.createBz397682C();
+ c1.setDbId("2");
+ p.getListOfC().add(c1);
+ assertNotNull(c1.getRefToP());
+ resource.getContents().add(p);
+ transaction.commit();
+ assertNotNull(c1.getRefToP());
+ }
+ {
+ CDOTransaction transaction = session.openTransaction();
+ CDOResource resource = transaction.getResource(getResourcePath("/res1"));
+ Bz397682P p = (Bz397682P)resource.getContents().get(0);
+ Bz397682C c2 = HibernateTestFactory.eINSTANCE.createBz397682C();
+ c2.setDbId("3");
+ c2.setRefToC(p.getListOfC().get(0));
+ p.getListOfC().add(c2);
+ assertNotNull(c2.getRefToP());
+ resource.getContents().add(p);
+ transaction.commit();
+ assertNotNull(c2.getRefToP());
+ assertNotNull(p.getListOfC().get(0).getRefToP());
+ }
+ }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
index 908c23bac4..c82b6a93f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java
@@ -39,9 +39,9 @@ public class HibernateBugzilla_398057_Test extends AbstractCDOTest
CDOTransaction transaction = session.openTransaction();
CDOResource resource = transaction.createResource(getResourcePath("/res1"));
Bz398057A a = HibernateTestFactory.eINSTANCE.createBz398057A();
- a.setId("1");
+ a.setDbId("1");
Bz398057B1 b1 = HibernateTestFactory.eINSTANCE.createBz398057B1();
- b1.setId("1");
+ b1.setDbId("1");
b1.setValueStr("str");
b1.setValue(1.0);
a.getListOfB().add(b1);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java
new file mode 100644
index 0000000000..8c7be36cb6
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682C.java
@@ -0,0 +1,108 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
+
+import org.eclipse.emf.ecore.EObject;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Bz397682 C</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C()
+ * @model
+ * @generated
+ */
+public interface Bz397682C extends EObject {
+ /**
+ * Returns the value of the '<em><b>Ref To P</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ref To P</em>' container reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Ref To P</em>' container reference.
+ * @see #setRefToP(Bz397682P)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToP()
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC
+ * @model opposite="listOfC" transient="false"
+ * @generated
+ */
+ Bz397682P getRefToP();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Ref To P</em>' container reference.
+ * @see #getRefToP()
+ * @generated
+ */
+ void setRefToP(Bz397682P value);
+
+ /**
+ * Returns the value of the '<em><b>Ref To C</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Ref To C</em>' reference isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Ref To C</em>' reference.
+ * @see #setRefToC(Bz397682C)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_RefToC()
+ * @model
+ * @generated
+ */
+ Bz397682C getRefToC();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Ref To C</em>' reference.
+ * @see #getRefToC()
+ * @generated
+ */
+ void setRefToC(Bz397682C value);
+
+ /**
+ * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Db Id</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Db Id</em>' attribute.
+ * @see #setDbId(String)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682C_DbId()
+ * @model required="true"
+ * annotation="teneo.jpa value='@Id'"
+ * @generated
+ */
+ String getDbId();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Db Id</em>' attribute.
+ * @see #getDbId()
+ * @generated
+ */
+ void setDbId(String value);
+
+} // Bz397682C
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java
new file mode 100644
index 0000000000..d61aa7fdb2
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz397682P.java
@@ -0,0 +1,72 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Bz397682 P</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P()
+ * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'"
+ * @generated
+ */
+public interface Bz397682P extends EObject {
+ /**
+ * Returns the value of the '<em><b>Db Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Db Id</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Db Id</em>' attribute.
+ * @see #setDbId(String)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_DbId()
+ * @model required="true"
+ * annotation="teneo.jpa value='@Id'"
+ * @generated
+ */
+ String getDbId();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Db Id</em>' attribute.
+ * @see #getDbId()
+ * @generated
+ */
+ void setDbId(String value);
+
+ /**
+ * Returns the value of the '<em><b>List Of C</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>List Of C</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>List Of C</em>' containment reference list.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz397682P_ListOfC()
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP
+ * @model opposite="refToP" containment="true"
+ * @generated
+ */
+ EList<Bz397682C> getListOfC();
+
+} // Bz397682P
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
index 74dd61bb14..7262e51cbb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}</li>
* </ul>
* </p>
*
@@ -43,30 +43,30 @@ public interface Bz398057A extends EObject {
EList<Bz398057B> getListOfB();
/**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
+ * Returns the value of the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
+ * If the meaning of the '<em>Db Id</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_Id()
+ * @return the value of the '<em>Db Id</em>' attribute.
+ * @see #setDbId(String)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_DbId()
* @model required="true"
* annotation="teneo.jpa value='@Id'"
* @generated
*/
- String getId();
+ String getDbId();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId <em>Id</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
+ * @param value the new value of the '<em>Db Id</em>' attribute.
+ * @see #getDbId()
* @generated
*/
- void setId(String value);
+ void setDbId(String value);
} // Bz398057A
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
index d1b8006da5..448b1e29bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject;
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}</li>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}</li>
* </ul>
* </p>
*
@@ -78,30 +78,30 @@ public interface Bz398057B extends EObject {
void setValue(double value);
/**
- * Returns the value of the '<em><b>Id</b></em>' attribute.
+ * Returns the value of the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Id</em>' attribute isn't clear,
+ * If the meaning of the '<em>Db Id</em>' attribute isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Id</em>' attribute.
- * @see #setId(String)
- * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_Id()
+ * @return the value of the '<em>Db Id</em>' attribute.
+ * @see #setDbId(String)
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_DbId()
* @model required="true"
* annotation="teneo.jpa value='@Id'"
* @generated
*/
- String getId();
+ String getDbId();
/**
- * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId <em>Id</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Id</em>' attribute.
- * @see #getId()
+ * @param value the new value of the '<em>Db Id</em>' attribute.
+ * @see #getDbId()
* @generated
*/
- void setId(String value);
+ void setDbId(String value);
} // Bz398057B
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
index a7d55b98a9..56c2c403ed 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestFactory.java
@@ -121,6 +121,24 @@ public interface HibernateTestFactory extends EFactory {
Bz398057B1 createBz398057B1();
/**
+ * Returns a new object of class '<em>Bz397682 P</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Bz397682 P</em>'.
+ * @generated
+ */
+ Bz397682P createBz397682P();
+
+ /**
+ * Returns a new object of class '<em>Bz397682 C</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Bz397682 C</em>'.
+ * @generated
+ */
+ Bz397682C createBz397682C();
+
+ /**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
index dc695f9b93..f1e321c360 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/HibernateTestPackage.java
@@ -345,13 +345,13 @@ public interface HibernateTestPackage extends EPackage {
int BZ398057_A__LIST_OF_B = 0;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int BZ398057_A__ID = 1;
+ int BZ398057_A__DB_ID = 1;
/**
* The number of structural features of the '<em>Bz398057 A</em>' class.
@@ -382,13 +382,13 @@ public interface HibernateTestPackage extends EPackage {
int BZ398057_A1__LIST_OF_B = BZ398057_A__LIST_OF_B;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int BZ398057_A1__ID = BZ398057_A__ID;
+ int BZ398057_A1__DB_ID = BZ398057_A__DB_ID;
/**
* The number of structural features of the '<em>Bz398057 A1</em>' class.
@@ -428,13 +428,13 @@ public interface HibernateTestPackage extends EPackage {
int BZ398057_B__VALUE = 1;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int BZ398057_B__ID = 2;
+ int BZ398057_B__DB_ID = 2;
/**
* The number of structural features of the '<em>Bz398057 B</em>' class.
@@ -474,13 +474,13 @@ public interface HibernateTestPackage extends EPackage {
int BZ398057_B1__VALUE = BZ398057_B__VALUE;
/**
- * The feature id for the '<em><b>Id</b></em>' attribute.
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int BZ398057_B1__ID = BZ398057_B__ID;
+ int BZ398057_B1__DB_ID = BZ398057_B__DB_ID;
/**
* The feature id for the '<em><b>Value Str</b></em>' attribute.
@@ -501,6 +501,89 @@ public interface HibernateTestPackage extends EPackage {
int BZ398057_B1_FEATURE_COUNT = BZ398057_B_FEATURE_COUNT + 1;
/**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
+ * @generated
+ */
+ int BZ397682_P = 11;
+
+ /**
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_P__DB_ID = 0;
+
+ /**
+ * The feature id for the '<em><b>List Of C</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_P__LIST_OF_C = 1;
+
+ /**
+ * The number of structural features of the '<em>Bz397682 P</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_P_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
+ * @generated
+ */
+ int BZ397682_C = 12;
+
+ /**
+ * The feature id for the '<em><b>Ref To P</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_C__REF_TO_P = 0;
+
+ /**
+ * The feature id for the '<em><b>Ref To C</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_C__REF_TO_C = 1;
+
+ /**
+ * The feature id for the '<em><b>Db Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_C__DB_ID = 2;
+
+ /**
+ * The number of structural features of the '<em>Bz397682 C</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int BZ397682_C_FEATURE_COUNT = 3;
+
+ /**
* The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -508,7 +591,7 @@ public interface HibernateTestPackage extends EPackage {
* @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum()
* @generated
*/
- int BZ387752_ENUM = 11;
+ int BZ387752_ENUM = 13;
/**
@@ -768,15 +851,15 @@ public interface HibernateTestPackage extends EPackage {
EReference getBz398057A_ListOfB();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId <em>Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId <em>Db Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId()
+ * @return the meta object for the attribute '<em>Db Id</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getDbId()
* @see #getBz398057A()
* @generated
*/
- EAttribute getBz398057A_Id();
+ EAttribute getBz398057A_DbId();
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</em>}'.
@@ -821,15 +904,15 @@ public interface HibernateTestPackage extends EPackage {
EAttribute getBz398057B_Value();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId <em>Id</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId <em>Db Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Id</em>'.
- * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId()
+ * @return the meta object for the attribute '<em>Db Id</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getDbId()
* @see #getBz398057B()
* @generated
*/
- EAttribute getBz398057B_Id();
+ EAttribute getBz398057B_DbId();
/**
* Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</em>}'.
@@ -853,6 +936,81 @@ public interface HibernateTestPackage extends EPackage {
EAttribute getBz398057B1_ValueStr();
/**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Bz397682 P</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P
+ * @generated
+ */
+ EClass getBz397682P();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId <em>Db Id</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Db Id</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getDbId()
+ * @see #getBz397682P()
+ * @generated
+ */
+ EAttribute getBz397682P_DbId();
+
+ /**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC <em>List Of C</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>List Of C</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P#getListOfC()
+ * @see #getBz397682P()
+ * @generated
+ */
+ EReference getBz397682P_ListOfC();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Bz397682 C</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C
+ * @generated
+ */
+ EClass getBz397682C();
+
+ /**
+ * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP <em>Ref To P</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the container reference '<em>Ref To P</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToP()
+ * @see #getBz397682C()
+ * @generated
+ */
+ EReference getBz397682C_RefToP();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC <em>Ref To C</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Ref To C</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getRefToC()
+ * @see #getBz397682C()
+ * @generated
+ */
+ EReference getBz397682C_RefToC();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId <em>Db Id</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Db Id</em>'.
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C#getDbId()
+ * @see #getBz397682C()
+ * @generated
+ */
+ EAttribute getBz397682C_DbId();
+
+ /**
* Returns the meta object for enum '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1093,12 +1251,12 @@ public interface HibernateTestPackage extends EPackage {
EReference BZ398057_A__LIST_OF_B = eINSTANCE.getBz398057A_ListOfB();
/**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute BZ398057_A__ID = eINSTANCE.getBz398057A_Id();
+ EAttribute BZ398057_A__DB_ID = eINSTANCE.getBz398057A_DbId();
/**
* The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class.
@@ -1137,12 +1295,12 @@ public interface HibernateTestPackage extends EPackage {
EAttribute BZ398057_B__VALUE = eINSTANCE.getBz398057B_Value();
/**
- * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute BZ398057_B__ID = eINSTANCE.getBz398057B_Id();
+ EAttribute BZ398057_B__DB_ID = eINSTANCE.getBz398057B_DbId();
/**
* The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class.
@@ -1163,6 +1321,66 @@ public interface HibernateTestPackage extends EPackage {
EAttribute BZ398057_B1__VALUE_STR = eINSTANCE.getBz398057B1_ValueStr();
/**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl <em>Bz397682 P</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682P()
+ * @generated
+ */
+ EClass BZ397682_P = eINSTANCE.getBz397682P();
+
+ /**
+ * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute BZ397682_P__DB_ID = eINSTANCE.getBz397682P_DbId();
+
+ /**
+ * The meta object literal for the '<em><b>List Of C</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference BZ397682_P__LIST_OF_C = eINSTANCE.getBz397682P_ListOfC();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl <em>Bz397682 C</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl
+ * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz397682C()
+ * @generated
+ */
+ EClass BZ397682_C = eINSTANCE.getBz397682C();
+
+ /**
+ * The meta object literal for the '<em><b>Ref To P</b></em>' container reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference BZ397682_C__REF_TO_P = eINSTANCE.getBz397682C_RefToP();
+
+ /**
+ * The meta object literal for the '<em><b>Ref To C</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference BZ397682_C__REF_TO_C = eINSTANCE.getBz397682C_RefToC();
+
+ /**
+ * The meta object literal for the '<em><b>Db Id</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute BZ397682_C__DB_ID = eINSTANCE.getBz397682C_DbId();
+
+ /**
* The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum <em>Bz387752 Enum</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
new file mode 100644
index 0000000000..96b8c21400
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
@@ -0,0 +1,323 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;
+
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage;
+
+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.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bz397682 C</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl#getRefToP <em>Ref To P</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl#getRefToC <em>Ref To C</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682CImpl#getDbId <em>Db Id</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class Bz397682CImpl extends EObjectImpl implements Bz397682C {
+ /**
+ * The cached value of the '{@link #getRefToC() <em>Ref To C</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getRefToC()
+ * @generated
+ * @ordered
+ */
+ protected Bz397682C refToC;
+
+ /**
+ * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDbId()
+ * @generated
+ * @ordered
+ */
+ protected static final String DB_ID_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDbId()
+ * @generated
+ * @ordered
+ */
+ protected String dbId = DB_ID_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Bz397682CImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return HibernateTestPackage.Literals.BZ397682_C;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Bz397682P getRefToP() {
+ if (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P) return null;
+ return (Bz397682P)eContainer();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetRefToP(Bz397682P newRefToP, NotificationChain msgs) {
+ msgs = eBasicSetContainer((InternalEObject)newRefToP, HibernateTestPackage.BZ397682_C__REF_TO_P, msgs);
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRefToP(Bz397682P newRefToP) {
+ if (newRefToP != eInternalContainer() || (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null)) {
+ if (EcoreUtil.isAncestor(this, newRefToP))
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ if (newRefToP != null)
+ msgs = ((InternalEObject)newRefToP).eInverseAdd(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
+ msgs = basicSetRefToP(newRefToP, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_P, newRefToP, newRefToP));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Bz397682C getRefToC() {
+ if (refToC != null && refToC.eIsProxy()) {
+ InternalEObject oldRefToC = (InternalEObject)refToC;
+ refToC = (Bz397682C)eResolveProxy(oldRefToC);
+ if (refToC != oldRefToC) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
+ }
+ }
+ return refToC;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Bz397682C basicGetRefToC() {
+ return refToC;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setRefToC(Bz397682C newRefToC) {
+ Bz397682C oldRefToC = refToC;
+ refToC = newRefToC;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getDbId() {
+ return dbId;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setDbId(String newDbId) {
+ String oldDbId = dbId;
+ dbId = newDbId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__DB_ID, oldDbId, dbId));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ if (eInternalContainer() != null)
+ msgs = eBasicRemoveFromContainer(msgs);
+ return basicSetRefToP((Bz397682P)otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ return basicSetRefToP(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID()) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ397682_P__LIST_OF_C, Bz397682P.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ return getRefToP();
+ case HibernateTestPackage.BZ397682_C__REF_TO_C:
+ if (resolve) return getRefToC();
+ return basicGetRefToC();
+ case HibernateTestPackage.BZ397682_C__DB_ID:
+ return getDbId();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ setRefToP((Bz397682P)newValue);
+ return;
+ case HibernateTestPackage.BZ397682_C__REF_TO_C:
+ setRefToC((Bz397682C)newValue);
+ return;
+ case HibernateTestPackage.BZ397682_C__DB_ID:
+ setDbId((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ setRefToP((Bz397682P)null);
+ return;
+ case HibernateTestPackage.BZ397682_C__REF_TO_C:
+ setRefToC((Bz397682C)null);
+ return;
+ case HibernateTestPackage.BZ397682_C__DB_ID:
+ setDbId(DB_ID_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_C__REF_TO_P:
+ return getRefToP() != null;
+ case HibernateTestPackage.BZ397682_C__REF_TO_C:
+ return refToC != null;
+ case HibernateTestPackage.BZ397682_C__DB_ID:
+ return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (dbId: ");
+ result.append(dbId);
+ result.append(')');
+ return result.toString();
+ }
+
+} //Bz397682CImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
new file mode 100644
index 0000000000..6654ea0548
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java
@@ -0,0 +1,237 @@
+/**
+ */
+package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bz397682 P</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl#getDbId <em>Db Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz397682PImpl#getListOfC <em>List Of C</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class Bz397682PImpl extends EObjectImpl implements Bz397682P {
+ /**
+ * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDbId()
+ * @generated
+ * @ordered
+ */
+ protected static final String DB_ID_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getDbId()
+ * @generated
+ * @ordered
+ */
+ protected String dbId = DB_ID_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getListOfC() <em>List Of C</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getListOfC()
+ * @generated
+ * @ordered
+ */
+ protected EList<Bz397682C> listOfC;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Bz397682PImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return HibernateTestPackage.Literals.BZ397682_P;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getDbId() {
+ return dbId;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setDbId(String newDbId) {
+ String oldDbId = dbId;
+ dbId = newDbId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_P__DB_ID, oldDbId, dbId));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<Bz397682C> getListOfC() {
+ if (listOfC == null) {
+ listOfC = new EObjectContainmentWithInverseEList<Bz397682C>(Bz397682C.class, this, HibernateTestPackage.BZ397682_P__LIST_OF_C, HibernateTestPackage.BZ397682_C__REF_TO_P);
+ }
+ return listOfC;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfC()).basicAdd(otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ return ((InternalEList<?>)getListOfC()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__DB_ID:
+ return getDbId();
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ return getListOfC();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__DB_ID:
+ setDbId((String)newValue);
+ return;
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ getListOfC().clear();
+ getListOfC().addAll((Collection<? extends Bz397682C>)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__DB_ID:
+ setDbId(DB_ID_EDEFAULT);
+ return;
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ getListOfC().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case HibernateTestPackage.BZ397682_P__DB_ID:
+ return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
+ case HibernateTestPackage.BZ397682_P__LIST_OF_C:
+ return listOfC != null && !listOfC.isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (dbId: ");
+ result.append(dbId);
+ result.append(')');
+ return result.toString();
+ }
+
+} //Bz397682PImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
index e1c6e07801..f177c1cae4 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
* The following features are implemented:
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getListOfB <em>List Of B</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl#getDbId <em>Db Id</em>}</li>
* </ul>
* </p>
*
@@ -49,23 +49,24 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
protected EList<Bz398057B> listOfB;
/**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+ * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
+ * @see #getDbId()
* @generated
* @ordered
*/
- protected static final String ID_EDEFAULT = null;
+ protected static final String DB_ID_EDEFAULT = null;
+
/**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+ * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
+ * @see #getDbId()
* @generated
* @ordered
*/
- protected String id = ID_EDEFAULT;
+ protected String dbId = DB_ID_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -103,8 +104,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
* <!-- end-user-doc -->
* @generated
*/
- public String getId() {
- return id;
+ public String getDbId() {
+ return dbId;
}
/**
@@ -112,11 +113,11 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
* <!-- end-user-doc -->
* @generated
*/
- public void setId(String newId) {
- String oldId = id;
- id = newId;
+ public void setDbId(String newDbId) {
+ String oldDbId = dbId;
+ dbId = newDbId;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__ID, oldId, id));
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
}
/**
@@ -158,8 +159,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
switch (featureID) {
case HibernateTestPackage.BZ398057_A__LIST_OF_B:
return getListOfB();
- case HibernateTestPackage.BZ398057_A__ID:
- return getId();
+ case HibernateTestPackage.BZ398057_A__DB_ID:
+ return getDbId();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -177,8 +178,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
getListOfB().clear();
getListOfB().addAll((Collection<? extends Bz398057B>)newValue);
return;
- case HibernateTestPackage.BZ398057_A__ID:
- setId((String)newValue);
+ case HibernateTestPackage.BZ398057_A__DB_ID:
+ setDbId((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -195,8 +196,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
case HibernateTestPackage.BZ398057_A__LIST_OF_B:
getListOfB().clear();
return;
- case HibernateTestPackage.BZ398057_A__ID:
- setId(ID_EDEFAULT);
+ case HibernateTestPackage.BZ398057_A__DB_ID:
+ setDbId(DB_ID_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -212,8 +213,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
switch (featureID) {
case HibernateTestPackage.BZ398057_A__LIST_OF_B:
return listOfB != null && !listOfB.isEmpty();
- case HibernateTestPackage.BZ398057_A__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+ case HibernateTestPackage.BZ398057_A__DB_ID:
+ return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
}
return super.eIsSet(featureID);
}
@@ -228,8 +229,8 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A {
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (id: ");
- result.append(id);
+ result.append(" (dbId: ");
+ result.append(dbId);
result.append(')');
return result.toString();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
index 9f620d9d1c..33b817dc15 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
* <ul>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl#getRefToClassA <em>Ref To Class A</em>}</li>
* <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl#getValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl#getDbId <em>Db Id</em>}</li>
* </ul>
* </p>
*
@@ -52,24 +52,23 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
protected double value = VALUE_EDEFAULT;
/**
- * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+ * The default value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
+ * @see #getDbId()
* @generated
* @ordered
*/
- protected static final String ID_EDEFAULT = null;
+ protected static final String DB_ID_EDEFAULT = null;
/**
- * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+ * The cached value of the '{@link #getDbId() <em>Db Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getId()
+ * @see #getDbId()
* @generated
* @ordered
*/
- protected String id = ID_EDEFAULT;
-
+ protected String dbId = DB_ID_EDEFAULT;
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -156,8 +155,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
* <!-- end-user-doc -->
* @generated
*/
- public String getId() {
- return id;
+ public String getDbId() {
+ return dbId;
}
/**
@@ -165,11 +164,11 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
* <!-- end-user-doc -->
* @generated
*/
- public void setId(String newId) {
- String oldId = id;
- id = newId;
+ public void setDbId(String newDbId) {
+ String oldDbId = dbId;
+ dbId = newDbId;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__ID, oldId, id));
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__DB_ID, oldDbId, dbId));
}
/**
@@ -228,8 +227,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
return getRefToClassA();
case HibernateTestPackage.BZ398057_B__VALUE:
return getValue();
- case HibernateTestPackage.BZ398057_B__ID:
- return getId();
+ case HibernateTestPackage.BZ398057_B__DB_ID:
+ return getDbId();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -248,8 +247,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
case HibernateTestPackage.BZ398057_B__VALUE:
setValue((Double)newValue);
return;
- case HibernateTestPackage.BZ398057_B__ID:
- setId((String)newValue);
+ case HibernateTestPackage.BZ398057_B__DB_ID:
+ setDbId((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -269,8 +268,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
case HibernateTestPackage.BZ398057_B__VALUE:
setValue(VALUE_EDEFAULT);
return;
- case HibernateTestPackage.BZ398057_B__ID:
- setId(ID_EDEFAULT);
+ case HibernateTestPackage.BZ398057_B__DB_ID:
+ setDbId(DB_ID_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -288,8 +287,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
return getRefToClassA() != null;
case HibernateTestPackage.BZ398057_B__VALUE:
return value != VALUE_EDEFAULT;
- case HibernateTestPackage.BZ398057_B__ID:
- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+ case HibernateTestPackage.BZ398057_B__DB_ID:
+ return DB_ID_EDEFAULT == null ? dbId != null : !DB_ID_EDEFAULT.equals(dbId);
}
return super.eIsSet(featureID);
}
@@ -306,8 +305,8 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B {
StringBuffer result = new StringBuffer(super.toString());
result.append(" (value: ");
result.append(value);
- result.append(", id: ");
- result.append(id);
+ result.append(", dbId: ");
+ result.append(dbId);
result.append(')');
return result.toString();
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
index 2c3c113ca6..e0189e3b5d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java
@@ -76,6 +76,8 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
case HibernateTestPackage.BZ398057_A1: return createBz398057A1();
case HibernateTestPackage.BZ398057_B: return createBz398057B();
case HibernateTestPackage.BZ398057_B1: return createBz398057B1();
+ case HibernateTestPackage.BZ397682_P: return createBz397682P();
+ case HibernateTestPackage.BZ397682_C: return createBz397682C();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -226,6 +228,26 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
* <!-- end-user-doc -->
* @generated
*/
+ public Bz397682P createBz397682P() {
+ Bz397682PImpl bz397682P = new Bz397682PImpl();
+ return bz397682P;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Bz397682C createBz397682C() {
+ Bz397682CImpl bz397682C = new Bz397682CImpl();
+ return bz397682C;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public Bz387752_Enum createBz387752_EnumFromString(EDataType eDataType, String initialValue) {
Bz387752_Enum result = Bz387752_Enum.get(initialValue);
if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
index 581571031b..f87f619b4e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java
@@ -10,6 +10,8 @@ import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Person;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz380987_Place;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Enum;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz387752_Main;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C;
+import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1;
import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B;
@@ -113,6 +115,20 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
* <!-- end-user-doc -->
* @generated
*/
+ private EClass bz397682PEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private EClass bz397682CEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EEnum bz387752_EnumEEnum = null;
/**
@@ -397,7 +413,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getBz398057A_Id() {
+ public EAttribute getBz398057A_DbId() {
return (EAttribute)bz398057AEClass.getEStructuralFeatures().get(1);
}
@@ -442,7 +458,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getBz398057B_Id() {
+ public EAttribute getBz398057B_DbId() {
return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(2);
}
@@ -469,6 +485,69 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getBz397682P() {
+ return bz397682PEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getBz397682P_DbId() {
+ return (EAttribute)bz397682PEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getBz397682P_ListOfC() {
+ return (EReference)bz397682PEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EClass getBz397682C() {
+ return bz397682CEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getBz397682C_RefToP() {
+ return (EReference)bz397682CEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getBz397682C_RefToC() {
+ return (EReference)bz397682CEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getBz397682C_DbId() {
+ return (EAttribute)bz397682CEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EEnum getBz387752_Enum() {
return bz387752_EnumEEnum;
}
@@ -532,18 +611,27 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
bz398057AEClass = createEClass(BZ398057_A);
createEReference(bz398057AEClass, BZ398057_A__LIST_OF_B);
- createEAttribute(bz398057AEClass, BZ398057_A__ID);
+ createEAttribute(bz398057AEClass, BZ398057_A__DB_ID);
bz398057A1EClass = createEClass(BZ398057_A1);
bz398057BEClass = createEClass(BZ398057_B);
createEReference(bz398057BEClass, BZ398057_B__REF_TO_CLASS_A);
createEAttribute(bz398057BEClass, BZ398057_B__VALUE);
- createEAttribute(bz398057BEClass, BZ398057_B__ID);
+ createEAttribute(bz398057BEClass, BZ398057_B__DB_ID);
bz398057B1EClass = createEClass(BZ398057_B1);
createEAttribute(bz398057B1EClass, BZ398057_B1__VALUE_STR);
+ bz397682PEClass = createEClass(BZ397682_P);
+ createEAttribute(bz397682PEClass, BZ397682_P__DB_ID);
+ createEReference(bz397682PEClass, BZ397682_P__LIST_OF_C);
+
+ bz397682CEClass = createEClass(BZ397682_C);
+ createEReference(bz397682CEClass, BZ397682_C__REF_TO_P);
+ createEReference(bz397682CEClass, BZ397682_C__REF_TO_C);
+ createEAttribute(bz397682CEClass, BZ397682_C__DB_ID);
+
// Create enums
bz387752_EnumEEnum = createEEnum(BZ387752_ENUM);
}
@@ -611,18 +699,27 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
initEClass(bz398057AEClass, Bz398057A.class, "Bz398057A", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getBz398057A_ListOfB(), this.getBz398057B(), this.getBz398057B_RefToClassA(), "listOfB", null, 0, -1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBz398057A_Id(), ecorePackage.getEString(), "id", null, 1, 1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBz398057A_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057A.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bz398057A1EClass, Bz398057A1.class, "Bz398057A1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(bz398057BEClass, Bz398057B.class, "Bz398057B", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getBz398057B_RefToClassA(), this.getBz398057A(), this.getBz398057A_ListOfB(), "refToClassA", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getBz398057B_Value(), ecorePackage.getEDouble(), "value", null, 0, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBz398057B_Id(), ecorePackage.getEString(), "id", null, 1, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBz398057B_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz398057B.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bz398057B1EClass, Bz398057B1.class, "Bz398057B1", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getBz398057B1_ValueStr(), ecorePackage.getEString(), "valueStr", null, 0, 1, Bz398057B1.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(bz397682PEClass, Bz397682P.class, "Bz397682P", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getBz397682P_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBz397682P_ListOfC(), this.getBz397682C(), this.getBz397682C_RefToP(), "listOfC", null, 0, -1, Bz397682P.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(bz397682CEClass, Bz397682C.class, "Bz397682C", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getBz397682C_RefToP(), this.getBz397682P(), this.getBz397682P_ListOfC(), "refToP", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBz397682C_RefToC(), this.getBz397682C(), null, "refToC", null, 0, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBz397682C_DbId(), ecorePackage.getEString(), "dbId", null, 1, 1, Bz397682C.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
// Initialize enums and add enum literals
initEEnum(bz387752_EnumEEnum, Bz387752_Enum.class, "Bz387752_Enum");
addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL0);
@@ -663,7 +760,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
"value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
});
addAnnotation
- (getBz398057A_Id(),
+ (getBz398057A_DbId(),
source,
new String[] {
"value", "@Id"
@@ -675,7 +772,25 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
"value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
});
addAnnotation
- (getBz398057B_Id(),
+ (getBz398057B_DbId(),
+ source,
+ new String[] {
+ "value", "@Id"
+ });
+ addAnnotation
+ (bz397682PEClass,
+ source,
+ new String[] {
+ "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"
+ });
+ addAnnotation
+ (getBz397682P_DbId(),
+ source,
+ new String[] {
+ "value", "@Id"
+ });
+ addAnnotation
+ (getBz397682C_DbId(),
source,
new String[] {
"value", "@Id"
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
index 3f058561f8..ab1e0b4c62 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestAdapterFactory.java
@@ -118,6 +118,14 @@ public class HibernateTestAdapterFactory extends AdapterFactoryImpl {
return createBz398057B1Adapter();
}
@Override
+ public Adapter caseBz397682P(Bz397682P object) {
+ return createBz397682PAdapter();
+ }
+ @Override
+ public Adapter caseBz397682C(Bz397682C object) {
+ return createBz397682CAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -292,6 +300,34 @@ public class HibernateTestAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P <em>Bz397682 P</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.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682P
+ * @generated
+ */
+ public Adapter createBz397682PAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C <em>Bz397682 C</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.emf.cdo.tests.hibernate.model.HibernateTest.Bz397682C
+ * @generated
+ */
+ public Adapter createBz397682CAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for the default case.
* <!-- begin-user-doc -->
* This default implementation returns null.
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
index ee02409e47..f062996098 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
@@ -141,6 +141,18 @@ public class HibernateTestSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case HibernateTestPackage.BZ397682_P: {
+ Bz397682P bz397682P = (Bz397682P)theEObject;
+ T result = caseBz397682P(bz397682P);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case HibernateTestPackage.BZ397682_C: {
+ Bz397682C bz397682C = (Bz397682C)theEObject;
+ T result = caseBz397682C(bz397682C);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -311,6 +323,36 @@ public class HibernateTestSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Bz397682 P</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>Bz397682 P</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseBz397682P(Bz397682P object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Bz397682 C</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>Bz397682 C</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseBz397682C(Bz397682C object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;

Back to the top