fixed warnings

15 files changed, 96 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
index 1bbda6a305..5bce3dc272 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfBooleanImpl.java
@@ -163,7 +163,9 @@ public class GenListOfBooleanImpl extends EObjectImpl implements GenListOfBoolea
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
index b4d7726ea1..ef363edd8a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfCharImpl.java
@@ -163,7 +163,9 @@ public class GenListOfCharImpl extends EObjectImpl implements GenListOfChar
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
index 3869b7d6aa..9a975bb6e8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDateImpl.java
@@ -164,7 +164,9 @@ public class GenListOfDateImpl extends EObjectImpl implements GenListOfDate
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
index 74971fdb55..37b965402a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfDoubleImpl.java
@@ -163,7 +163,9 @@ public class GenListOfDoubleImpl extends EObjectImpl implements GenListOfDouble
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
index a8f7b5823b..8fedcc89cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfFloatImpl.java
@@ -163,7 +163,9 @@ public class GenListOfFloatImpl extends EObjectImpl implements GenListOfFloat
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
index c5f5bb29ac..e3dc5a9ea6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntImpl.java
@@ -163,7 +163,9 @@ public class GenListOfIntImpl extends EObjectImpl implements GenListOfInt
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
index c1c56c9562..6c5c329139 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfIntegerImpl.java
@@ -163,7 +163,9 @@ public class GenListOfIntegerImpl extends EObjectImpl implements GenListOfIntege
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
index 30f78761e4..1fb6f8c817 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfLongImpl.java
@@ -163,7 +163,9 @@ public class GenListOfLongImpl extends EObjectImpl implements GenListOfLong
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
index 12499fb882..3ab8cf5b29 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfShortImpl.java
@@ -163,7 +163,9 @@ public class GenListOfShortImpl extends EObjectImpl implements GenListOfShort
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
index 66502cb903..d1c75a7edb 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/GenListOfStringImpl.java
@@ -163,7 +163,9 @@ public class GenListOfStringImpl extends EObjectImpl implements GenListOfString
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (elements: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
index 300006949f..0a671ec253 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/Model5PackageImpl.java
@@ -177,7 +177,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public static Model5Package init()
   {
     if (isInited)
+    {
       return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI);
+    }
 
     // Obtain or create and register package
     Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE
@@ -486,7 +488,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -546,7 +550,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -563,10 +569,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Initialize classes and features; add operations and parameters
     initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1,
-        TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
+    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class,
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
index 7cb052acc5..970cb927e5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/impl/TestFeatureMapImpl.java
@@ -178,7 +178,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
       return getDoctors();
     case Model5Package.TEST_FEATURE_MAP__PEOPLE:
       if (coreType)
+      {
         return getPeople();
+      }
       return ((FeatureMap.Internal)getPeople()).getWrapper();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -262,7 +264,9 @@ public class TestFeatureMapImpl extends EObjectImpl implements TestFeatureMap
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (people: ");
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
index 9543d141c8..d2d594d41c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/legacy/model5/util/Model5Switch.java
@@ -116,7 +116,9 @@ public class Model5Switch<T>
       TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
       T result = caseTestFeatureMap(testFeatureMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.MANAGER:
@@ -124,7 +126,9 @@ public class Model5Switch<T>
       Manager manager = (Manager)theEObject;
       T result = caseManager(manager);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.DOCTOR:
@@ -132,7 +136,9 @@ public class Model5Switch<T>
       Doctor doctor = (Doctor)theEObject;
       T result = caseDoctor(doctor);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_STRING:
@@ -140,7 +146,9 @@ public class Model5Switch<T>
       GenListOfString genListOfString = (GenListOfString)theEObject;
       T result = caseGenListOfString(genListOfString);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT:
@@ -148,7 +156,9 @@ public class Model5Switch<T>
       GenListOfInt genListOfInt = (GenListOfInt)theEObject;
       T result = caseGenListOfInt(genListOfInt);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INTEGER:
@@ -156,7 +166,9 @@ public class Model5Switch<T>
       GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
       T result = caseGenListOfInteger(genListOfInteger);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_LONG:
@@ -164,7 +176,9 @@ public class Model5Switch<T>
       GenListOfLong genListOfLong = (GenListOfLong)theEObject;
       T result = caseGenListOfLong(genListOfLong);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_BOOLEAN:
@@ -172,7 +186,9 @@ public class Model5Switch<T>
       GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
       T result = caseGenListOfBoolean(genListOfBoolean);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_SHORT:
@@ -180,7 +196,9 @@ public class Model5Switch<T>
       GenListOfShort genListOfShort = (GenListOfShort)theEObject;
       T result = caseGenListOfShort(genListOfShort);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_FLOAT:
@@ -188,7 +206,9 @@ public class Model5Switch<T>
       GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
       T result = caseGenListOfFloat(genListOfFloat);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DOUBLE:
@@ -196,7 +216,9 @@ public class Model5Switch<T>
       GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
       T result = caseGenListOfDouble(genListOfDouble);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DATE:
@@ -204,7 +226,9 @@ public class Model5Switch<T>
       GenListOfDate genListOfDate = (GenListOfDate)theEObject;
       T result = caseGenListOfDate(genListOfDate);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_CHAR:
@@ -212,7 +236,9 @@ public class Model5Switch<T>
       GenListOfChar genListOfChar = (GenListOfChar)theEObject;
       T result = caseGenListOfChar(genListOfChar);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default:
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
index 1f907dd3ed..18572cb45b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/impl/Model5PackageImpl.java
@@ -177,7 +177,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public static Model5Package init()
   {
     if (isInited)
+    {
       return (Model5Package)EPackage.Registry.INSTANCE.getEPackage(Model5Package.eNS_URI);
+    }
 
     // Obtain or create and register package
     Model5PackageImpl theModel5Package = (Model5PackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Model5PackageImpl ? EPackage.Registry.INSTANCE
@@ -486,7 +488,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -546,7 +550,9 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -563,10 +569,10 @@ public class Model5PackageImpl extends EPackageImpl implements Model5Package
     // Initialize classes and features; add operations and parameters
     initEClass(testFeatureMapEClass, TestFeatureMap.class, "TestFeatureMap", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTestFeatureMap_Managers(), this.getManager(), null, "managers", null, 0, -1,
-        TestFeatureMap.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTestFeatureMap_Doctors(), this.getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
+    initEReference(getTestFeatureMap_Managers(), getManager(), null, "managers", null, 0, -1, TestFeatureMap.class,
+        IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+        !IS_DERIVED, IS_ORDERED);
+    initEReference(getTestFeatureMap_Doctors(), getDoctor(), null, "doctors", null, 0, -1, TestFeatureMap.class,
         IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTestFeatureMap_People(), ecorePackage.getEFeatureMapEntry(), "people", null, 0, -1,
diff --git a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
index 6069a3dc8f..802b101ff3 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model5/src/org/eclipse/emf/cdo/tests/model5/util/Model5Switch.java
@@ -116,7 +116,9 @@ public class Model5Switch<T>
       TestFeatureMap testFeatureMap = (TestFeatureMap)theEObject;
       T result = caseTestFeatureMap(testFeatureMap);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.MANAGER:
@@ -124,7 +126,9 @@ public class Model5Switch<T>
       Manager manager = (Manager)theEObject;
       T result = caseManager(manager);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.DOCTOR:
@@ -132,7 +136,9 @@ public class Model5Switch<T>
       Doctor doctor = (Doctor)theEObject;
       T result = caseDoctor(doctor);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_STRING:
@@ -140,7 +146,9 @@ public class Model5Switch<T>
       GenListOfString genListOfString = (GenListOfString)theEObject;
       T result = caseGenListOfString(genListOfString);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INT:
@@ -148,7 +156,9 @@ public class Model5Switch<T>
       GenListOfInt genListOfInt = (GenListOfInt)theEObject;
       T result = caseGenListOfInt(genListOfInt);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_INTEGER:
@@ -156,7 +166,9 @@ public class Model5Switch<T>
       GenListOfInteger genListOfInteger = (GenListOfInteger)theEObject;
       T result = caseGenListOfInteger(genListOfInteger);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_LONG:
@@ -164,7 +176,9 @@ public class Model5Switch<T>
       GenListOfLong genListOfLong = (GenListOfLong)theEObject;
       T result = caseGenListOfLong(genListOfLong);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_BOOLEAN:
@@ -172,7 +186,9 @@ public class Model5Switch<T>
       GenListOfBoolean genListOfBoolean = (GenListOfBoolean)theEObject;
       T result = caseGenListOfBoolean(genListOfBoolean);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_SHORT:
@@ -180,7 +196,9 @@ public class Model5Switch<T>
       GenListOfShort genListOfShort = (GenListOfShort)theEObject;
       T result = caseGenListOfShort(genListOfShort);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_FLOAT:
@@ -188,7 +206,9 @@ public class Model5Switch<T>
       GenListOfFloat genListOfFloat = (GenListOfFloat)theEObject;
       T result = caseGenListOfFloat(genListOfFloat);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DOUBLE:
@@ -196,7 +216,9 @@ public class Model5Switch<T>
       GenListOfDouble genListOfDouble = (GenListOfDouble)theEObject;
       T result = caseGenListOfDouble(genListOfDouble);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_DATE:
@@ -204,7 +226,9 @@ public class Model5Switch<T>
       GenListOfDate genListOfDate = (GenListOfDate)theEObject;
       T result = caseGenListOfDate(genListOfDate);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Model5Package.GEN_LIST_OF_CHAR:
@@ -212,7 +236,9 @@ public class Model5Switch<T>
       GenListOfChar genListOfChar = (GenListOfChar)theEObject;
       T result = caseGenListOfChar(genListOfChar);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default: