diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.model3/src/org')
16 files changed, 36 insertions, 30 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java index e70b351190..7b87bac21c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/impl/Model3PackageImpl.java @@ -215,8 +215,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } // Obtain or create and register package - Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl - ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl()); + Object registeredModel3Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Model3PackageImpl theModel3Package = registeredModel3Package instanceof Model3PackageImpl ? (Model3PackageImpl)registeredModel3Package + : new Model3PackageImpl(); isInited = true; @@ -225,9 +226,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package EtypesPackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE - .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) - : SubpackagePackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI); + SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(registeredPackage instanceof SubpackagePackageImpl ? registeredPackage + : SubpackagePackage.eINSTANCE); // Create package meta-data objects theModel3Package.createPackageContents(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java index 09cd83ced5..dcf421ca0e 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithIDAttributeImpl.java @@ -166,7 +166,7 @@ public class ClassWithIDAttributeImpl extends EObjectImpl implements ClassWithID return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (id: "); result.append(id); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java index d1769ca9c8..f43a909ca1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaClassAttributeImpl.java @@ -168,7 +168,7 @@ public class ClassWithJavaClassAttributeImpl extends EObjectImpl implements Clas return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (javaClass: "); result.append(javaClass); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java index b5c4261583..2f10becb4d 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ClassWithJavaObjectAttributeImpl.java @@ -178,7 +178,7 @@ public class ClassWithJavaObjectAttributeImpl extends EObjectImpl implements Cla return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (javaObject: "); result.append(javaObject); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java index e0ccfdaf56..0365ccc72a 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/FileImpl.java @@ -220,7 +220,7 @@ public class FileImpl extends EObjectImpl implements File return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(", data: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java index 36f83e339e..e81833c4b2 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/ImageImpl.java @@ -275,7 +275,7 @@ public class ImageImpl extends EObjectImpl implements Image return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (width: "); result.append(width); result.append(", height: "); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java index c36237e269..d36f655abc 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/Model3PackageImpl.java @@ -215,8 +215,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package } // Obtain or create and register package - Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model3PackageImpl - ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Model3PackageImpl()); + Object registeredModel3Package = EPackage.Registry.INSTANCE.get(eNS_URI); + Model3PackageImpl theModel3Package = registeredModel3Package instanceof Model3PackageImpl ? (Model3PackageImpl)registeredModel3Package + : new Model3PackageImpl(); isInited = true; @@ -225,9 +226,9 @@ public class Model3PackageImpl extends EPackageImpl implements Model3Package EtypesPackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE - .getEPackage(SubpackagePackage.eNS_URI) instanceof SubpackagePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI) - : SubpackagePackage.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(SubpackagePackage.eNS_URI); + SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(registeredPackage instanceof SubpackagePackageImpl ? registeredPackage + : SubpackagePackage.eINSTANCE); // Create package meta-data objects theModel3Package.createPackageContents(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java index 4c4006621f..61674ba6e1 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeAImpl.java @@ -260,7 +260,7 @@ public class NodeAImpl extends EObjectImpl implements NodeA return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java index ccd0585c65..a4fb08fbfd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeBImpl.java @@ -331,7 +331,7 @@ public class NodeBImpl extends EObjectImpl implements NodeB return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java index 5868b80e75..ee8cf33073 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeCImpl.java @@ -412,7 +412,7 @@ public class NodeCImpl extends EObjectImpl implements NodeC return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java index a5a4eb3006..503d0e61cd 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeDImpl.java @@ -486,7 +486,7 @@ public class NodeDImpl extends EObjectImpl implements NodeD return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java index 12a4a92674..f902d90bad 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/NodeEImpl.java @@ -293,7 +293,7 @@ public class NodeEImpl extends EObjectImpl implements NodeE return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (name: "); result.append(name); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java index be87ca6cc7..7dee2ed300 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonImpl.java @@ -152,7 +152,7 @@ public class PolygonImpl extends EObjectImpl implements Polygon return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (points: "); result.append(points); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java index a7769fc2a1..50f07f0056 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/legacy/impl/PolygonWithDuplicatesImpl.java @@ -153,7 +153,7 @@ public class PolygonWithDuplicatesImpl extends EObjectImpl implements PolygonWit return super.toString(); } - StringBuffer result = new StringBuffer(super.toString()); + StringBuilder result = new StringBuilder(super.toString()); result.append(" (points: "); result.append(points); result.append(')'); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java index 10f4abb09e..378155c694 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/impl/SubpackagePackageImpl.java @@ -79,8 +79,10 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac } // Obtain or create and register package - SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl - ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SubpackagePackageImpl()); + Object registeredSubpackagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SubpackagePackageImpl theSubpackagePackage = registeredSubpackagePackage instanceof SubpackagePackageImpl + ? (SubpackagePackageImpl)registeredSubpackagePackage + : new SubpackagePackageImpl(); isInited = true; @@ -89,8 +91,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac EtypesPackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl - ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI); + Model3PackageImpl theModel3Package = (Model3PackageImpl)(registeredPackage instanceof Model3PackageImpl ? registeredPackage : Model3Package.eINSTANCE); // Create package meta-data objects theSubpackagePackage.createPackageContents(); diff --git a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java index 3a13dd1fe9..10f784212c 100644 --- a/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java +++ b/plugins/org.eclipse.emf.cdo.tests.model3/src/org/eclipse/emf/cdo/tests/model3/subpackage/legacy/impl/SubpackagePackageImpl.java @@ -79,8 +79,10 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac } // Obtain or create and register package - SubpackagePackageImpl theSubpackagePackage = (SubpackagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SubpackagePackageImpl - ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SubpackagePackageImpl()); + Object registeredSubpackagePackage = EPackage.Registry.INSTANCE.get(eNS_URI); + SubpackagePackageImpl theSubpackagePackage = registeredSubpackagePackage instanceof SubpackagePackageImpl + ? (SubpackagePackageImpl)registeredSubpackagePackage + : new SubpackagePackageImpl(); isInited = true; @@ -89,8 +91,8 @@ public class SubpackagePackageImpl extends EPackageImpl implements SubpackagePac EtypesPackage.eINSTANCE.eClass(); // Obtain or create and register interdependencies - Model3PackageImpl theModel3Package = (Model3PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) instanceof Model3PackageImpl - ? EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI) : Model3Package.eINSTANCE); + Object registeredPackage = EPackage.Registry.INSTANCE.getEPackage(Model3Package.eNS_URI); + Model3PackageImpl theModel3Package = (Model3PackageImpl)(registeredPackage instanceof Model3PackageImpl ? registeredPackage : Model3Package.eINSTANCE); // Create package meta-data objects theSubpackagePackage.createPackageContents(); |