fixed warnings

4 files changed, 124 insertions, 60 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
index e01573d393..585486f33b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -178,7 +178,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public static model4interfacesPackage init()
   {
     if (isInited)
+    {
       return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
@@ -497,7 +499,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -559,7 +563,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -576,57 +582,55 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Initialize classes and features; add operations and parameters
     initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), this
-        .getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
+        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), this
-        .getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
+        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), this
-        .getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
+        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
         "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), this
-        .getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
+        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), this
-        .getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
+        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), this
-        .getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
+        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), this
-        .getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
+        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), this
-        .getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
+        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -640,26 +644,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null,
-        0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
+        1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element",
-        null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null,
+        0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
+        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
+        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
index f033e9d2ac..87a9560533 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/legacy/model4interfaces/util/model4interfacesSwitch.java
@@ -110,7 +110,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
       T result = caseISingleRefContainer(iSingleRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -118,7 +120,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
       T result = caseISingleRefContainedElement(iSingleRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -126,7 +130,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
       T result = caseISingleRefNonContainer(iSingleRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -134,7 +140,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
       T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -142,7 +150,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
       T result = caseIMultiRefContainer(iMultiRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -150,7 +160,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
       T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -158,7 +170,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
       T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -166,7 +180,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
       T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.INAMED_ELEMENT:
@@ -174,7 +190,9 @@ public class model4interfacesSwitch<T>
       INamedElement iNamedElement = (INamedElement)theEObject;
       T result = caseINamedElement(iNamedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -182,7 +200,9 @@ public class model4interfacesSwitch<T>
       IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
       T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -190,7 +210,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
       T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -198,7 +220,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
       T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -206,7 +230,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
       T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -214,7 +240,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
       T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
index ba4e5a0beb..f4cea2a354 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/impl/model4interfacesPackageImpl.java
@@ -178,7 +178,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public static model4interfacesPackage init()
   {
     if (isInited)
+    {
       return (model4interfacesPackage)EPackage.Registry.INSTANCE.getEPackage(model4interfacesPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     model4interfacesPackageImpl themodel4interfacesPackage = (model4interfacesPackageImpl)(EPackage.Registry.INSTANCE
@@ -497,7 +499,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -559,7 +563,9 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -576,57 +582,55 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
     // Initialize classes and features; add operations and parameters
     initEClass(iSingleRefContainerEClass, ISingleRefContainer.class, "ISingleRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainer_Element(), this.getISingleRefContainedElement(), this
-        .getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefContainer_Element(), getISingleRefContainedElement(),
+        getISingleRefContainedElement_Parent(), "element", null, 0, 1, ISingleRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefContainedElementEClass, ISingleRefContainedElement.class, "ISingleRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainedElement_Parent(), this.getISingleRefContainer(), this
-        .getISingleRefContainer_Element(), "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getISingleRefContainedElement_Parent(), getISingleRefContainer(), getISingleRefContainer_Element(),
+        "parent", null, 0, 1, ISingleRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerEClass, ISingleRefNonContainer.class, "ISingleRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainer_Element(), this.getISingleRefNonContainedElement(), this
-        .getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
+    initEReference(getISingleRefNonContainer_Element(), getISingleRefNonContainedElement(),
+        getISingleRefNonContainedElement_Parent(), "element", null, 0, 1, ISingleRefNonContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iSingleRefNonContainedElementEClass, ISingleRefNonContainedElement.class,
         "ISingleRefNonContainedElement", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainedElement_Parent(), this.getISingleRefNonContainer(), this
-        .getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getISingleRefNonContainedElement_Parent(), getISingleRefNonContainer(),
+        getISingleRefNonContainer_Element(), "parent", null, 0, 1, ISingleRefNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainerEClass, IMultiRefContainer.class, "IMultiRefContainer", IS_ABSTRACT, IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainer_Elements(), this.getIMultiRefContainedElement(), this
-        .getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefContainer_Elements(), getIMultiRefContainedElement(),
+        getIMultiRefContainedElement_Parent(), "elements", null, 0, -1, IMultiRefContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefContainedElementEClass, IMultiRefContainedElement.class, "IMultiRefContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainedElement_Parent(), this.getIMultiRefContainer(), this
-        .getIMultiRefContainer_Elements(), "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT,
-        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-        IS_ORDERED);
+    initEReference(getIMultiRefContainedElement_Parent(), getIMultiRefContainer(), getIMultiRefContainer_Elements(),
+        "parent", null, 0, 1, IMultiRefContainedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+        !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerEClass, IMultiRefNonContainer.class, "IMultiRefNonContainer", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainer_Elements(), this.getIMultiRefNonContainedElement(), this
-        .getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefNonContainer_Elements(), getIMultiRefNonContainedElement(),
+        getIMultiRefNonContainedElement_Parent(), "elements", null, 0, -1, IMultiRefNonContainer.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
     initEClass(iMultiRefNonContainedElementEClass, IMultiRefNonContainedElement.class, "IMultiRefNonContainedElement",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainedElement_Parent(), this.getIMultiRefNonContainer(), this
-        .getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
+    initEReference(getIMultiRefNonContainedElement_Parent(), getIMultiRefNonContainer(),
+        getIMultiRefNonContainer_Elements(), "parent", null, 0, 1, IMultiRefNonContainedElement.class, !IS_TRANSIENT,
         !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
         IS_ORDERED);
 
@@ -640,26 +644,26 @@ public class model4interfacesPackageImpl extends EPackageImpl implements model4i
 
     initEClass(iSingleRefContainerNPLEClass, ISingleRefContainerNPL.class, "ISingleRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element", null,
-        0, 1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getISingleRefContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null, 0,
+        1, ISingleRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iSingleRefNonContainerNPLEClass, ISingleRefNonContainerNPL.class, "ISingleRefNonContainerNPL",
         IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getISingleRefNonContainerNPL_Element(), this.getIContainedElementNoParentLink(), null, "element",
-        null, 0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getISingleRefNonContainerNPL_Element(), getIContainedElementNoParentLink(), null, "element", null,
+        0, 1, ISingleRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefContainerNPLEClass, IMultiRefContainerNPL.class, "IMultiRefContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-        !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getIMultiRefContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null, 0,
+        -1, IMultiRefContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(iMultiRefNonContainerNPLEClass, IMultiRefNonContainerNPL.class, "IMultiRefNonContainerNPL", IS_ABSTRACT,
         IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getIMultiRefNonContainerNPL_Elements(), this.getIContainedElementNoParentLink(), null, "elements",
-        null, 0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+    initEReference(getIMultiRefNonContainerNPL_Elements(), getIContainedElementNoParentLink(), null, "elements", null,
+        0, -1, IMultiRefNonContainerNPL.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     // Create resource
diff --git a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
index 0ce686ad3f..4c83511145 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model4interfaces/src/org/eclipse/emf/cdo/tests/model4interfaces/util/model4interfacesSwitch.java
@@ -110,7 +110,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainer iSingleRefContainer = (ISingleRefContainer)theEObject;
       T result = caseISingleRefContainer(iSingleRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINED_ELEMENT:
@@ -118,7 +120,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainedElement iSingleRefContainedElement = (ISingleRefContainedElement)theEObject;
       T result = caseISingleRefContainedElement(iSingleRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER:
@@ -126,7 +130,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainer iSingleRefNonContainer = (ISingleRefNonContainer)theEObject;
       T result = caseISingleRefNonContainer(iSingleRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINED_ELEMENT:
@@ -134,7 +140,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainedElement iSingleRefNonContainedElement = (ISingleRefNonContainedElement)theEObject;
       T result = caseISingleRefNonContainedElement(iSingleRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER:
@@ -142,7 +150,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainer iMultiRefContainer = (IMultiRefContainer)theEObject;
       T result = caseIMultiRefContainer(iMultiRefContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINED_ELEMENT:
@@ -150,7 +160,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainedElement iMultiRefContainedElement = (IMultiRefContainedElement)theEObject;
       T result = caseIMultiRefContainedElement(iMultiRefContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER:
@@ -158,7 +170,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainer iMultiRefNonContainer = (IMultiRefNonContainer)theEObject;
       T result = caseIMultiRefNonContainer(iMultiRefNonContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINED_ELEMENT:
@@ -166,7 +180,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainedElement iMultiRefNonContainedElement = (IMultiRefNonContainedElement)theEObject;
       T result = caseIMultiRefNonContainedElement(iMultiRefNonContainedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.INAMED_ELEMENT:
@@ -174,7 +190,9 @@ public class model4interfacesSwitch<T>
       INamedElement iNamedElement = (INamedElement)theEObject;
       T result = caseINamedElement(iNamedElement);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ICONTAINED_ELEMENT_NO_PARENT_LINK:
@@ -182,7 +200,9 @@ public class model4interfacesSwitch<T>
       IContainedElementNoParentLink iContainedElementNoParentLink = (IContainedElementNoParentLink)theEObject;
       T result = caseIContainedElementNoParentLink(iContainedElementNoParentLink);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_CONTAINER_NPL:
@@ -190,7 +210,9 @@ public class model4interfacesSwitch<T>
       ISingleRefContainerNPL iSingleRefContainerNPL = (ISingleRefContainerNPL)theEObject;
       T result = caseISingleRefContainerNPL(iSingleRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.ISINGLE_REF_NON_CONTAINER_NPL:
@@ -198,7 +220,9 @@ public class model4interfacesSwitch<T>
       ISingleRefNonContainerNPL iSingleRefNonContainerNPL = (ISingleRefNonContainerNPL)theEObject;
       T result = caseISingleRefNonContainerNPL(iSingleRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_CONTAINER_NPL:
@@ -206,7 +230,9 @@ public class model4interfacesSwitch<T>
       IMultiRefContainerNPL iMultiRefContainerNPL = (IMultiRefContainerNPL)theEObject;
       T result = caseIMultiRefContainerNPL(iMultiRefContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case model4interfacesPackage.IMULTI_REF_NON_CONTAINER_NPL:
@@ -214,7 +240,9 @@ public class model4interfacesSwitch<T>
       IMultiRefNonContainerNPL iMultiRefNonContainerNPL = (IMultiRefNonContainerNPL)theEObject;
       T result = caseIMultiRefNonContainerNPL(iMultiRefNonContainerNPL);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default: