formatting

3 files changed, 251 insertions, 115 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java
index a3f7d9a20b..f9254d26e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4FactoryImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: model4FactoryImpl.java,v 1.2 2008-07-10 15:57:40 estepper Exp $
+ * $Id: model4FactoryImpl.java,v 1.3 2008-08-11 05:11:45 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model4.impl;
 
@@ -96,65 +96,65 @@ public class model4FactoryImpl extends EFactoryImpl implements model4Factory
     switch (eClass.getClassifierID())
     {
     case model4Package.REF_SINGLE_CONTAINED:
-      return (EObject)createRefSingleContained();
+      return createRefSingleContained();
     case model4Package.SINGLE_CONTAINED_ELEMENT:
-      return (EObject)createSingleContainedElement();
+      return createSingleContainedElement();
     case model4Package.REF_SINGLE_NON_CONTAINED:
-      return (EObject)createRefSingleNonContained();
+      return createRefSingleNonContained();
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
-      return (EObject)createSingleNonContainedElement();
+      return createSingleNonContainedElement();
     case model4Package.REF_MULTI_CONTAINED:
-      return (EObject)createRefMultiContained();
+      return createRefMultiContained();
     case model4Package.MULTI_CONTAINED_ELEMENT:
-      return (EObject)createMultiContainedElement();
+      return createMultiContainedElement();
     case model4Package.REF_MULTI_NON_CONTAINED:
-      return (EObject)createRefMultiNonContained();
+      return createRefMultiNonContained();
     case model4Package.MULTI_NON_CONTAINED_ELEMENT:
-      return (EObject)createMultiNonContainedElement();
+      return createMultiNonContainedElement();
     case model4Package.REF_SINGLE_CONTAINED_NPL:
-      return (EObject)createRefSingleContainedNPL();
+      return createRefSingleContainedNPL();
     case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
-      return (EObject)createRefSingleNonContainedNPL();
+      return createRefSingleNonContainedNPL();
     case model4Package.REF_MULTI_CONTAINED_NPL:
-      return (EObject)createRefMultiContainedNPL();
+      return createRefMultiContainedNPL();
     case model4Package.REF_MULTI_NON_CONTAINED_NPL:
-      return (EObject)createRefMultiNonContainedNPL();
+      return createRefMultiNonContainedNPL();
     case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
-      return (EObject)createContainedElementNoOpposite();
+      return createContainedElementNoOpposite();
     case model4Package.GEN_REF_SINGLE_CONTAINED:
-      return (EObject)createGenRefSingleContained();
+      return createGenRefSingleContained();
     case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
-      return (EObject)createGenRefSingleNonContained();
+      return createGenRefSingleNonContained();
     case model4Package.GEN_REF_MULTI_CONTAINED:
-      return (EObject)createGenRefMultiContained();
+      return createGenRefMultiContained();
     case model4Package.GEN_REF_MULTI_NON_CONTAINED:
-      return (EObject)createGenRefMultiNonContained();
+      return createGenRefMultiNonContained();
     case model4Package.IMPL_SINGLE_REF_CONTAINER:
-      return (EObject)createImplSingleRefContainer();
+      return createImplSingleRefContainer();
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
-      return (EObject)createImplSingleRefContainedElement();
+      return createImplSingleRefContainedElement();
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
-      return (EObject)createImplSingleRefNonContainer();
+      return createImplSingleRefNonContainer();
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
-      return (EObject)createImplSingleRefNonContainedElement();
+      return createImplSingleRefNonContainedElement();
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
-      return (EObject)createImplMultiRefNonContainer();
+      return createImplMultiRefNonContainer();
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
-      return (EObject)createImplMultiRefNonContainedElement();
+      return createImplMultiRefNonContainedElement();
     case model4Package.IMPL_MULTI_REF_CONTAINER:
-      return (EObject)createImplMultiRefContainer();
+      return createImplMultiRefContainer();
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
-      return (EObject)createImplMultiRefContainedElement();
+      return createImplMultiRefContainedElement();
     case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
-      return (EObject)createImplSingleRefContainerNPL();
+      return createImplSingleRefContainerNPL();
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
-      return (EObject)createImplSingleRefNonContainerNPL();
+      return createImplSingleRefNonContainerNPL();
     case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
-      return (EObject)createImplMultiRefContainerNPL();
+      return createImplMultiRefContainerNPL();
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
-      return (EObject)createImplMultiRefNonContainerNPL();
+      return createImplMultiRefNonContainerNPL();
     case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
-      return (EObject)createImplContainedElementNPL();
+      return createImplContainedElementNPL();
     default:
       throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
     }
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
index 921c872db3..396c891cdd 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/impl/model4PackageImpl.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: model4PackageImpl.java,v 1.2 2008-07-10 15:57:40 estepper Exp $
+ * $Id: model4PackageImpl.java,v 1.3 2008-08-11 05:11:44 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model4.impl;
 
@@ -308,7 +308,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    */
   public static model4Package init()
   {
-    if (isInited) return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI);
+    if (isInited)
+    {
+      return (model4Package)EPackage.Registry.INSTANCE.getEPackage(model4Package.eNS_URI);
+    }
 
     // Obtain or create and register package
     model4PackageImpl themodel4Package = (model4PackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof model4PackageImpl ? EPackage.Registry.INSTANCE
@@ -907,7 +910,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    */
   public void createPackageContents()
   {
-    if (isCreated) return;
+    if (isCreated)
+    {
+      return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -1012,7 +1018,10 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
    */
   public void initializePackageContents()
   {
-    if (isInitialized) return;
+    if (isInitialized)
+    {
+      return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -1050,25 +1059,23 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     // Initialize classes and features; add operations and parameters
     initEClass(refSingleContainedEClass, RefSingleContained.class, "RefSingleContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContained_Element(), this.getSingleContainedElement(), this
-        .getSingleContainedElement_Parent(), "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefSingleContained_Element(), getSingleContainedElement(), getSingleContainedElement_Parent(),
+        "element", null, 0, 1, RefSingleContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(singleContainedElementEClass, SingleContainedElement.class, "SingleContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getSingleContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleContainedElement_Parent(), this.getRefSingleContained(), this
-        .getRefSingleContained_Element(), "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getSingleContainedElement_Parent(), getRefSingleContained(), getRefSingleContained_Element(),
+        "parent", null, 0, 1, SingleContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleNonContainedEClass, RefSingleNonContained.class, "RefSingleNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContained_Element(), this.getSingleNonContainedElement(), this
-        .getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefSingleNonContained_Element(), getSingleNonContainedElement(),
+        getSingleNonContainedElement_Parent(), "element", null, 0, 1, RefSingleNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1077,32 +1084,30 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEAttribute(getSingleNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         SingleNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getSingleNonContainedElement_Parent(), this.getRefSingleNonContained(), this
-        .getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getSingleNonContainedElement_Parent(), getRefSingleNonContained(),
+        getRefSingleNonContained_Element(), "parent", null, 0, 1, SingleNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(refMultiContainedEClass, RefMultiContained.class, "RefMultiContained", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContained_Elements(), this.getMultiContainedElement(), this
-        .getMultiContainedElement_Parent(), "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getRefMultiContained_Elements(), getMultiContainedElement(), getMultiContainedElement_Parent(),
+        "elements", null, 0, -1, RefMultiContained.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(multiContainedElementEClass, MultiContainedElement.class, "MultiContainedElement", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getMultiContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiContainedElement_Parent(), this.getRefMultiContained(),
-        this.getRefMultiContained_Elements(), "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiContainedElement_Parent(), getRefMultiContained(), getRefMultiContained_Elements(),
+        "parent", null, 0, 1, MultiContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedEClass, RefMultiNonContained.class, "RefMultiNonContained", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContained_Elements(), this.getMultiNonContainedElement(), this
-        .getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
+    initEReference(getRefMultiNonContained_Elements(), getMultiNonContainedElement(),
+        getMultiNonContainedElement_Parent(), "elements", null, 0, -1, RefMultiNonContained.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -1111,33 +1116,32 @@ public class model4PackageImpl extends EPackageImpl implements model4Package
     initEAttribute(getMultiNonContainedElement_Name(), ecorePackage.getEString(), "name", null, 0, 1,
         MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getMultiNonContainedElement_Parent(), this.getRefMultiNonContained(), this
-        .getRefMultiNonContained_Elements(), "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getMultiNonContainedElement_Parent(), getRefMultiNonContained(), getRefMultiNonContained_Elements(),
+        "parent", null, 0, 1, MultiNonContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleContainedNPLEClass, RefSingleContainedNPL.class, "RefSingleContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null, 0,
-        1, RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefSingleContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refSingleNonContainedNPLEClass, RefSingleNonContainedNPL.class, "RefSingleNonContainedNPL",
         !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefSingleNonContainedNPL_Element(), this.getContainedElementNoOpposite(), null, "element", null,
-        0, 1, RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-        IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getRefSingleNonContainedNPL_Element(), getContainedElementNoOpposite(), null, "element", null, 0, 1,
+        RefSingleNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiContainedNPLEClass, RefMultiContainedNPL.class, "RefMultiContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null, 0,
-        -1, RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+    initEReference(getRefMultiContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0, -1,
+        RefMultiContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(refMultiNonContainedNPLEClass, RefMultiNonContainedNPL.class, "RefMultiNonContainedNPL", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getRefMultiNonContainedNPL_Elements(), this.getContainedElementNoOpposite(), null, "elements", null,
-        0, -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getRefMultiNonContainedNPL_Elements(), getContainedElementNoOpposite(), null, "elements", null, 0,
+        -1, RefMultiNonContainedNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(containedElementNoOppositeEClass, ContainedElementNoOpposite.class, "ContainedElementNoOpposite",
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
index 0b2024f9e0..8b3a6e39a1 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4/src/org/eclipse/emf/cdo/tests/model4/util/model4Switch.java
@@ -2,7 +2,7 @@
  * <copyright>
  * </copyright>
  *
- * $Id: model4Switch.java,v 1.2 2008-07-10 15:57:41 estepper Exp $
+ * $Id: model4Switch.java,v 1.3 2008-08-11 05:11:44 estepper Exp $
  */
 package org.eclipse.emf.cdo.tests.model4.util;
 
@@ -135,224 +135,356 @@ public class model4Switch<T>
     {
       RefSingleContained refSingleContained = (RefSingleContained)theEObject;
       T result = caseRefSingleContained(refSingleContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_CONTAINED_ELEMENT:
     {
       SingleContainedElement singleContainedElement = (SingleContainedElement)theEObject;
       T result = caseSingleContainedElement(singleContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED:
     {
       RefSingleNonContained refSingleNonContained = (RefSingleNonContained)theEObject;
       T result = caseRefSingleNonContained(refSingleNonContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.SINGLE_NON_CONTAINED_ELEMENT:
     {
       SingleNonContainedElement singleNonContainedElement = (SingleNonContainedElement)theEObject;
       T result = caseSingleNonContainedElement(singleNonContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED:
     {
       RefMultiContained refMultiContained = (RefMultiContained)theEObject;
       T result = caseRefMultiContained(refMultiContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_CONTAINED_ELEMENT:
     {
       MultiContainedElement multiContainedElement = (MultiContainedElement)theEObject;
       T result = caseMultiContainedElement(multiContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED:
     {
       RefMultiNonContained refMultiNonContained = (RefMultiNonContained)theEObject;
       T result = caseRefMultiNonContained(refMultiNonContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.MULTI_NON_CONTAINED_ELEMENT:
     {
       MultiNonContainedElement multiNonContainedElement = (MultiNonContainedElement)theEObject;
       T result = caseMultiNonContainedElement(multiNonContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_CONTAINED_NPL:
     {
       RefSingleContainedNPL refSingleContainedNPL = (RefSingleContainedNPL)theEObject;
       T result = caseRefSingleContainedNPL(refSingleContainedNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_SINGLE_NON_CONTAINED_NPL:
     {
       RefSingleNonContainedNPL refSingleNonContainedNPL = (RefSingleNonContainedNPL)theEObject;
       T result = caseRefSingleNonContainedNPL(refSingleNonContainedNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_CONTAINED_NPL:
     {
       RefMultiContainedNPL refMultiContainedNPL = (RefMultiContainedNPL)theEObject;
       T result = caseRefMultiContainedNPL(refMultiContainedNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.REF_MULTI_NON_CONTAINED_NPL:
     {
       RefMultiNonContainedNPL refMultiNonContainedNPL = (RefMultiNonContainedNPL)theEObject;
       T result = caseRefMultiNonContainedNPL(refMultiNonContainedNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.CONTAINED_ELEMENT_NO_OPPOSITE:
     {
       ContainedElementNoOpposite containedElementNoOpposite = (ContainedElementNoOpposite)theEObject;
       T result = caseContainedElementNoOpposite(containedElementNoOpposite);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_CONTAINED:
     {
       GenRefSingleContained genRefSingleContained = (GenRefSingleContained)theEObject;
       T result = caseGenRefSingleContained(genRefSingleContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_SINGLE_NON_CONTAINED:
     {
       GenRefSingleNonContained genRefSingleNonContained = (GenRefSingleNonContained)theEObject;
       T result = caseGenRefSingleNonContained(genRefSingleNonContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_CONTAINED:
     {
       GenRefMultiContained genRefMultiContained = (GenRefMultiContained)theEObject;
       T result = caseGenRefMultiContained(genRefMultiContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.GEN_REF_MULTI_NON_CONTAINED:
     {
       GenRefMultiNonContained genRefMultiNonContained = (GenRefMultiNonContained)theEObject;
       T result = caseGenRefMultiNonContained(genRefMultiNonContained);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER:
     {
       ImplSingleRefContainer implSingleRefContainer = (ImplSingleRefContainer)theEObject;
       T result = caseImplSingleRefContainer(implSingleRefContainer);
-      if (result == null) result = caseISingleRefContainer(implSingleRefContainer);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefContainer(implSingleRefContainer);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINED_ELEMENT:
     {
       ImplSingleRefContainedElement implSingleRefContainedElement = (ImplSingleRefContainedElement)theEObject;
       T result = caseImplSingleRefContainedElement(implSingleRefContainedElement);
-      if (result == null) result = caseISingleRefContainedElement(implSingleRefContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefContainedElement(implSingleRefContainedElement);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER:
     {
       ImplSingleRefNonContainer implSingleRefNonContainer = (ImplSingleRefNonContainer)theEObject;
       T result = caseImplSingleRefNonContainer(implSingleRefNonContainer);
-      if (result == null) result = caseISingleRefNonContainer(implSingleRefNonContainer);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefNonContainer(implSingleRefNonContainer);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINED_ELEMENT:
     {
       ImplSingleRefNonContainedElement implSingleRefNonContainedElement = (ImplSingleRefNonContainedElement)theEObject;
       T result = caseImplSingleRefNonContainedElement(implSingleRefNonContainedElement);
-      if (result == null) result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefNonContainedElement(implSingleRefNonContainedElement);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER:
     {
       ImplMultiRefNonContainer implMultiRefNonContainer = (ImplMultiRefNonContainer)theEObject;
       T result = caseImplMultiRefNonContainer(implMultiRefNonContainer);
-      if (result == null) result = caseIMultiRefNonContainer(implMultiRefNonContainer);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefNonContainer(implMultiRefNonContainer);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINED_ELEMENT:
     {
       ImplMultiRefNonContainedElement implMultiRefNonContainedElement = (ImplMultiRefNonContainedElement)theEObject;
       T result = caseImplMultiRefNonContainedElement(implMultiRefNonContainedElement);
-      if (result == null) result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefNonContainedElement(implMultiRefNonContainedElement);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER:
     {
       ImplMultiRefContainer implMultiRefContainer = (ImplMultiRefContainer)theEObject;
       T result = caseImplMultiRefContainer(implMultiRefContainer);
-      if (result == null) result = caseIMultiRefContainer(implMultiRefContainer);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefContainer(implMultiRefContainer);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINED_ELEMENT:
     {
       ImplMultiRefContainedElement implMultiRefContainedElement = (ImplMultiRefContainedElement)theEObject;
       T result = caseImplMultiRefContainedElement(implMultiRefContainedElement);
-      if (result == null) result = caseIMultiRefContainedElement(implMultiRefContainedElement);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefContainedElement(implMultiRefContainedElement);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_CONTAINER_NPL:
     {
       ImplSingleRefContainerNPL implSingleRefContainerNPL = (ImplSingleRefContainerNPL)theEObject;
       T result = caseImplSingleRefContainerNPL(implSingleRefContainerNPL);
-      if (result == null) result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefContainerNPL(implSingleRefContainerNPL);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_SINGLE_REF_NON_CONTAINER_NPL:
     {
       ImplSingleRefNonContainerNPL implSingleRefNonContainerNPL = (ImplSingleRefNonContainerNPL)theEObject;
       T result = caseImplSingleRefNonContainerNPL(implSingleRefNonContainerNPL);
-      if (result == null) result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseISingleRefNonContainerNPL(implSingleRefNonContainerNPL);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_CONTAINER_NPL:
     {
       ImplMultiRefContainerNPL implMultiRefContainerNPL = (ImplMultiRefContainerNPL)theEObject;
       T result = caseImplMultiRefContainerNPL(implMultiRefContainerNPL);
-      if (result == null) result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefContainerNPL(implMultiRefContainerNPL);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_MULTI_REF_NON_CONTAINER_NPL:
     {
       ImplMultiRefNonContainerNPL implMultiRefNonContainerNPL = (ImplMultiRefNonContainerNPL)theEObject;
       T result = caseImplMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
-      if (result == null) result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIMultiRefNonContainerNPL(implMultiRefNonContainerNPL);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4Package.IMPL_CONTAINED_ELEMENT_NPL:
     {
       ImplContainedElementNPL implContainedElementNPL = (ImplContainedElementNPL)theEObject;
       T result = caseImplContainedElementNPL(implContainedElementNPL);
-      if (result == null) result = caseIContainedElementNoParentLink(implContainedElementNPL);
-      if (result == null) result = caseINamedElement(implContainedElementNPL);
-      if (result == null) result = defaultCase(theEObject);
+      if (result == null)
+      {
+        result = caseIContainedElementNoParentLink(implContainedElementNPL);
+      }
+      if (result == null)
+      {
+        result = caseINamedElement(implContainedElementNPL);
+      }
+      if (result == null)
+      {
+        result = defaultCase(theEObject);
+      }
       return result;
     }
     default: