fixed warnings

11 files changed, 140 insertions, 18 deletions

diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
index 8d5baef015..ed044ea886 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ChallengeNegotiatorDefImpl.java
@@ -96,8 +96,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (userManager != oldUserManager)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
+        }
       }
     }
     return userManager;
@@ -123,8 +125,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     UserManagerDef oldUserManager = userManager;
     userManager = newUserManager;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER, oldUserManager, userManager));
+    }
   }
 
   /**
@@ -141,8 +145,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
       if (randomizer != oldRandomizer)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER, oldRandomizer, randomizer));
+        }
       }
     }
     return randomizer;
@@ -168,8 +174,10 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     RandomizerDef oldRandomizer = randomizer;
     randomizer = newRandomizer;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER,
           oldRandomizer, randomizer));
+    }
   }
 
   /**
@@ -184,11 +192,15 @@ public class ChallengeNegotiatorDefImpl extends NegotiatorDefImpl implements Cha
     {
     case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__USER_MANAGER:
       if (resolve)
+      {
         return getUserManager();
+      }
       return basicGetUserManager();
     case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF__RANDOMIZER:
       if (resolve)
+      {
         return getRandomizer();
+      }
       return basicGetRandomizer();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
index 3a89f0df4a..3c6a79b507 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/CredentialsProviderDefImpl.java
@@ -93,8 +93,10 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
     String oldUserID = userID;
     userID = newUserID;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.CREDENTIALS_PROVIDER_DEF__USER_ID,
           oldUserID, userID));
+    }
   }
 
   /**
@@ -172,7 +174,9 @@ public abstract class CredentialsProviderDefImpl extends DefImpl implements Cred
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
index be05186418..cfae57d862 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/DefContainerImpl.java
@@ -110,8 +110,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
       if (defaultDefinition != oldDefaultDefinition)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION, oldDefaultDefinition, defaultDefinition));
+        }
       }
     }
     return defaultDefinition;
@@ -137,8 +139,10 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
     Def oldDefaultDefinition = defaultDefinition;
     defaultDefinition = newDefaultDefinition;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION,
           oldDefaultDefinition, defaultDefinition));
+    }
   }
 
   /**
@@ -171,7 +175,9 @@ public class DefContainerImpl extends EObjectImpl implements DefContainer
       return getDefinitions();
     case Net4jUtilDefsPackage.DEF_CONTAINER__DEFAULT_DEFINITION:
       if (resolve)
+      {
         return getDefaultDefinition();
+      }
       return basicGetDefaultDefinition();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
index 4cd7699dac..b2871823fc 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/Net4jUtilDefsPackageImpl.java
@@ -163,7 +163,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public static Net4jUtilDefsPackage init()
   {
     if (isInited)
+    {
       return (Net4jUtilDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jUtilDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
     Net4jUtilDefsPackageImpl theNet4jUtilDefsPackage = (Net4jUtilDefsPackageImpl)(EPackage.Registry.INSTANCE
@@ -462,7 +464,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -520,7 +524,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -533,23 +539,23 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
     // Set bounds for type parameters
 
     // Add supertypes to classes
-    executorServiceDefEClass.getESuperTypes().add(this.getDef());
-    threadPoolDefEClass.getESuperTypes().add(this.getExecutorServiceDef());
-    randomizerDefEClass.getESuperTypes().add(this.getDef());
-    userManagerDefEClass.getESuperTypes().add(this.getDef());
-    passwordCredentialsProviderDefEClass.getESuperTypes().add(this.getCredentialsProviderDef());
-    credentialsProviderDefEClass.getESuperTypes().add(this.getDef());
-    negotiatorDefEClass.getESuperTypes().add(this.getDef());
-    responseNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
-    challengeNegotiatorDefEClass.getESuperTypes().add(this.getNegotiatorDef());
+    executorServiceDefEClass.getESuperTypes().add(getDef());
+    threadPoolDefEClass.getESuperTypes().add(getExecutorServiceDef());
+    randomizerDefEClass.getESuperTypes().add(getDef());
+    userManagerDefEClass.getESuperTypes().add(getDef());
+    passwordCredentialsProviderDefEClass.getESuperTypes().add(getCredentialsProviderDef());
+    credentialsProviderDefEClass.getESuperTypes().add(getDef());
+    negotiatorDefEClass.getESuperTypes().add(getDef());
+    responseNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
+    challengeNegotiatorDefEClass.getESuperTypes().add(getNegotiatorDef());
 
     // Initialize classes and features; add operations and parameters
     initEClass(defContainerEClass, DefContainer.class, "DefContainer", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getDefContainer_Definitions(), this.getDef(), null, "definitions", null, 1, -1, DefContainer.class,
+    initEReference(getDefContainer_Definitions(), getDef(), null, "definitions", null, 1, -1, DefContainer.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
         !IS_DERIVED, IS_ORDERED);
-    initEReference(getDefContainer_DefaultDefinition(), this.getDef(), null, "defaultDefinition", null, 0, 1,
+    initEReference(getDefContainer_DefaultDefinition(), getDef(), null, "defaultDefinition", null, 0, 1,
         DefContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -578,9 +584,9 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(userManagerDefEClass, UserManagerDef.class, "UserManagerDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getUserManagerDef_User(), this.getUser(), null, "user", null, 1, -1, UserManagerDef.class,
-        !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-        !IS_DERIVED, IS_ORDERED);
+    initEReference(getUserManagerDef_User(), getUser(), null, "user", null, 1, -1, UserManagerDef.class, !IS_TRANSIENT,
+        !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+        IS_ORDERED);
 
     initEClass(userEClass, User.class, "User", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getUser_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, User.class, !IS_TRANSIENT,
@@ -605,16 +611,16 @@ public class Net4jUtilDefsPackageImpl extends EPackageImpl implements Net4jUtilD
 
     initEClass(responseNegotiatorDefEClass, ResponseNegotiatorDef.class, "ResponseNegotiatorDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getResponseNegotiatorDef_CredentialsProvider(), this.getCredentialsProviderDef(), null,
+    initEReference(getResponseNegotiatorDef_CredentialsProvider(), getCredentialsProviderDef(), null,
         "credentialsProvider", null, 0, 1, ResponseNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
     initEClass(challengeNegotiatorDefEClass, ChallengeNegotiatorDef.class, "ChallengeNegotiatorDef", !IS_ABSTRACT,
         !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChallengeNegotiatorDef_UserManager(), this.getUserManagerDef(), null, "userManager", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_UserManager(), getUserManagerDef(), null, "userManager", null, 0, 1,
         ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getChallengeNegotiatorDef_Randomizer(), this.getRandomizerDef(), null, "randomizer", null, 0, 1,
+    initEReference(getChallengeNegotiatorDef_Randomizer(), getRandomizerDef(), null, "randomizer", null, 0, 1,
         ChallengeNegotiatorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
index d2ca8c0c99..fce17bc1cb 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/PasswordCredentialsProviderDefImpl.java
@@ -99,8 +99,10 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
     String oldPassword = password;
     password = newPassword;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF__PASSWORD, oldPassword, password));
+    }
   }
 
   /**
@@ -178,7 +180,9 @@ public class PasswordCredentialsProviderDefImpl extends CredentialsProviderDefIm
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (password: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
index 9f7ced68ae..de91115ff4 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/RandomizerDefImpl.java
@@ -179,8 +179,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldAlgorithmNameESet = algorithmNameESet;
     algorithmNameESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
           oldAlgorithmName, algorithmName, !oldAlgorithmNameESet));
+    }
   }
 
   /**
@@ -195,8 +197,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     algorithmName = ALGORITHM_NAME_EDEFAULT;
     algorithmNameESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__ALGORITHM_NAME,
           oldAlgorithmName, ALGORITHM_NAME_EDEFAULT, oldAlgorithmNameESet));
+    }
   }
 
   /**
@@ -231,8 +235,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldProviderNameESet = providerNameESet;
     providerNameESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
           oldProviderName, providerName, !oldProviderNameESet));
+    }
   }
 
   /**
@@ -247,8 +253,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     providerName = PROVIDER_NAME_EDEFAULT;
     providerNameESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__PROVIDER_NAME,
           oldProviderName, PROVIDER_NAME_EDEFAULT, oldProviderNameESet));
+    }
   }
 
   /**
@@ -283,8 +291,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     boolean oldSeedESet = seedESet;
     seedESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed, seed,
           !oldSeedESet));
+    }
   }
 
   /**
@@ -299,8 +309,10 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
     seed = SEED_EDEFAULT;
     seedESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jUtilDefsPackage.RANDOMIZER_DEF__SEED, oldSeed,
           SEED_EDEFAULT, oldSeedESet));
+    }
   }
 
   /**
@@ -408,24 +420,38 @@ public class RandomizerDefImpl extends DefImpl implements RandomizerDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (algorithmName: ");
     if (algorithmNameESet)
+    {
       result.append(algorithmName);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", providerName: ");
     if (providerNameESet)
+    {
       result.append(providerName);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(", seed: ");
     if (seedESet)
+    {
       result.append(seed);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
index f9b91b7c49..08eb4d469e 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ResponseNegotiatorDefImpl.java
@@ -82,9 +82,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
       if (credentialsProvider != oldCredentialsProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider,
               credentialsProvider));
+        }
       }
     }
     return credentialsProvider;
@@ -110,9 +112,11 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
     CredentialsProviderDef oldCredentialsProvider = credentialsProvider;
     credentialsProvider = newCredentialsProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET,
           Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER, oldCredentialsProvider,
           credentialsProvider));
+    }
   }
 
   /**
@@ -127,7 +131,9 @@ public class ResponseNegotiatorDefImpl extends NegotiatorDefImpl implements Resp
     {
     case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF__CREDENTIALS_PROVIDER:
       if (resolve)
+      {
         return getCredentialsProvider();
+      }
       return basicGetCredentialsProvider();
     }
     return super.eGet(featureID, resolve, coreType);
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
index 01d8db456a..67ec248ae4 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/ThreadPoolDefImpl.java
@@ -74,7 +74,7 @@ public class ThreadPoolDefImpl extends ExecutorServiceDefImpl implements ThreadP
     public DaemonThreadFactory(String threadGroupIdentifier)
     {
       super();
-      this.threadGroup = new ThreadGroup(threadGroupIdentifier);
+      threadGroup = new ThreadGroup(threadGroupIdentifier);
     }
 
     public Thread newThread(Runnable r)
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
index 1f4b6f4ab7..a62fa975e5 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserImpl.java
@@ -114,7 +114,9 @@ public class UserImpl extends EObjectImpl implements User
     String oldUserID = userID;
     userID = newUserID;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__USER_ID, oldUserID, userID));
+    }
   }
 
   /**
@@ -137,7 +139,9 @@ public class UserImpl extends EObjectImpl implements User
     String oldPassword = password;
     password = newPassword;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jUtilDefsPackage.USER__PASSWORD, oldPassword, password));
+    }
   }
 
   /**
@@ -225,7 +229,9 @@ public class UserImpl extends EObjectImpl implements User
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
index 70be88be16..2d11430341 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/impl/UserManagerDefImpl.java
@@ -90,7 +90,9 @@ public class UserManagerDefImpl extends DefImpl implements UserManagerDef
   public void unsetUser()
   {
     if (user != null)
+    {
       ((InternalEList.Unsettable<?>)user).unset();
+    }
   }
 
   /**
diff --git a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
index 409151a29a..bbdd3f0057 100644
--- a/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.util.defs/src/org/eclipse/net4j/util/defs/util/Net4jUtilDefsSwitch.java
@@ -109,7 +109,9 @@ public class Net4jUtilDefsSwitch<T>
       DefContainer defContainer = (DefContainer)theEObject;
       T result = caseDefContainer(defContainer);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.DEF:
@@ -117,7 +119,9 @@ public class Net4jUtilDefsSwitch<T>
       Def def = (Def)theEObject;
       T result = caseDef(def);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.EXECUTOR_SERVICE_DEF:
@@ -125,9 +129,13 @@ public class Net4jUtilDefsSwitch<T>
       ExecutorServiceDef executorServiceDef = (ExecutorServiceDef)theEObject;
       T result = caseExecutorServiceDef(executorServiceDef);
       if (result == null)
+      {
         result = caseDef(executorServiceDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.THREAD_POOL_DEF:
@@ -135,11 +143,17 @@ public class Net4jUtilDefsSwitch<T>
       ThreadPoolDef threadPoolDef = (ThreadPoolDef)theEObject;
       T result = caseThreadPoolDef(threadPoolDef);
       if (result == null)
+      {
         result = caseExecutorServiceDef(threadPoolDef);
+      }
       if (result == null)
+      {
         result = caseDef(threadPoolDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.RANDOMIZER_DEF:
@@ -147,9 +161,13 @@ public class Net4jUtilDefsSwitch<T>
       RandomizerDef randomizerDef = (RandomizerDef)theEObject;
       T result = caseRandomizerDef(randomizerDef);
       if (result == null)
+      {
         result = caseDef(randomizerDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.USER_MANAGER_DEF:
@@ -157,9 +175,13 @@ public class Net4jUtilDefsSwitch<T>
       UserManagerDef userManagerDef = (UserManagerDef)theEObject;
       T result = caseUserManagerDef(userManagerDef);
       if (result == null)
+      {
         result = caseDef(userManagerDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.USER:
@@ -167,7 +189,9 @@ public class Net4jUtilDefsSwitch<T>
       User user = (User)theEObject;
       T result = caseUser(user);
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.PASSWORD_CREDENTIALS_PROVIDER_DEF:
@@ -175,11 +199,17 @@ public class Net4jUtilDefsSwitch<T>
       PasswordCredentialsProviderDef passwordCredentialsProviderDef = (PasswordCredentialsProviderDef)theEObject;
       T result = casePasswordCredentialsProviderDef(passwordCredentialsProviderDef);
       if (result == null)
+      {
         result = caseCredentialsProviderDef(passwordCredentialsProviderDef);
+      }
       if (result == null)
+      {
         result = caseDef(passwordCredentialsProviderDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.CREDENTIALS_PROVIDER_DEF:
@@ -187,9 +217,13 @@ public class Net4jUtilDefsSwitch<T>
       CredentialsProviderDef credentialsProviderDef = (CredentialsProviderDef)theEObject;
       T result = caseCredentialsProviderDef(credentialsProviderDef);
       if (result == null)
+      {
         result = caseDef(credentialsProviderDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.NEGOTIATOR_DEF:
@@ -197,9 +231,13 @@ public class Net4jUtilDefsSwitch<T>
       NegotiatorDef negotiatorDef = (NegotiatorDef)theEObject;
       T result = caseNegotiatorDef(negotiatorDef);
       if (result == null)
+      {
         result = caseDef(negotiatorDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.RESPONSE_NEGOTIATOR_DEF:
@@ -207,11 +245,17 @@ public class Net4jUtilDefsSwitch<T>
       ResponseNegotiatorDef responseNegotiatorDef = (ResponseNegotiatorDef)theEObject;
       T result = caseResponseNegotiatorDef(responseNegotiatorDef);
       if (result == null)
+      {
         result = caseNegotiatorDef(responseNegotiatorDef);
+      }
       if (result == null)
+      {
         result = caseDef(responseNegotiatorDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     case Net4jUtilDefsPackage.CHALLENGE_NEGOTIATOR_DEF:
@@ -219,11 +263,17 @@ public class Net4jUtilDefsSwitch<T>
       ChallengeNegotiatorDef challengeNegotiatorDef = (ChallengeNegotiatorDef)theEObject;
       T result = caseChallengeNegotiatorDef(challengeNegotiatorDef);
       if (result == null)
+      {
         result = caseNegotiatorDef(challengeNegotiatorDef);
+      }
       if (result == null)
+      {
         result = caseDef(challengeNegotiatorDef);
+      }
       if (result == null)
+      {
         result = defaultCase(theEObject);
+      }
       return result;
     }
     default: