Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-04-22 12:16:16 -0400
committerEike Stepper2015-04-22 12:16:16 -0400
commitd2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7 (patch)
tree6488f73e26dcddd9b1c7befccf7ba721215edce9 /plugins/org.eclipse.emf.cdo.tests.hibernate
parentef5341796d793607c49d863f8607f3193ceb08ae (diff)
downloadcdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.gz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.xz
cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.zip
[Releng] Reformat everything with M6 formatter
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.hibernate')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java30
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682PImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057AImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057B1Impl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz398057BImpl.java22
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestFactoryImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/HibernateTestPackageImpl.java105
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java30
33 files changed, 246 insertions, 99 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
index 6f329225fc..9e65f67242 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Activator.java
@@ -4,7 +4,7 @@
* 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
*/
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
index 39bd38e968..3dd7329b55 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/AuditFeatureMapTest.java
@@ -32,7 +32,7 @@ import java.util.Map;
/**
* NOTE: this testcase does not pass currently for CDO.
- *
+ *
* @author Simon McDuff
* @Author Martin Taal
*/
@@ -122,7 +122,8 @@ public class AuditFeatureMapTest extends AbstractCDOTest
}
}
- private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result, FeatureMap featureMap)
+ private void addToResultMap(long timeStamp, Map<Long, Map<EStructuralFeature, Class<?>>> result,
+ FeatureMap featureMap)
{
final Map<EStructuralFeature, Class<?>> entryResult = new HashMap<EStructuralFeature, Class<?>>();
result.put(timeStamp, entryResult);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
index c244f58696..34ebb605bd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/CDOObjectHistoryTest.java
@@ -221,8 +221,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
CDORevisionDelta revisionDelta = revision3.compare(revision2);
for (CDOFeatureDelta featureDelta : revisionDelta.getFeatureDeltas())
{
- System.err.println(featureDelta.getFeature().getName() + " changed through changeType "
- + featureDelta.getType());
+ System.err
+ .println(featureDelta.getFeature().getName() + " changed through changeType " + featureDelta.getType());
}
assertEquals("ESC", revision1.getValue(revision1.getEClass().getEStructuralFeature("name")));
@@ -280,8 +280,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
for (Object o : changedObjects)
{
final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
- final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE
- .getCDOResource_Contents());
+ final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
+ .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
assertNotNull(cdoFeatureDelta);
assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
}
@@ -326,8 +326,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
for (Object o : changedObjects)
{
final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
- final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta.getFeatureDelta(cdoRevisionDelta
- .getEClass().getEStructuralFeature("name"));
+ final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta
+ .getFeatureDelta(cdoRevisionDelta.getEClass().getEStructuralFeature("name"));
assertNotNull(cdoFeatureDelta);
assertEquals("Sympedia", cdoFeatureDelta.getValue());
}
@@ -344,8 +344,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
for (Object o : changedObjects)
{
final CDORevisionDelta cdoRevisionDelta = (CDORevisionDelta)o;
- final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta.getFeatureDelta(cdoRevisionDelta
- .getEClass().getEStructuralFeature("name"));
+ final CDOSetFeatureDelta cdoFeatureDelta = (CDOSetFeatureDelta)cdoRevisionDelta
+ .getFeatureDelta(cdoRevisionDelta.getEClass().getEStructuralFeature("name"));
assertNotNull(cdoFeatureDelta);
assertEquals("Eclipse", cdoFeatureDelta.getValue());
}
@@ -369,8 +369,8 @@ public class CDOObjectHistoryTest extends AbstractCDOTest
{
continue;
}
- final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta.getFeatureDelta(EresourcePackage.eINSTANCE
- .getCDOResource_Contents());
+ final CDOFeatureDelta cdoFeatureDelta = cdoRevisionDelta
+ .getFeatureDelta(EresourcePackage.eINSTANCE.getCDOResource_Contents());
assertNotNull(cdoFeatureDelta);
assertEquals(CDOFeatureDelta.Type.LIST, cdoFeatureDelta.getType());
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
index ee20d5cb13..fb604c9c5e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateAttributeTest.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.tests.AttributeTest;
/**
* Disable some tests which won't work with hibernate (persisting java classes and java objects).
- *
+ *
* @author Martin Taal
*/
public class HibernateAttributeTest extends AttributeTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
index eef34790c1..bff57d1386 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_258933_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_258933_Test;
* CDORevisionImpl.eIsSet() works incorrectly
* <p>
* See bug 258933
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_258933_Test extends Bugzilla_258933_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
index 119aad504c..09bd18874e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_301104_Test.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.EcoreFactory;
* Allow application to set generated id.
* <p>
* See bug 301104
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_301104_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
index 1ef70cd7c9..d4e35145dd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_356181_Test.java
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.List;
/**
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_356181_Test extends AbstractCDOTest
@@ -75,7 +75,8 @@ public class HibernateBugzilla_356181_Test extends AbstractCDOTest
assertEquals(1, results.size());
assertEquals(true,
results.get(0).getSourceObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_NonTransient());
- assertEquals(true, results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
+ assertEquals(true,
+ results.get(0).getTargetObject().eClass() == HibernateTestPackage.eINSTANCE.getBz356181_Main());
session.close();
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
index 744b63681a..acc9dfbc3e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270b_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
/**
* Read external reference annotation.
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_362270b_Test extends Bugzilla_362270b_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
index 863b512178..c93a913ccd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_362270c_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
/**
* Read external reference annotation.
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_362270c_Test extends Bugzilla_362270c_Test
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
index 1ad87d8a25..014cd265cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.PersistenceOptions;
/**
* Read external reference annotation.
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_387752_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
index f378f52dce..fe8f016b4d 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_387752_True_Test.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.teneo.PersistenceOptions;
/**
* Read external reference annotation.
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_387752_True_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
index 7a2025e818..b3ee16efaa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateBugzilla_417797_Test.java
@@ -26,7 +26,7 @@ import org.hibernate.cache.ehcache.EhCacheRegionFactory;
import org.hibernate.cfg.Environment;
/**
- *
+ *
* @author Martin Taal
*/
public class HibernateBugzilla_417797_Test extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
index 8e5c9063a2..62c29e1799 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateExternalReferenceTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
/**
* Test {@link ExternalReferenceTest}, disables some testcases which will never work anyway.
- *
+ *
* @author Martin Taal
*/
public class HibernateExternalReferenceTest extends ExternalReferenceTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
index 642e54889d..4f50e25008 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateLazyLoadTest.java
@@ -32,7 +32,7 @@ import java.util.List;
/**
* Test lazy load behavior of hibernate
- *
+ *
* @author Martin Taal
*/
public class HibernateLazyLoadTest extends AbstractCDOTest
@@ -136,8 +136,8 @@ public class HibernateLazyLoadTest extends AbstractCDOTest
customer.setStreet("Street " + i);
resource.getContents().add(customer);
- final List<Product1> customerProducts = products.subList(productCounter, productCounter
- + NUM_OF_PRODUCTS_CUSTOMER);
+ final List<Product1> customerProducts = products.subList(productCounter,
+ productCounter + NUM_OF_PRODUCTS_CUSTOMER);
for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
{
resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
index a7b6250241..94035b47b5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateMultiValuedOfAttributeTest.java
@@ -17,7 +17,7 @@ import java.util.List;
/**
* Test different aspects of HQL querying using the CDO query api.
- *
+ *
* @author Martin Taal
*/
public class HibernateMultiValuedOfAttributeTest extends MultiValuedOfAttributeTest
@@ -30,7 +30,7 @@ public class HibernateMultiValuedOfAttributeTest extends MultiValuedOfAttributeT
list.add(10);
list.add(13);
list.add(20);
- testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(), getModel5Package()
- .getGenListOfInteger_Elements());
+ testMultiValuedIOfAttribute(list, getModel5Package().getGenListOfInteger(),
+ getModel5Package().getGenListOfInteger_Elements());
}
}
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
index 50d10a375f..0643d4cc8e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryNoCachingTest.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.view.CDOQuery;
/**
* Test HQL queries with server side caching of query list to off.
- *
+ *
* @author Martin Taal
*/
public class HibernateQueryNoCachingTest extends HibernateQueryTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
index 8ecaf6c17e..d8657196aa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateQueryTest.java
@@ -37,7 +37,7 @@ import java.util.List;
/**
* Test different aspects of HQL querying using the CDO query api.
- *
+ *
* @author Martin Taal
*/
public class HibernateQueryTest extends AbstractCDOTest
@@ -202,10 +202,8 @@ public class HibernateQueryTest extends AbstractCDOTest
final int productIndex = Integer.parseInt(product.getName());
// note the id is always used as the parameter
// bug 282620
- final CDOQuery orderQuery = transaction
- .createQuery(
- "hql",
- "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product");
+ final CDOQuery orderQuery = transaction.createQuery("hql",
+ "select so from SalesOrder so, OrderDetail od where so.customer=:customer and od in elements(so.orderDetails) and od.product=:product");
orderQuery.setParameter("customer", customer);
orderQuery.setParameter("product", product);
addCacheParameter(orderQuery);
@@ -459,8 +457,8 @@ public class HibernateQueryTest extends AbstractCDOTest
customer.setStreet("Street " + i);
resource.getContents().add(customer);
- final List<Product1> customerProducts = products.subList(productCounter, productCounter
- + NUM_OF_PRODUCTS_CUSTOMER);
+ final List<Product1> customerProducts = products.subList(productCounter,
+ productCounter + NUM_OF_PRODUCTS_CUSTOMER);
for (int k = 0; k < NUM_OF_SALES_ORDERS; k++)
{
resource.getContents().add(createSalesOrder(i * 10 + k, customer, customerProducts));
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
index f424574d55..9682346739 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateTimeStampTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.transaction.CDOTransaction;
/**
* Simple test to check that the timestamp is indeed stored. https://bugs.eclipse.org/bugs/show_bug.cgi?id=361792
- *
+ *
* @author Martin Taal
*/
public class HibernateTimeStampTest extends AbstractCDOTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
index 039353b09e..34ceaadb24 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/HibernateXATransactionTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
/**
* Override {@link XATransactionTest} to do mapping of external references.
- *
+ *
* @author Martin Taal
*/
public class HibernateXATransactionTest extends XATransactionTest
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
index 0564640107..aa8eb6029e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/Hibernate_Missing_Version_Test.java
@@ -71,7 +71,7 @@ public class Hibernate_Missing_Version_Test extends AbstractCDOTest
{
CDOTransaction transaction = session.openTransaction();
Customer customer = lastCustomer; // transaction.getObject(lastCustomer);//
- // (Customer)resource.getContents().get(0);
+ // (Customer)resource.getContents().get(0);
customer.setName("Peter");
assertEquals(2, CDOUtil.getCDOObject(customer).cdoRevision().getVersion());
transaction.commit();
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
index 0fc9458529..f9ef5127d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_MainImpl.java
@@ -140,8 +140,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
String oldTransient = transient_;
transient_ = newTransient;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT,
- oldTransient, transient_));
+ {
+ eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT, oldTransient,
+ transient_));
+ }
}
/**
@@ -164,8 +166,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
String oldNonTransient = nonTransient;
nonTransient = newNonTransient;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__NON_TRANSIENT,
oldNonTransient, nonTransient));
+ }
}
/**
@@ -182,8 +186,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
if (transientRef != oldTransientRef)
{
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
oldTransientRef, transientRef));
+ }
}
}
return transientRef;
@@ -209,8 +215,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
Bz356181_Transient oldTransientRef = transientRef;
transientRef = newTransientRef;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF,
oldTransientRef, transientRef));
+ }
}
/**
@@ -227,8 +235,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
if (transientOtherRef != oldTransientOtherRef)
{
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.RESOLVE,
HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF, oldTransientOtherRef, transientOtherRef));
+ }
}
}
return transientOtherRef;
@@ -254,8 +264,10 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
Bz356181_NonTransient oldTransientOtherRef = transientOtherRef;
transientOtherRef = newTransientOtherRef;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF,
oldTransientOtherRef, transientOtherRef));
+ }
}
/**
@@ -274,11 +286,15 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
return getNonTransient();
case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_REF:
if (resolve)
+ {
return getTransientRef();
+ }
return basicGetTransientRef();
case HibernateTestPackage.BZ356181_MAIN__TRANSIENT_OTHER_REF:
if (resolve)
+ {
return getTransientOtherRef();
+ }
return basicGetTransientOtherRef();
}
return super.eGet(featureID, resolve, coreType);
@@ -367,7 +383,9 @@ public class Bz356181_MainImpl extends EObjectImpl implements Bz356181_Main
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (transient: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
index 03445fa331..ca0fcde4a0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz356181_NonTransientImpl.java
@@ -80,8 +80,10 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
if (main != oldMain)
{
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN,
oldMain, main));
+ }
}
}
return main;
@@ -107,8 +109,10 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
Bz356181_Main oldMain = main;
main = newMain;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN, oldMain,
main));
+ }
}
/**
@@ -123,7 +127,9 @@ public class Bz356181_NonTransientImpl extends EObjectImpl implements Bz356181_N
{
case HibernateTestPackage.BZ356181_NON_TRANSIENT__MAIN:
if (resolve)
+ {
return getMain();
+ }
return basicGetMain();
}
return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
index 58751d95cc..14380299b3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PersonImpl.java
@@ -125,7 +125,9 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
String oldName = name;
name = newName;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ380987_PERSON__NAME, oldName, name));
+ }
}
/**
@@ -293,7 +295,9 @@ public class Bz380987_PersonImpl extends EObjectImpl implements Bz380987_Person
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
index 7d45d6d131..aa47d7f58e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz380987_PlaceImpl.java
@@ -113,7 +113,9 @@ public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
String oldName = name;
name = newName;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ380987_PLACE__NAME, oldName, name));
+ }
}
/**
@@ -251,7 +253,9 @@ public class Bz380987_PlaceImpl extends EObjectImpl implements Bz380987_Place
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
index ba584a91bd..4c2168e0a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz387752_MainImpl.java
@@ -178,8 +178,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
boolean oldStrUnsettableESet = strUnsettableESet;
strUnsettableESet = true;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
oldStrUnsettable, strUnsettable, !oldStrUnsettableESet));
+ }
}
/**
@@ -194,8 +196,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
strUnsettable = STR_UNSETTABLE_EDEFAULT;
strUnsettableESet = false;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__STR_UNSETTABLE,
oldStrUnsettable, STR_UNSETTABLE_EDEFAULT, oldStrUnsettableESet));
+ }
}
/**
@@ -228,8 +232,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
String oldStrSettable = strSettable;
strSettable = newStrSettable;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__STR_SETTABLE,
oldStrSettable, strSettable));
+ }
}
/**
@@ -252,8 +258,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
Bz387752_Enum oldEnumSettable = enumSettable;
enumSettable = newEnumSettable == null ? ENUM_SETTABLE_EDEFAULT : newEnumSettable;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_SETTABLE,
oldEnumSettable, enumSettable));
+ }
}
/**
@@ -278,8 +286,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
boolean oldEnumUnsettableESet = enumUnsettableESet;
enumUnsettableESet = true;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
oldEnumUnsettable, enumUnsettable, !oldEnumUnsettableESet));
+ }
}
/**
@@ -294,8 +304,10 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
enumUnsettable = ENUM_UNSETTABLE_EDEFAULT;
enumUnsettableESet = false;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.UNSET, HibernateTestPackage.BZ387752_MAIN__ENUM_UNSETTABLE,
oldEnumUnsettable, ENUM_UNSETTABLE_EDEFAULT, oldEnumUnsettableESet));
+ }
}
/**
@@ -413,23 +425,33 @@ public class Bz387752_MainImpl extends EObjectImpl implements Bz387752_Main
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (strUnsettable: ");
if (strUnsettableESet)
+ {
result.append(strUnsettable);
+ }
else
+ {
result.append("<unset>");
+ }
result.append(", strSettable: ");
result.append(strSettable);
result.append(", enumSettable: ");
result.append(enumSettable);
result.append(", enumUnsettable: ");
if (enumUnsettableESet)
+ {
result.append(enumUnsettable);
+ }
else
+ {
result.append("<unset>");
+ }
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/Bz397682CImpl.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/impl/Bz397682CImpl.java
index 35cd4b24ab..7d4d1d272d 100644
--- 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
@@ -98,7 +98,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
public Bz397682P getRefToP()
{
if (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P)
+ {
return null;
+ }
return (Bz397682P)eContainer();
}
@@ -121,23 +123,33 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
public void setRefToP(Bz397682P newRefToP)
{
if (newRefToP != eInternalContainer()
- || (eContainerFeatureID() != HibernateTestPackage.BZ397682_C__REF_TO_P && newRefToP != null))
+ || 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));
+ }
}
/**
@@ -154,8 +166,10 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
if (refToC != oldRefToC)
{
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, HibernateTestPackage.BZ397682_C__REF_TO_C,
oldRefToC, refToC));
+ }
}
}
return refToC;
@@ -181,8 +195,10 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
Bz397682C oldRefToC = refToC;
refToC = newRefToC;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC,
- refToC));
+ {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__REF_TO_C, oldRefToC, refToC));
+ }
}
/**
@@ -205,7 +221,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
String oldDbId = dbId;
dbId = newDbId;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_C__DB_ID, oldDbId, dbId));
+ }
}
/**
@@ -220,7 +238,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
{
case HibernateTestPackage.BZ397682_C__REF_TO_P:
if (eInternalContainer() != null)
+ {
msgs = eBasicRemoveFromContainer(msgs);
+ }
return basicSetRefToP((Bz397682P)otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -273,7 +293,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
return getRefToP();
case HibernateTestPackage.BZ397682_C__REF_TO_C:
if (resolve)
+ {
return getRefToC();
+ }
return basicGetRefToC();
case HibernateTestPackage.BZ397682_C__DB_ID:
return getDbId();
@@ -356,7 +378,9 @@ public class Bz397682CImpl extends EObjectImpl implements Bz397682C
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (dbId: ");
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
index ecfe8224d8..56b11b3b32 100644
--- 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
@@ -113,7 +113,9 @@ public class Bz397682PImpl extends EObjectImpl implements Bz397682P
String oldDbId = dbId;
dbId = newDbId;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ397682_P__DB_ID, oldDbId, dbId));
+ }
}
/**
@@ -251,7 +253,9 @@ public class Bz397682PImpl extends EObjectImpl implements Bz397682P
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (dbId: ");
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 a15d4eed2a..5b066c5d06 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
@@ -128,7 +128,9 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A
String oldDbId = dbId;
dbId = newDbId;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_A__DB_ID, oldDbId, dbId));
+ }
}
/**
@@ -251,7 +253,9 @@ public class Bz398057AImpl extends EObjectImpl implements Bz398057A
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (dbId: ");
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
index 110765cb25..f545ba1b3b 100644
--- 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
@@ -93,8 +93,10 @@ public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
String oldValueStr = valueStr;
valueStr = newValueStr;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B1__VALUE_STR, oldValueStr,
valueStr));
+ }
}
/**
@@ -172,7 +174,9 @@ public class Bz398057B1Impl extends Bz398057BImpl implements Bz398057B1
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (valueStr: ");
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 c83bbfbb29..a7f864e7e4 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
@@ -108,7 +108,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
public Bz398057A getRefToClassA()
{
if (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A)
+ {
return null;
+ }
return (Bz398057A)eContainer();
}
@@ -131,23 +133,33 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
public void setRefToClassA(Bz398057A newRefToClassA)
{
if (newRefToClassA != eInternalContainer()
- || (eContainerFeatureID() != HibernateTestPackage.BZ398057_B__REF_TO_CLASS_A && newRefToClassA != null))
+ || 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));
+ }
}
/**
@@ -170,7 +182,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
double oldValue = value;
value = newValue;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__VALUE, oldValue, value));
+ }
}
/**
@@ -193,7 +207,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
String oldDbId = dbId;
dbId = newDbId;
if (eNotificationRequired())
+ {
eNotify(new ENotificationImpl(this, Notification.SET, HibernateTestPackage.BZ398057_B__DB_ID, oldDbId, dbId));
+ }
}
/**
@@ -208,7 +224,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
{
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);
@@ -342,7 +360,9 @@ public class Bz398057BImpl extends EObjectImpl implements Bz398057B
public String toString()
{
if (eIsProxy())
+ {
return super.toString();
+ }
StringBuffer result = new StringBuffer(super.toString());
result.append(" (value: ");
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 ade8333c41..1a1a165f50 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
@@ -304,8 +304,10 @@ public class HibernateTestFactoryImpl extends EFactoryImpl implements HibernateT
{
Bz387752_Enum result = Bz387752_Enum.get(initialValue);
if (result == null)
- throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
- + eDataType.getName() + "'");
+ {
+ throw new IllegalArgumentException(
+ "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+ }
return result;
}
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 67516fac80..85a5582cff 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
@@ -169,7 +169,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link HibernateTestPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
@@ -182,12 +182,14 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
public static HibernateTestPackage init()
{
if (isInited)
+ {
return (HibernateTestPackage)EPackage.Registry.INSTANCE.getEPackage(HibernateTestPackage.eNS_URI);
+ }
// Obtain or create and register package
HibernateTestPackageImpl theHibernateTestPackage = (HibernateTestPackageImpl)(EPackage.Registry.INSTANCE
.get(eNS_URI) instanceof HibernateTestPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
- : new HibernateTestPackageImpl());
+ : new HibernateTestPackageImpl());
isInited = true;
@@ -632,7 +634,9 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
public void createPackageContents()
{
if (isCreated)
+ {
return;
+ }
isCreated = true;
// Create classes and their features
@@ -709,7 +713,9 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
public void initializePackageContents()
{
if (isInitialized)
+ {
return;
+ }
isInitialized = true;
// Initialize package
@@ -722,23 +728,23 @@ 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());
+ bz398057A1EClass.getESuperTypes().add(getBz398057A());
+ bz398057B1EClass.getESuperTypes().add(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);
initEAttribute(getBz356181_Main_Transient(), ecorePackage.getEString(), "transient", null, 0, 1,
- Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
initEAttribute(getBz356181_Main_NonTransient(), ecorePackage.getEString(), "nonTransient", null, 0, 1,
- Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getBz356181_Main_TransientRef(), this.getBz356181_Transient(), null, "transientRef", null, 0, 1,
+ Bz356181_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getBz356181_Main_TransientRef(), getBz356181_Transient(), null, "transientRef", null, 0, 1,
Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBz356181_Main_TransientOtherRef(), this.getBz356181_NonTransient(), null, "transientOtherRef",
- null, 0, 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getBz356181_Main_TransientOtherRef(), getBz356181_NonTransient(), null, "transientOtherRef", null, 0,
+ 1, Bz356181_Main.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bz356181_TransientEClass, Bz356181_Transient.class, "Bz356181_Transient", !IS_ABSTRACT, !IS_INTERFACE,
@@ -746,7 +752,7 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
initEClass(bz356181_NonTransientEClass, Bz356181_NonTransient.class, "Bz356181_NonTransient", !IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getBz356181_NonTransient_Main(), this.getBz356181_Main(), null, "main", null, 0, 1,
+ initEReference(getBz356181_NonTransient_Main(), getBz356181_Main(), null, "main", null, 0, 1,
Bz356181_NonTransient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -756,44 +762,43 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEAttribute(getBz387752_Main_StrSettable(), ecorePackage.getEString(), "strSettable", "value", 0, 1,
- Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBz387752_Main_EnumSettable(), this.getBz387752_Enum(), "enumSettable", null, 0, 1,
- Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEAttribute(getBz387752_Main_EnumUnsettable(), this.getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
+ Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getBz387752_Main_EnumSettable(), getBz387752_Enum(), "enumSettable", null, 0, 1, Bz387752_Main.class,
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getBz387752_Main_EnumUnsettable(), getBz387752_Enum(), "enumUnsettable", "VAL1", 0, 1,
Bz387752_Main.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEClass(bz380987_GroupEClass, Bz380987_Group.class, "Bz380987_Group", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
- initEReference(getBz380987_Group_People(), this.getBz380987_Person(), this.getBz380987_Person_Group(), "people",
- null, 0, -1, Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
- IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBz380987_Group_People(), getBz380987_Person(), getBz380987_Person_Group(), "people", null, 0, -1,
+ Bz380987_Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bz380987_PlaceEClass, Bz380987_Place.class, "Bz380987_Place", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getBz380987_Place_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Place.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getBz380987_Place_People(), this.getBz380987_Person(), this.getBz380987_Person_Places(), "people",
- null, 0, -1, Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
- IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getBz380987_Place_People(), getBz380987_Person(), getBz380987_Person_Places(), "people", null, 0, -1,
+ Bz380987_Place.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(bz380987_PersonEClass, Bz380987_Person.class, "Bz380987_Person", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getBz380987_Person_Name(), ecorePackage.getEString(), "name", null, 0, 1, Bz380987_Person.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- 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);
+ initEReference(getBz380987_Person_Group(), getBz380987_Group(), 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(), getBz380987_Place(), 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);
+ initEReference(getBz398057A_ListOfB(), getBz398057B(), 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_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);
@@ -801,11 +806,11 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
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);
+ initEReference(getBz398057B_RefToClassA(), getBz398057A(), 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_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);
@@ -817,17 +822,17 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
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,
+ initEReference(getBz397682P_ListOfC(), getBz397682C(), 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,
+ initEReference(getBz397682C_RefToP(), getBz397682P(), 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(), 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);
@@ -855,14 +860,14 @@ public class HibernateTestPackageImpl extends EPackageImpl implements HibernateT
String source = "teneo.jpa";
addAnnotation(getBz356181_Main_Transient(), source, new String[] { "value", "@Transient" });
addAnnotation(bz356181_TransientEClass, source, new String[] { "value", "@Transient" });
- addAnnotation(bz398057AEClass, source, new String[] { "value",
- "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+ addAnnotation(bz398057AEClass, source,
+ new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
addAnnotation(getBz398057A_DbId(), source, new String[] { "value", "@Id" });
- addAnnotation(bz398057BEClass, source, new String[] { "value",
- "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+ addAnnotation(bz398057BEClass, source,
+ new String[] { "value", "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
addAnnotation(getBz398057B_DbId(), source, new String[] { "value", "@Id" });
- addAnnotation(bz397682PEClass, source, new String[] { "value",
- "@Inheritance(strategy=InheritanceType.TABLE_PER_CLASS)" });
+ 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/HibernateTestSwitch.java b/plugins/org.eclipse.emf.cdo.tests.hibernate/src/org/eclipse/emf/cdo/tests/hibernate/model/HibernateTest/util/HibernateTestSwitch.java
index c511c6033c..548cbae1d9 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
@@ -97,7 +97,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz356181_Main bz356181_Main = (Bz356181_Main)theEObject;
T result = caseBz356181_Main(bz356181_Main);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ356181_TRANSIENT:
@@ -105,7 +107,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz356181_Transient bz356181_Transient = (Bz356181_Transient)theEObject;
T result = caseBz356181_Transient(bz356181_Transient);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ356181_NON_TRANSIENT:
@@ -113,7 +117,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz356181_NonTransient bz356181_NonTransient = (Bz356181_NonTransient)theEObject;
T result = caseBz356181_NonTransient(bz356181_NonTransient);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ387752_MAIN:
@@ -121,7 +127,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz387752_Main bz387752_Main = (Bz387752_Main)theEObject;
T result = caseBz387752_Main(bz387752_Main);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ380987_GROUP:
@@ -129,7 +137,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz380987_Group bz380987_Group = (Bz380987_Group)theEObject;
T result = caseBz380987_Group(bz380987_Group);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ380987_PLACE:
@@ -137,7 +147,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz380987_Place bz380987_Place = (Bz380987_Place)theEObject;
T result = caseBz380987_Place(bz380987_Place);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ380987_PERSON:
@@ -145,7 +157,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz380987_Person bz380987_Person = (Bz380987_Person)theEObject;
T result = caseBz380987_Person(bz380987_Person);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ398057_A:
@@ -153,7 +167,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz398057A bz398057A = (Bz398057A)theEObject;
T result = caseBz398057A(bz398057A);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ398057_A1:
@@ -161,9 +177,13 @@ public class HibernateTestSwitch<T> extends Switch<T>
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:
@@ -171,7 +191,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz398057B bz398057B = (Bz398057B)theEObject;
T result = caseBz398057B(bz398057B);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ398057_B1:
@@ -179,9 +201,13 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz398057B1 bz398057B1 = (Bz398057B1)theEObject;
T result = caseBz398057B1(bz398057B1);
if (result == null)
+ {
result = caseBz398057B(bz398057B1);
+ }
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ397682_P:
@@ -189,7 +215,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz397682P bz397682P = (Bz397682P)theEObject;
T result = caseBz397682P(bz397682P);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
case HibernateTestPackage.BZ397682_C:
@@ -197,7 +225,9 @@ public class HibernateTestSwitch<T> extends Switch<T>
Bz397682C bz397682C = (Bz397682C)theEObject;
T result = caseBz397682C(bz397682C);
if (result == null)
+ {
result = defaultCase(theEObject);
+ }
return result;
}
default:

Back to the top