diff options
18 files changed, 1884 insertions, 2 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 6ee0acfd9b..944d0a4263 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 @@ -51,4 +51,33 @@ <eStructuralFeatures xsi:type="ecore:EReference" name="places" upperBound="-1" eType="#//Bz380987_Place" eOpposite="#//Bz380987_Place/people"/> </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Bz398057A"> + <eAnnotations source="teneo.jpa"> + <details key="value" value="@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"/> + </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"> + <eAnnotations source="teneo.jpa"> + <details key="value" value="@Id"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="Bz398057A1" eSuperTypes="#//Bz398057A"/> + <eClassifiers xsi:type="ecore:EClass" name="Bz398057B"> + <eAnnotations source="teneo.jpa"> + <details key="value" value="@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)"/> + </eAnnotations> + <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"> + <eAnnotations source="teneo.jpa"> + <details key="value" value="@Id"/> + </eAnnotations> + </eStructuralFeatures> + </eClassifiers> + <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> </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 f3e3af9a7a..0d9b2f67e3 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 @@ -38,5 +38,18 @@ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz380987_Person/group"/> <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference hibernate-test.ecore#//Bz380987_Person/places"/> </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"/> + </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"/> + </genClasses> + <genClasses ecoreClass="hibernate-test.ecore#//Bz398057B1"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute hibernate-test.ecore#//Bz398057B1/valueStr"/> + </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 f727a3e4d1..21d388b3d6 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 @@ -78,7 +78,6 @@ public class AllTestsHibernate extends AllConfigs protected void initTestClasses(List<Class<? extends ConfigTest>> testClasses, IScenario scenario) { // testClasses.clear(); - // // testClasses.add(Hibernate_Missing_Version_Test.class); // if (true) // { // return; @@ -118,6 +117,8 @@ public class AllTestsHibernate extends AllConfigs // and does not block testClasses.remove(Bugzilla_390185_Test.class); + testClasses.add(HibernateBugzilla_398057_Test.class); + if (scenario.getCapabilities().contains(IRepositoryConfig.CAPABILITY_AUDITING)) { testClasses.add(HibernateBugzilla_395684_Test.class); 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 new file mode 100644 index 0000000000..908c23bac4 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_398057_Test.java @@ -0,0 +1,58 @@ +/* + * 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.Bz398057A; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestFactory; +import org.eclipse.emf.cdo.transaction.CDOTransaction; +import org.eclipse.emf.cdo.util.CommitException; + +/** + * @author Martin Taal + */ +@CleanRepositoriesBefore +@Requires(IRepositoryConfig.CAPABILITY_AUDITING) +public class HibernateBugzilla_398057_Test extends AbstractCDOTest +{ + + public void testIssue() throws Exception + { + CDOSession session = openSession(); + { + try + { + CDOTransaction transaction = session.openTransaction(); + CDOResource resource = transaction.createResource(getResourcePath("/res1")); + Bz398057A a = HibernateTestFactory.eINSTANCE.createBz398057A(); + a.setId("1"); + Bz398057B1 b1 = HibernateTestFactory.eINSTANCE.createBz398057B1(); + b1.setId("1"); + b1.setValueStr("str"); + b1.setValue(1.0); + a.getListOfB().add(b1); + resource.getContents().add(a); + transaction.commit(); + fail(); // expected to fail + } + catch (CommitException e) + { + // fine + } + } + } +} 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 new file mode 100644 index 0000000000..74dd61bb14 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A.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>Bz398057 A</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * 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> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A() + * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'" + * @generated + */ +public interface Bz398057A extends EObject { + /** + * Returns the value of the '<em><b>List Of B</b></em>' containment reference list. + * The list contents are of type {@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B}. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>List Of B</em>' 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 B</em>' containment reference list. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A_ListOfB() + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA + * @model opposite="refToClassA" containment="true" + * @generated + */ + EList<Bz398057B> getListOfB(); + + /** + * Returns the value of the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>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() + * @model required="true" + * annotation="teneo.jpa value='@Id'" + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Id</em>' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + +} // Bz398057A diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java new file mode 100644 index 0000000000..e2ce74f09b --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057A1.java @@ -0,0 +1,17 @@ +/** + */ +package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Bz398057 A1</b></em>'. + * <!-- end-user-doc --> + * + * + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057A1() + * @model + * @generated + */ +public interface Bz398057A1 extends Bz398057A { +} // Bz398057A1 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 new file mode 100644 index 0000000000..d1b8006da5 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B.java @@ -0,0 +1,107 @@ +/** + */ +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>Bz398057 B</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <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> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B() + * @model annotation="teneo.jpa value='@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)'" + * @generated + */ +public interface Bz398057B extends EObject { + /** + * Returns the value of the '<em><b>Ref To Class A</b></em>' container reference. + * It is bidirectional and its opposite is '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Ref To Class A</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 Class A</em>' container reference. + * @see #setRefToClassA(Bz398057A) + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_RefToClassA() + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB + * @model opposite="listOfB" transient="false" + * @generated + */ + Bz398057A getRefToClassA(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Ref To Class A</em>' container reference. + * @see #getRefToClassA() + * @generated + */ + void setRefToClassA(Bz398057A value); + + /** + * Returns the value of the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Value</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Value</em>' attribute. + * @see #setValue(double) + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B_Value() + * @model + * @generated + */ + double getValue(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Value</em>' attribute. + * @see #getValue() + * @generated + */ + void setValue(double value); + + /** + * Returns the value of the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>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() + * @model required="true" + * annotation="teneo.jpa value='@Id'" + * @generated + */ + String getId(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Id</em>' attribute. + * @see #getId() + * @generated + */ + void setId(String value); + +} // Bz398057B diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java new file mode 100644 index 0000000000..02bb6d875e --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/Bz398057B1.java @@ -0,0 +1,49 @@ +/** + */ +package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest; + + +/** + * <!-- begin-user-doc --> + * A representation of the model object '<em><b>Bz398057 B1</b></em>'. + * <!-- end-user-doc --> + * + * <p> + * The following features are supported: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}</li> + * </ul> + * </p> + * + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B1() + * @model + * @generated + */ +public interface Bz398057B1 extends Bz398057B { + + /** + * Returns the value of the '<em><b>Value Str</b></em>' attribute. + * <!-- begin-user-doc --> + * <p> + * If the meaning of the '<em>Value Str</em>' attribute isn't clear, + * there really should be more of a description here... + * </p> + * <!-- end-user-doc --> + * @return the value of the '<em>Value Str</em>' attribute. + * @see #setValueStr(String) + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage#getBz398057B1_ValueStr() + * @model + * @generated + */ + String getValueStr(); + + /** + * Sets the value of the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Value Str</em>' attribute. + * @see #getValueStr() + * @generated + */ + void setValueStr(String value); +} // Bz398057B1 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 80d3960701..a7d55b98a9 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 @@ -85,6 +85,42 @@ public interface HibernateTestFactory extends EFactory { Bz380987_Person createBz380987_Person(); /** + * Returns a new object of class '<em>Bz398057 A</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Bz398057 A</em>'. + * @generated + */ + Bz398057A createBz398057A(); + + /** + * Returns a new object of class '<em>Bz398057 A1</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Bz398057 A1</em>'. + * @generated + */ + Bz398057A1 createBz398057A1(); + + /** + * Returns a new object of class '<em>Bz398057 B</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Bz398057 B</em>'. + * @generated + */ + Bz398057B createBz398057B(); + + /** + * Returns a new object of class '<em>Bz398057 B1</em>'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return a new object of class '<em>Bz398057 B1</em>'. + * @generated + */ + Bz398057B1 createBz398057B1(); + + /** * 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 d9e648dbef..dc695f9b93 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 @@ -326,6 +326,181 @@ public interface HibernateTestPackage extends EPackage { int BZ380987_PERSON_FEATURE_COUNT = 3; /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A() + * @generated + */ + int BZ398057_A = 7; + + /** + * The feature id for the '<em><b>List Of B</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A__LIST_OF_B = 0; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A__ID = 1; + + /** + * The number of structural features of the '<em>Bz398057 A</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A_FEATURE_COUNT = 2; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1() + * @generated + */ + int BZ398057_A1 = 8; + + /** + * The feature id for the '<em><b>List Of B</b></em>' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A1__LIST_OF_B = BZ398057_A__LIST_OF_B; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A1__ID = BZ398057_A__ID; + + /** + * The number of structural features of the '<em>Bz398057 A1</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_A1_FEATURE_COUNT = BZ398057_A_FEATURE_COUNT + 0; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B() + * @generated + */ + int BZ398057_B = 9; + + /** + * The feature id for the '<em><b>Ref To Class A</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B__REF_TO_CLASS_A = 0; + + /** + * The feature id for the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B__VALUE = 1; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B__ID = 2; + + /** + * The number of structural features of the '<em>Bz398057 B</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B_FEATURE_COUNT = 3; + + /** + * The meta object id for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1() + * @generated + */ + int BZ398057_B1 = 10; + + /** + * The feature id for the '<em><b>Ref To Class A</b></em>' container reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B1__REF_TO_CLASS_A = BZ398057_B__REF_TO_CLASS_A; + + /** + * The feature id for the '<em><b>Value</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B1__VALUE = BZ398057_B__VALUE; + + /** + * The feature id for the '<em><b>Id</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B1__ID = BZ398057_B__ID; + + /** + * The feature id for the '<em><b>Value Str</b></em>' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + int BZ398057_B1__VALUE_STR = BZ398057_B_FEATURE_COUNT + 0; + + /** + * The number of structural features of the '<em>Bz398057 B1</em>' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + * @ordered + */ + 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.Bz387752_Enum <em>Bz387752 Enum</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -333,7 +508,7 @@ public interface HibernateTestPackage extends EPackage { * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz387752_Enum() * @generated */ - int BZ387752_ENUM = 7; + int BZ387752_ENUM = 11; /** @@ -572,6 +747,112 @@ public interface HibernateTestPackage extends EPackage { EReference getBz380987_Person_Places(); /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Bz398057 A</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A + * @generated + */ + EClass getBz398057A(); + + /** + * Returns the meta object for the containment reference list '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB <em>List Of B</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the containment reference list '<em>List Of B</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getListOfB() + * @see #getBz398057A() + * @generated + */ + EReference getBz398057A_ListOfB(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A#getId <em>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() + * @see #getBz398057A() + * @generated + */ + EAttribute getBz398057A_Id(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Bz398057 A1</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 + * @generated + */ + EClass getBz398057A1(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Bz398057 B</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B + * @generated + */ + EClass getBz398057B(); + + /** + * Returns the meta object for the container reference '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA <em>Ref To Class A</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the container reference '<em>Ref To Class A</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getRefToClassA() + * @see #getBz398057B() + * @generated + */ + EReference getBz398057B_RefToClassA(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue <em>Value</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Value</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getValue() + * @see #getBz398057B() + * @generated + */ + EAttribute getBz398057B_Value(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B#getId <em>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() + * @see #getBz398057B() + * @generated + */ + EAttribute getBz398057B_Id(); + + /** + * Returns the meta object for class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for class '<em>Bz398057 B1</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 + * @generated + */ + EClass getBz398057B1(); + + /** + * Returns the meta object for the attribute '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr <em>Value Str</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the meta object for the attribute '<em>Value Str</em>'. + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1#getValueStr() + * @see #getBz398057B1() + * @generated + */ + EAttribute getBz398057B1_ValueStr(); + + /** * 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 --> @@ -794,6 +1075,94 @@ public interface HibernateTestPackage extends EPackage { EReference BZ380987_PERSON__PLACES = eINSTANCE.getBz380987_Person_Places(); /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl <em>Bz398057 A</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057AImpl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A() + * @generated + */ + EClass BZ398057_A = eINSTANCE.getBz398057A(); + + /** + * The meta object literal for the '<em><b>List Of B</b></em>' containment reference list feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference BZ398057_A__LIST_OF_B = eINSTANCE.getBz398057A_ListOfB(); + + /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute BZ398057_A__ID = eINSTANCE.getBz398057A_Id(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl <em>Bz398057 A1</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057A1Impl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057A1() + * @generated + */ + EClass BZ398057_A1 = eINSTANCE.getBz398057A1(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl <em>Bz398057 B</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057BImpl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B() + * @generated + */ + EClass BZ398057_B = eINSTANCE.getBz398057B(); + + /** + * The meta object literal for the '<em><b>Ref To Class A</b></em>' container reference feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EReference BZ398057_B__REF_TO_CLASS_A = eINSTANCE.getBz398057B_RefToClassA(); + + /** + * The meta object literal for the '<em><b>Value</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute BZ398057_B__VALUE = eINSTANCE.getBz398057B_Value(); + + /** + * The meta object literal for the '<em><b>Id</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute BZ398057_B__ID = eINSTANCE.getBz398057B_Id(); + + /** + * The meta object literal for the '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl <em>Bz398057 B1</em>}' class. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl + * @see org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.HibernateTestPackageImpl#getBz398057B1() + * @generated + */ + EClass BZ398057_B1 = eINSTANCE.getBz398057B1(); + + /** + * The meta object literal for the '<em><b>Value Str</b></em>' attribute feature. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + EAttribute BZ398057_B1__VALUE_STR = eINSTANCE.getBz398057B1_ValueStr(); + + /** * 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/Bz398057A1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java new file mode 100644 index 0000000000..8300de1500 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057A1Impl.java @@ -0,0 +1,39 @@ +/** + */ +package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl; + +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage; + +import org.eclipse.emf.ecore.EClass; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Bz398057 A1</b></em>'. + * <!-- end-user-doc --> + * <p> + * </p> + * + * @generated + */ +public class Bz398057A1Impl extends Bz398057AImpl implements Bz398057A1 { + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Bz398057A1Impl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return HibernateTestPackage.Literals.BZ398057_A1; + } + +} //Bz398057A1Impl 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 new file mode 100644 index 0000000000..e1c6e07801 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.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.Bz398057A; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B; +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.EObjectWithInverseResolvingEList; +import org.eclipse.emf.ecore.util.InternalEList; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Bz398057 A</b></em>'. + * <!-- end-user-doc --> + * <p> + * 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> + * </ul> + * </p> + * + * @generated + */ +public class Bz398057AImpl extends EObjectImpl implements Bz398057A { + /** + * The cached value of the '{@link #getListOfB() <em>List Of B</em>}' containment reference list. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getListOfB() + * @generated + * @ordered + */ + protected EList<Bz398057B> listOfB; + + /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Bz398057AImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return HibernateTestPackage.Literals.BZ398057_A; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EList<Bz398057B> getListOfB() { + if (listOfB == null) { + listOfB = new EObjectContainmentWithInverseEList<Bz398057B>(Bz398057B.class, this, HibernateTestPackage.BZ398057_A__LIST_OF_B, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A); + } + return listOfB; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getId() { + return id; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setId(String newId) { + String oldId = id; + id = newId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__ID, oldId, id)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @SuppressWarnings("unchecked") + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case HibernateTestPackage.BZ398057_A__LIST_OF_B: + return ((InternalEList<InternalEObject>)(InternalEList<?>)getListOfB()).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.BZ398057_A__LIST_OF_B: + return ((InternalEList<?>)getListOfB()).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.BZ398057_A__LIST_OF_B: + return getListOfB(); + case HibernateTestPackage.BZ398057_A__ID: + return getId(); + } + 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.BZ398057_A__LIST_OF_B: + getListOfB().clear(); + getListOfB().addAll((Collection<? extends Bz398057B>)newValue); + return; + case HibernateTestPackage.BZ398057_A__ID: + setId((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case HibernateTestPackage.BZ398057_A__LIST_OF_B: + getListOfB().clear(); + return; + case HibernateTestPackage.BZ398057_A__ID: + setId(ID_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + 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); + } + 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(" (id: "); + result.append(id); + result.append(')'); + return result.toString(); + } + +} //Bz398057AImpl diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java new file mode 100644 index 0000000000..d1e561ae9b --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java @@ -0,0 +1,159 @@ +/** + */ +package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl; + +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage; + +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.ENotificationImpl; + +/** + * <!-- begin-user-doc --> + * An implementation of the model object '<em><b>Bz398057 B1</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <ul> + * <li>{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl.Bz398057B1Impl#getValueStr <em>Value Str</em>}</li> + * </ul> + * </p> + * + * @generated + */ +public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1 { + /** + * The default value of the '{@link #getValueStr() <em>Value Str</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValueStr() + * @generated + * @ordered + */ + protected static final String VALUE_STR_EDEFAULT = null; + /** + * The cached value of the '{@link #getValueStr() <em>Value Str</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValueStr() + * @generated + * @ordered + */ + protected String valueStr = VALUE_STR_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Bz398057B1Impl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return HibernateTestPackage.Literals.BZ398057_B1; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getValueStr() { + return valueStr; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setValueStr(String newValueStr) { + String oldValueStr = valueStr; + valueStr = newValueStr; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr, valueStr)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B1__VALUE_STR: + return getValueStr(); + } + 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.BZ398057_B1__VALUE_STR: + setValueStr((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B1__VALUE_STR: + setValueStr(VALUE_STR_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B1__VALUE_STR: + return VALUE_STR_EDEFAULT == null ? valueStr != null : !VALUE_STR_EDEFAULT.equals(valueStr); + } + 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(" (valueStr: "); + result.append(valueStr); + result.append(')'); + return result.toString(); + } + +} //Bz398057B1Impl 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 new file mode 100644 index 0000000000..9f620d9d1c --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java @@ -0,0 +1,315 @@ +/** + */ +package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl; + +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B; +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>Bz398057 B</b></em>'. + * <!-- end-user-doc --> + * <p> + * The following features are implemented: + * <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> + * </ul> + * </p> + * + * @generated + */ +public class Bz398057BImpl extends EObjectImpl implements Bz398057B { + /** + * The default value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected static final double VALUE_EDEFAULT = 0.0; + /** + * The cached value of the '{@link #getValue() <em>Value</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getValue() + * @generated + * @ordered + */ + protected double value = VALUE_EDEFAULT; + + /** + * The default value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected static final String ID_EDEFAULT = null; + /** + * The cached value of the '{@link #getId() <em>Id</em>}' attribute. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see #getId() + * @generated + * @ordered + */ + protected String id = ID_EDEFAULT; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Bz398057BImpl() { + super(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + protected EClass eStaticClass() { + return HibernateTestPackage.Literals.BZ398057_B; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Bz398057A getRefToClassA() { + if (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A) return null; + return (Bz398057A)eContainer(); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public NotificationChain basicSetRefToClassA(Bz398057A newRefToClassA, NotificationChain msgs) { + msgs = eBasicSetContainer((InternalEObject)newRefToClassA, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, msgs); + return msgs; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setRefToClassA(Bz398057A newRefToClassA) { + if (newRefToClassA != eInternalContainer() || (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null)) { + if (EcoreUtil.isAncestor(this, newRefToClassA)) + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); + NotificationChain msgs = null; + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); + if (newRefToClassA != null) + msgs = ((InternalEObject)newRefToClassA).eInverseAdd(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.class, msgs); + msgs = basicSetRefToClassA(newRefToClassA, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A, newRefToClassA, newRefToClassA)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public double getValue() { + return value; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setValue(double newValue) { + double oldValue = value; + value = newValue; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__VALUE, oldValue, value)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public String getId() { + return id; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public void setId(String newId) { + String oldId = id; + id = newId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__ID, oldId, id)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A: + if (eInternalContainer() != null) + msgs = eBasicRemoveFromContainer(msgs); + return basicSetRefToClassA((Bz398057A)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.BZ398057_B__REF_TO_CLASS_A: + return basicSetRefToClassA(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.BZ398057_B__REF_TO_CLASS_A: + return eInternalContainer().eInverseRemove(this, HibernateTestPackage.BZ398057_A__LIST_OF_B, Bz398057A.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.BZ398057_B__REF_TO_CLASS_A: + return getRefToClassA(); + case HibernateTestPackage.BZ398057_B__VALUE: + return getValue(); + case HibernateTestPackage.BZ398057_B__ID: + return getId(); + } + 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.BZ398057_B__REF_TO_CLASS_A: + setRefToClassA((Bz398057A)newValue); + return; + case HibernateTestPackage.BZ398057_B__VALUE: + setValue((Double)newValue); + return; + case HibernateTestPackage.BZ398057_B__ID: + setId((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A: + setRefToClassA((Bz398057A)null); + return; + case HibernateTestPackage.BZ398057_B__VALUE: + setValue(VALUE_EDEFAULT); + return; + case HibernateTestPackage.BZ398057_B__ID: + setId(ID_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A: + 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); + } + 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(" (value: "); + result.append(value); + result.append(", id: "); + result.append(id); + result.append(')'); + return result.toString(); + } + +} //Bz398057BImpl 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 f8fb32be16..2c3c113ca6 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 @@ -2,6 +2,7 @@ */ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.impl; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.*; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient; @@ -71,6 +72,10 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT case HibernateTestPackage.BZ380987_GROUP: return createBz380987_Group(); case HibernateTestPackage.BZ380987_PLACE: return createBz380987_Place(); case HibernateTestPackage.BZ380987_PERSON: return createBz380987_Person(); + case HibernateTestPackage.BZ398057_A: return createBz398057A(); + case HibernateTestPackage.BZ398057_A1: return createBz398057A1(); + case HibernateTestPackage.BZ398057_B: return createBz398057B(); + case HibernateTestPackage.BZ398057_B1: return createBz398057B1(); default: throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } @@ -181,6 +186,46 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT * <!-- end-user-doc --> * @generated */ + public Bz398057A createBz398057A() { + Bz398057AImpl bz398057A = new Bz398057AImpl(); + return bz398057A; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Bz398057A1 createBz398057A1() { + Bz398057A1Impl bz398057A1 = new Bz398057A1Impl(); + return bz398057A1; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Bz398057B createBz398057B() { + Bz398057BImpl bz398057B = new Bz398057BImpl(); + return bz398057B; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public Bz398057B1 createBz398057B1() { + Bz398057B1Impl bz398057B1 = new Bz398057B1Impl(); + return bz398057B1; + } + + /** + * <!-- 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 ea167318a7..581571031b 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,10 @@ 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.Bz398057A; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestFactory; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.HibernateTestPackage; @@ -81,6 +85,34 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT * <!-- end-user-doc --> * @generated */ + private EClass bz398057AEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass bz398057A1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass bz398057BEClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + private EClass bz398057B1EClass = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ private EEnum bz387752_EnumEEnum = null; /** @@ -347,6 +379,96 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT * <!-- end-user-doc --> * @generated */ + public EClass getBz398057A() { + return bz398057AEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getBz398057A_ListOfB() { + return (EReference)bz398057AEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getBz398057A_Id() { + return (EAttribute)bz398057AEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getBz398057A1() { + return bz398057A1EClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getBz398057B() { + return bz398057BEClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EReference getBz398057B_RefToClassA() { + return (EReference)bz398057BEClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getBz398057B_Value() { + return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(1); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getBz398057B_Id() { + return (EAttribute)bz398057BEClass.getEStructuralFeatures().get(2); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EClass getBz398057B1() { + return bz398057B1EClass; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public EAttribute getBz398057B1_ValueStr() { + return (EAttribute)bz398057B1EClass.getEStructuralFeatures().get(0); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ public EEnum getBz387752_Enum() { return bz387752_EnumEEnum; } @@ -408,6 +530,20 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT createEReference(bz380987_PersonEClass, BZ380987_PERSON__GROUP); createEReference(bz380987_PersonEClass, BZ380987_PERSON__PLACES); + bz398057AEClass = createEClass(BZ398057_A); + createEReference(bz398057AEClass, BZ398057_A__LIST_OF_B); + createEAttribute(bz398057AEClass, BZ398057_A__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); + + bz398057B1EClass = createEClass(BZ398057_B1); + createEAttribute(bz398057B1EClass, BZ398057_B1__VALUE_STR); + // Create enums bz387752_EnumEEnum = createEEnum(BZ387752_ENUM); } @@ -440,6 +576,8 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT // Set bounds for type parameters // Add supertypes to classes + bz398057A1EClass.getESuperTypes().add(this.getBz398057A()); + bz398057B1EClass.getESuperTypes().add(this.getBz398057B()); // Initialize classes and features; add operations and parameters initEClass(bz356181_MainEClass, Bz356181_Main.class, "Bz356181_Main", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); @@ -471,6 +609,20 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT initEReference(getBz380987_Person_Group(), this.getBz380987_Group(), this.getBz380987_Group_People(), "group", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); initEReference(getBz380987_Person_Places(), this.getBz380987_Place(), this.getBz380987_Place_People(), "places", null, 0, -1, Bz380987_Person.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + 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); + + 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); + + 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); + // Initialize enums and add enum literals initEEnum(bz387752_EnumEEnum, Bz387752_Enum.class, "Bz387752_Enum"); addEEnumLiteral(bz387752_EnumEEnum, Bz387752_Enum.VAL0); @@ -503,6 +655,30 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT source, new String[] { "value", "@Transient" + }); + addAnnotation + (bz398057AEClass, + source, + new String[] { + "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" + }); + addAnnotation + (getBz398057A_Id(), + source, + new String[] { + "value", "@Id" + }); + addAnnotation + (bz398057BEClass, + source, + new String[] { + "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" + }); + addAnnotation + (getBz398057B_Id(), + 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 4c29e924e4..3f058561f8 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 @@ -2,6 +2,7 @@ */ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.*; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient; @@ -101,6 +102,22 @@ public class HibernateTestAdapterFactory extends AdapterFactoryImpl { return createBz380987_PersonAdapter(); } @Override + public Adapter caseBz398057A(Bz398057A object) { + return createBz398057AAdapter(); + } + @Override + public Adapter caseBz398057A1(Bz398057A1 object) { + return createBz398057A1Adapter(); + } + @Override + public Adapter caseBz398057B(Bz398057B object) { + return createBz398057BAdapter(); + } + @Override + public Adapter caseBz398057B1(Bz398057B1 object) { + return createBz398057B1Adapter(); + } + @Override public Adapter defaultCase(EObject object) { return createEObjectAdapter(); } @@ -219,6 +236,62 @@ public class HibernateTestAdapterFactory extends AdapterFactoryImpl { } /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A <em>Bz398057 A</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.Bz398057A + * @generated + */ + public Adapter createBz398057AAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057A1 <em>Bz398057 A1</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.Bz398057A1 + * @generated + */ + public Adapter createBz398057A1Adapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B <em>Bz398057 B</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.Bz398057B + * @generated + */ + public Adapter createBz398057BAdapter() { + return null; + } + + /** + * Creates a new adapter for an object of class '{@link org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz398057B1 <em>Bz398057 B1</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.Bz398057B1 + * @generated + */ + public Adapter createBz398057B1Adapter() { + 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 523c248e2e..ee02409e47 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 @@ -2,6 +2,7 @@ */ package org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.util; +import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.*; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Main; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_NonTransient; import org.eclipse.emf.cdo.tests.hibernate.model.HibernateTest.Bz356181_Transient; @@ -114,6 +115,32 @@ public class HibernateTestSwitch<T> extends Switch<T> { if (result == null) result = defaultCase(theEObject); return result; } + case HibernateTestPackage.BZ398057_A: { + Bz398057A bz398057A = (Bz398057A)theEObject; + T result = caseBz398057A(bz398057A); + if (result == null) result = defaultCase(theEObject); + return result; + } + case HibernateTestPackage.BZ398057_A1: { + Bz398057A1 bz398057A1 = (Bz398057A1)theEObject; + T result = caseBz398057A1(bz398057A1); + if (result == null) result = caseBz398057A(bz398057A1); + if (result == null) result = defaultCase(theEObject); + return result; + } + case HibernateTestPackage.BZ398057_B: { + Bz398057B bz398057B = (Bz398057B)theEObject; + T result = caseBz398057B(bz398057B); + if (result == null) result = defaultCase(theEObject); + return result; + } + case HibernateTestPackage.BZ398057_B1: { + Bz398057B1 bz398057B1 = (Bz398057B1)theEObject; + T result = caseBz398057B1(bz398057B1); + if (result == null) result = caseBz398057B(bz398057B1); + if (result == null) result = defaultCase(theEObject); + return result; + } default: return defaultCase(theEObject); } } @@ -224,6 +251,66 @@ public class HibernateTestSwitch<T> extends Switch<T> { } /** + * Returns the result of interpreting the object as an instance of '<em>Bz398057 A</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>Bz398057 A</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBz398057A(Bz398057A object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Bz398057 A1</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>Bz398057 A1</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBz398057A1(Bz398057A1 object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Bz398057 B</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>Bz398057 B</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBz398057B(Bz398057B object) { + return null; + } + + /** + * Returns the result of interpreting the object as an instance of '<em>Bz398057 B1</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>Bz398057 B1</em>'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseBz398057B1(Bz398057B1 object) { + return null; + } + + /** * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. * <!-- begin-user-doc --> * This implementation returns null; |