fixed warnings

11 files changed, 172 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
index 690dab3aa0..b6a76638d4 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOAuditDefImpl.java
@@ -97,8 +97,10 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
     Date oldTimeStamp = timeStamp;
     timeStamp = newTimeStamp;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_AUDIT_DEF__TIME_STAMP, oldTimeStamp,
           timeStamp));
+    }
   }
 
   /**
@@ -176,7 +178,9 @@ public class CDOAuditDefImpl extends CDOViewDefImpl implements CDOAuditDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (timeStamp: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
index fb3849c36f..15ddbb388f 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsFactoryImpl.java
@@ -289,8 +289,10 @@ public class CDODefsFactoryImpl extends EFactoryImpl implements CDODefsFactory
   {
     ResourceMode result = ResourceMode.get(initialValue);
     if (result == null)
+    {
       throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '"
           + eDataType.getName() + "'");
+    }
     return result;
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
index c4dc0567d0..e9b64f5a1e 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDODefsPackageImpl.java
@@ -191,7 +191,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public static CDODefsPackage init()
   {
     if (isInited)
+    {
       return (CDODefsPackage)EPackage.Registry.INSTANCE.getEPackage(CDODefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     CDODefsPackageImpl theCDODefsPackage = (CDODefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof CDODefsPackageImpl ? EPackage.Registry.INSTANCE
@@ -543,7 +545,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -610,7 +614,9 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -630,24 +636,24 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
     // Add supertypes to classes
     cdoViewDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoTransactionDefEClass.getESuperTypes().add(this.getCDOViewDef());
-    cdoAuditDefEClass.getESuperTypes().add(this.getCDOViewDef());
+    cdoTransactionDefEClass.getESuperTypes().add(getCDOViewDef());
+    cdoAuditDefEClass.getESuperTypes().add(getCDOViewDef());
     cdoSessionDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
     failOverStrategyDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    retryFailOverStrategyDefEClass.getESuperTypes().add(this.getFailOverStrategyDef());
+    retryFailOverStrategyDefEClass.getESuperTypes().add(getFailOverStrategyDef());
     cdoPackageRegistryDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    cdoEagerPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
-    cdoLazyPackageRegistryDefEClass.getESuperTypes().add(this.getCDOPackageRegistryDef());
+    cdoEagerPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef());
+    cdoLazyPackageRegistryDefEClass.getESuperTypes().add(getCDOPackageRegistryDef());
     ePackageDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    eDynamicPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
-    eGlobalPackageDefEClass.getESuperTypes().add(this.getEPackageDef());
+    eDynamicPackageDefEClass.getESuperTypes().add(getEPackageDef());
+    eGlobalPackageDefEClass.getESuperTypes().add(getEPackageDef());
     cdoClientProtocolFactoryDefEClass.getESuperTypes().add(theNet4jDefsPackage.getClientProtocolFactoryDef());
     cdoResourceDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(cdoViewDefEClass, CDOViewDef.class, "CDOViewDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOViewDef_CdoSessionDef(), this.getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1,
+    initEReference(getCDOViewDef_CdoSessionDef(), getCDOSessionDef(), null, "cdoSessionDef", null, 1, 1,
         CDOViewDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -667,14 +673,14 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
     initEAttribute(getCDOSessionDef_RepositoryName(), ecorePackage.getEString(), "repositoryName", null, 1, 1,
         CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
         !IS_DERIVED, !IS_ORDERED);
-    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), this.getCDOPackageRegistryDef(), null,
-        "cdoPackageRegistryDef", null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-        !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCDOSessionDef_CdoPackageRegistryDef(), getCDOPackageRegistryDef(), null, "cdoPackageRegistryDef",
+        null, 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+        !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOSessionDef_LegacySupportEnabled(), ecorePackage.getEBoolean(), "legacySupportEnabled",
         "false", 1, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
         IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getCDOSessionDef_FailOverStrategyDef(), this.getFailOverStrategyDef(), null, "failOverStrategyDef",
-        null, 0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getCDOSessionDef_FailOverStrategyDef(), getFailOverStrategyDef(), null, "failOverStrategyDef", null,
+        0, 1, CDOSessionDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(failOverStrategyDefEClass, FailOverStrategyDef.class, "FailOverStrategyDef", IS_ABSTRACT, !IS_INTERFACE,
@@ -691,7 +697,7 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
     initEClass(cdoPackageRegistryDefEClass, CDOPackageRegistryDef.class, "CDOPackageRegistryDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOPackageRegistryDef_Packages(), this.getEPackageDef(), null, "packages", null, 0, -1,
+    initEReference(getCDOPackageRegistryDef_Packages(), getEPackageDef(), null, "packages", null, 0, -1,
         CDOPackageRegistryDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -720,10 +726,10 @@ public class CDODefsPackageImpl extends EPackageImpl implements CDODefsPackage
 
     initEClass(cdoResourceDefEClass, CDOResourceDef.class, "CDOResourceDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getCDOResourceDef_CdoTransaction(), this.getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1,
+    initEReference(getCDOResourceDef_CdoTransaction(), getCDOTransactionDef(), null, "cdoTransaction", null, 1, 1,
         CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getCDOResourceDef_ResourceMode(), this.getResourceMode(), "resourceMode", "null", 1, 1,
+    initEAttribute(getCDOResourceDef_ResourceMode(), getResourceMode(), "resourceMode", "null", 1, 1,
         CDOResourceDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
     initEAttribute(getCDOResourceDef_Path(), ecorePackage.getEString(), "path", null, 1, 1, CDOResourceDef.class,
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
index 002f3bc7f4..e86cecc682 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOResourceDefImpl.java
@@ -125,8 +125,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
       if (cdoTransaction != oldCdoTransaction)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
               oldCdoTransaction, cdoTransaction));
+        }
       }
     }
     return cdoTransaction;
@@ -152,8 +154,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     CDOTransactionDef oldCdoTransaction = cdoTransaction;
     cdoTransaction = newCdoTransaction;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION,
           oldCdoTransaction, cdoTransaction));
+    }
   }
 
   /**
@@ -176,8 +180,10 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     ResourceMode oldResourceMode = resourceMode;
     resourceMode = newResourceMode == null ? RESOURCE_MODE_EDEFAULT : newResourceMode;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE,
           oldResourceMode, resourceMode));
+    }
   }
 
   /**
@@ -200,7 +206,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     String oldPath = path;
     path = newPath;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_RESOURCE_DEF__PATH, oldPath, path));
+    }
   }
 
   /**
@@ -215,7 +223,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
     {
     case CDODefsPackage.CDO_RESOURCE_DEF__CDO_TRANSACTION:
       if (resolve)
+      {
         return getCdoTransaction();
+      }
       return basicGetCdoTransaction();
     case CDODefsPackage.CDO_RESOURCE_DEF__RESOURCE_MODE:
       return getResourceMode();
@@ -300,7 +310,9 @@ public class CDOResourceDefImpl extends DefImpl implements CDOResourceDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceMode: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
index 7dc4b6f496..d5ced63bc1 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOSessionDefImpl.java
@@ -172,8 +172,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
               oldConnectorDef, connectorDef));
+        }
       }
     }
     return connectorDef;
@@ -223,8 +225,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldConnectorDefESet = connectorDefESet;
     connectorDefESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, connectorDef, !oldConnectorDefESet));
+    }
   }
 
   /**
@@ -239,8 +243,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     connectorDef = null;
     connectorDefESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF,
           oldConnectorDef, null, oldConnectorDefESet));
+    }
   }
 
   /**
@@ -273,8 +279,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     String oldRepositoryName = repositoryName;
     repositoryName = newRepositoryName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME,
           oldRepositoryName, repositoryName));
+    }
   }
 
   /**
@@ -291,8 +299,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (cdoPackageRegistryDef != oldCdoPackageRegistryDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF, oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+        }
       }
     }
     return cdoPackageRegistryDef;
@@ -318,8 +328,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     CDOPackageRegistryDef oldCdoPackageRegistryDef = cdoPackageRegistryDef;
     cdoPackageRegistryDef = newCdoPackageRegistryDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF,
           oldCdoPackageRegistryDef, cdoPackageRegistryDef));
+    }
   }
 
   /**
@@ -342,8 +354,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldLegacySupportEnabled = legacySupportEnabled;
     legacySupportEnabled = newLegacySupportEnabled;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED,
           oldLegacySupportEnabled, legacySupportEnabled));
+    }
   }
 
   /**
@@ -360,8 +374,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
       if (failOverStrategyDef != oldFailOverStrategyDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF, oldFailOverStrategyDef, failOverStrategyDef));
+        }
       }
     }
     return failOverStrategyDef;
@@ -410,8 +426,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     boolean oldFailOverStrategyDefESet = failOverStrategyDefESet;
     failOverStrategyDefESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF,
           oldFailOverStrategyDef, failOverStrategyDef, !oldFailOverStrategyDefESet));
+    }
   }
 
   /**
@@ -426,8 +444,10 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     failOverStrategyDef = null;
     failOverStrategyDefESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF,
           oldFailOverStrategyDef, null, oldFailOverStrategyDefESet));
+    }
   }
 
   /**
@@ -452,19 +472,25 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
     {
     case CDODefsPackage.CDO_SESSION_DEF__CONNECTOR_DEF:
       if (resolve)
+      {
         return getConnectorDef();
+      }
       return basicGetConnectorDef();
     case CDODefsPackage.CDO_SESSION_DEF__REPOSITORY_NAME:
       return getRepositoryName();
     case CDODefsPackage.CDO_SESSION_DEF__CDO_PACKAGE_REGISTRY_DEF:
       if (resolve)
+      {
         return getCdoPackageRegistryDef();
+      }
       return basicGetCdoPackageRegistryDef();
     case CDODefsPackage.CDO_SESSION_DEF__LEGACY_SUPPORT_ENABLED:
       return isLegacySupportEnabled();
     case CDODefsPackage.CDO_SESSION_DEF__FAIL_OVER_STRATEGY_DEF:
       if (resolve)
+      {
         return getFailOverStrategyDef();
+      }
       return basicGetFailOverStrategyDef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -562,7 +588,9 @@ public class CDOSessionDefImpl extends DefImpl implements CDOSessionDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (repositoryName: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
index 46310818b0..78a91fd428 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/CDOViewDefImpl.java
@@ -84,8 +84,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
       if (cdoSessionDef != oldCdoSessionDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
               oldCdoSessionDef, cdoSessionDef));
+        }
       }
     }
     return cdoSessionDef;
@@ -111,8 +113,10 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
     CDOSessionDef oldCdoSessionDef = cdoSessionDef;
     cdoSessionDef = newCdoSessionDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF,
           oldCdoSessionDef, cdoSessionDef));
+    }
   }
 
   /**
@@ -127,7 +131,9 @@ public class CDOViewDefImpl extends DefImpl implements CDOViewDef
     {
     case CDODefsPackage.CDO_VIEW_DEF__CDO_SESSION_DEF:
       if (resolve)
+      {
         return getCdoSessionDef();
+      }
       return basicGetCdoSessionDef();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
index 5ce1c759af..05d6fc4aa7 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EDynamicPackageDefImpl.java
@@ -95,8 +95,10 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
     String oldResourceURI = resourceURI;
     resourceURI = newResourceURI;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EDYNAMIC_PACKAGE_DEF__RESOURCE_URI,
           oldResourceURI, resourceURI));
+    }
   }
 
   /**
@@ -174,7 +176,9 @@ public class EDynamicPackageDefImpl extends EPackageDefImpl implements EDynamicP
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (resourceURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
index a809042675..792547d31d 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/EPackageDefImpl.java
@@ -98,7 +98,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
     String oldNsURI = nsURI;
     nsURI = newNsURI;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.EPACKAGE_DEF__NS_URI, oldNsURI, nsURI));
+    }
   }
 
   /**
@@ -176,7 +178,9 @@ public abstract class EPackageDefImpl extends DefImpl implements EPackageDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (nsURI: ");
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
index 13aa7094ef..99ecc7e5df 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/FailOverStrategyDefImpl.java
@@ -81,8 +81,10 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
       if (connectorDef != oldConnectorDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF, oldConnectorDef, connectorDef));
+        }
       }
     }
     return connectorDef;
@@ -108,8 +110,10 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
     ConnectorDef oldConnectorDef = connectorDef;
     connectorDef = newConnectorDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF,
           oldConnectorDef, connectorDef));
+    }
   }
 
   /**
@@ -124,7 +128,9 @@ public abstract class FailOverStrategyDefImpl extends DefImpl implements FailOve
     {
     case CDODefsPackage.FAIL_OVER_STRATEGY_DEF__CONNECTOR_DEF:
       if (resolve)
+      {
         return getConnectorDef();
+      }
       return basicGetConnectorDef();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
index 54da80838e..1b1ff8f5a4 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/impl/RetryFailOverStrategyDefImpl.java
@@ -107,8 +107,10 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
     boolean oldRetriesESet = retriesESet;
     retriesESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES,
           oldRetries, retries, !oldRetriesESet));
+    }
   }
 
   /**
@@ -123,8 +125,10 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
     retries = RETRIES_EDEFAULT;
     retriesESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF__RETRIES,
           oldRetries, RETRIES_EDEFAULT, oldRetriesESet));
+    }
   }
 
   /**
@@ -212,14 +216,20 @@ public class RetryFailOverStrategyDefImpl extends FailOverStrategyDefImpl implem
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (retries: ");
     if (retriesESet)
+    {
       result.append(retries);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
index d47f8ac188..b4927872f7 100644
--- a/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
+++ b/plugins/org.eclipse.emf.cdo.defs/src/org/eclipse/emf/cdo/defs/util/CDODefsSwitch.java
@@ -115,9 +115,13 @@ public class CDODefsSwitch<T>
       CDOViewDef cdoViewDef = (CDOViewDef)theEObject;
       T result = caseCDOViewDef(cdoViewDef);
       if (result == null)
+      {
         result = caseDef(cdoViewDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_TRANSACTION_DEF:
@@ -125,11 +129,17 @@ public class CDODefsSwitch<T>
       CDOTransactionDef cdoTransactionDef = (CDOTransactionDef)theEObject;
       T result = caseCDOTransactionDef(cdoTransactionDef);
       if (result == null)
+      {
         result = caseCDOViewDef(cdoTransactionDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoTransactionDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_AUDIT_DEF:
@@ -137,11 +147,17 @@ public class CDODefsSwitch<T>
       CDOAuditDef cdoAuditDef = (CDOAuditDef)theEObject;
       T result = caseCDOAuditDef(cdoAuditDef);
       if (result == null)
+      {
         result = caseCDOViewDef(cdoAuditDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoAuditDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_SESSION_DEF:
@@ -149,9 +165,13 @@ public class CDODefsSwitch<T>
       CDOSessionDef cdoSessionDef = (CDOSessionDef)theEObject;
       T result = caseCDOSessionDef(cdoSessionDef);
       if (result == null)
+      {
         result = caseDef(cdoSessionDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.FAIL_OVER_STRATEGY_DEF:
@@ -159,9 +179,13 @@ public class CDODefsSwitch<T>
       FailOverStrategyDef failOverStrategyDef = (FailOverStrategyDef)theEObject;
       T result = caseFailOverStrategyDef(failOverStrategyDef);
       if (result == null)
+      {
         result = caseDef(failOverStrategyDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.RETRY_FAIL_OVER_STRATEGY_DEF:
@@ -169,11 +193,17 @@ public class CDODefsSwitch<T>
       RetryFailOverStrategyDef retryFailOverStrategyDef = (RetryFailOverStrategyDef)theEObject;
       T result = caseRetryFailOverStrategyDef(retryFailOverStrategyDef);
       if (result == null)
+      {
         result = caseFailOverStrategyDef(retryFailOverStrategyDef);
+      }
       if (result == null)
+      {
         result = caseDef(retryFailOverStrategyDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_PACKAGE_REGISTRY_DEF:
@@ -181,9 +211,13 @@ public class CDODefsSwitch<T>
       CDOPackageRegistryDef cdoPackageRegistryDef = (CDOPackageRegistryDef)theEObject;
       T result = caseCDOPackageRegistryDef(cdoPackageRegistryDef);
       if (result == null)
+      {
         result = caseDef(cdoPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_EAGER_PACKAGE_REGISTRY_DEF:
@@ -191,11 +225,17 @@ public class CDODefsSwitch<T>
       CDOEagerPackageRegistryDef cdoEagerPackageRegistryDef = (CDOEagerPackageRegistryDef)theEObject;
       T result = caseCDOEagerPackageRegistryDef(cdoEagerPackageRegistryDef);
       if (result == null)
+      {
         result = caseCDOPackageRegistryDef(cdoEagerPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoEagerPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_LAZY_PACKAGE_REGISTRY_DEF:
@@ -203,11 +243,17 @@ public class CDODefsSwitch<T>
       CDOLazyPackageRegistryDef cdoLazyPackageRegistryDef = (CDOLazyPackageRegistryDef)theEObject;
       T result = caseCDOLazyPackageRegistryDef(cdoLazyPackageRegistryDef);
       if (result == null)
+      {
         result = caseCDOPackageRegistryDef(cdoLazyPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoLazyPackageRegistryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EPACKAGE_DEF:
@@ -215,9 +261,13 @@ public class CDODefsSwitch<T>
       EPackageDef ePackageDef = (EPackageDef)theEObject;
       T result = caseEPackageDef(ePackageDef);
       if (result == null)
+      {
         result = caseDef(ePackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EDYNAMIC_PACKAGE_DEF:
@@ -225,11 +275,17 @@ public class CDODefsSwitch<T>
       EDynamicPackageDef eDynamicPackageDef = (EDynamicPackageDef)theEObject;
       T result = caseEDynamicPackageDef(eDynamicPackageDef);
       if (result == null)
+      {
         result = caseEPackageDef(eDynamicPackageDef);
+      }
       if (result == null)
+      {
         result = caseDef(eDynamicPackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.EGLOBAL_PACKAGE_DEF:
@@ -237,11 +293,17 @@ public class CDODefsSwitch<T>
       EGlobalPackageDef eGlobalPackageDef = (EGlobalPackageDef)theEObject;
       T result = caseEGlobalPackageDef(eGlobalPackageDef);
       if (result == null)
+      {
         result = caseEPackageDef(eGlobalPackageDef);
+      }
       if (result == null)
+      {
         result = caseDef(eGlobalPackageDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_CLIENT_PROTOCOL_FACTORY_DEF:
@@ -249,13 +311,21 @@ public class CDODefsSwitch<T>
       CDOClientProtocolFactoryDef cdoClientProtocolFactoryDef = (CDOClientProtocolFactoryDef)theEObject;
       T result = caseCDOClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
       if (result == null)
+      {
         result = caseClientProtocolFactoryDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = caseProtocolProviderDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = caseDef(cdoClientProtocolFactoryDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case CDODefsPackage.CDO_RESOURCE_DEF:
@@ -263,9 +333,13 @@ public class CDODefsSwitch<T>
       CDOResourceDef cdoResourceDef = (CDOResourceDef)theEObject;
       T result = caseCDOResourceDef(cdoResourceDef);
       if (result == null)
+      {
         result = caseDef(cdoResourceDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default: