[Releng] Reformat everything with M6 formatter

34 files changed, 234 insertions, 132 deletions

diff --git a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
index b73a9b4ace..233f95f22e 100644
--- a/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.defs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.defs;singleton:=true
-Bundle-Version: 4.0.300.qualifier
+Bundle-Version: 4.0.400.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,6 +12,6 @@ Require-Bundle: org.eclipse.net4j.util.defs;bundle-version="[4.0.0,5.0.0)";visib
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.http;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.net4j.defs;version="4.0.300",
- org.eclipse.net4j.defs.impl;version="4.0.300",
- org.eclipse.net4j.defs.util;version="4.0.300"
+Export-Package: org.eclipse.net4j.defs;version="4.0.400",
+ org.eclipse.net4j.defs.impl;version="4.0.400",
+ org.eclipse.net4j.defs.util;version="4.0.400"
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
index e0ece3a97f..c09afdaf38 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/AcceptorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
index 46fb4ab65c..d57c5a63dc 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferPoolDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
index 42e112334c..b791b133f3 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/BufferProviderDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>Buffer Provider Def</b></em>'. <!-- end-user-doc
  * -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getBufferProviderDef()
  * @model abstract="true"
  * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
index 74b85a8069..ffe3526377 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ClientProtocolFactoryDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
index 1055e67092..cf8a9f6349 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ConnectorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -58,7 +58,7 @@ public interface ConnectorDef extends Def
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>User ID</em>' attribute.
    * @see #isSetUserID()
@@ -71,7 +71,7 @@ public interface ConnectorDef extends Def
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.ConnectorDef#getUserID <em>User ID</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetUserID()
    * @see #getUserID()
    * @see #setUserID(String)
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
index ec1cff09c3..7c9ce70339 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/HTTPConnectorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getHTTPConnectorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface HTTPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.HTTPConnectorDef#getUrl <em>Url</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Url</em>' attribute.
    * @see #getUrl()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
index e4904dc62c..a061203b9f 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMAcceptorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMAcceptorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface JVMAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.JVMAcceptorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
index 6095b3a4de..1fdf4d716c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/JVMConnectorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -20,7 +20,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getJVMConnectorDef()
  * @model
  * @generated
@@ -45,7 +45,7 @@ public interface JVMConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.JVMConnectorDef#getName <em>Name</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Name</em>' attribute.
    * @see #getName()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
index e532fa70b8..caefc2d46c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsFactory.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
index 659e705ec4..dc9199595a 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/Net4jDefsPackage.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -114,7 +114,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Connector Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -242,7 +242,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The meta object id for the '{@link org.eclipse.net4j.defs.impl.AcceptorDefImpl <em>Acceptor Def</em>}' class. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.net4j.defs.impl.AcceptorDefImpl
    * @see org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl#getAcceptorDef()
    * @generated
@@ -285,7 +285,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * The number of structural features of the '<em>Acceptor Def</em>' class. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @generated
    * @ordered
    */
@@ -634,7 +634,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.ConnectorDef <em>Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Connector Def</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef
    * @generated
@@ -685,7 +685,7 @@ public interface Net4jDefsPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider <em>Client Protocol Provider</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Client Protocol Provider</em>'.
    * @see org.eclipse.net4j.defs.ConnectorDef#getClientProtocolProvider()
    * @see #getConnectorDef()
@@ -705,7 +705,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPConnectorDef <em>TCP Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Connector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPConnectorDef
    * @generated
@@ -745,7 +745,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.AcceptorDef <em>Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef
    * @generated
@@ -786,7 +786,7 @@ public interface Net4jDefsPackage extends EPackage
    * Returns the meta object for the reference list '
    * {@link org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider <em>Server Protocol Provider</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for the reference list '<em>Server Protocol Provider</em>'.
    * @see org.eclipse.net4j.defs.AcceptorDef#getServerProtocolProvider()
    * @see #getAcceptorDef()
@@ -797,7 +797,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPAcceptorDef <em>TCP Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.TCPAcceptorDef
    * @generated
@@ -837,7 +837,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMAcceptorDef <em>JVM Acceptor Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>JVM Acceptor Def</em>'.
    * @see org.eclipse.net4j.defs.JVMAcceptorDef
    * @generated
@@ -857,7 +857,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.JVMConnectorDef <em>JVM Connector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>JVM Connector Def</em>'.
    * @see org.eclipse.net4j.defs.JVMConnectorDef
    * @generated
@@ -896,7 +896,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.TCPSelectorDef <em>TCP Selector Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>TCP Selector Def</em>'.
    * @see org.eclipse.net4j.defs.TCPSelectorDef
    * @generated
@@ -924,7 +924,7 @@ public interface Net4jDefsPackage extends EPackage
   /**
    * Returns the meta object for class '{@link org.eclipse.net4j.defs.BufferPoolDef <em>Buffer Pool Def</em>}'. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the meta object for class '<em>Buffer Pool Def</em>'.
    * @see org.eclipse.net4j.defs.BufferPoolDef
    * @generated
@@ -1005,7 +1005,7 @@ public interface Net4jDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Client Protocol Provider</b></em>' reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER = eINSTANCE.getConnectorDef_ClientProtocolProvider();
@@ -1088,7 +1088,7 @@ public interface Net4jDefsPackage extends EPackage
     /**
      * The meta object literal for the '<em><b>Server Protocol Provider</b></em>' reference list feature. <!--
      * begin-user-doc --> <!-- end-user-doc -->
-     * 
+     *
      * @generated
      */
     EReference ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER = eINSTANCE.getAcceptorDef_ServerProtocolProvider();
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
index cd550efcd7..7d2f722082 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ProtocolProviderDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
index ede50c4232..4a026160bd 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/ServerProtocolFactoryDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
index 7120873dd3..f8e7e7740c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPAcceptorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.TCPAcceptorDef#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPAcceptorDef()
  * @model
  * @generated
@@ -47,7 +47,7 @@ public interface TCPAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Host</em>' attribute.
    * @see #getHost()
@@ -73,7 +73,7 @@ public interface TCPAcceptorDef extends AcceptorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPAcceptorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Port</em>' attribute.
    * @see #getPort()
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
index eb8435d239..ecca541366 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPConnectorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -22,7 +22,7 @@ package org.eclipse.net4j.defs;
  * <li>{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPConnectorDef()
  * @model
  * @generated
@@ -72,7 +72,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getHost <em>Host</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Host</em>' attribute.
    * @see #getHost()
@@ -100,7 +100,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Sets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @param value
    *          the new value of the '<em>Port</em>' attribute.
    * @see #isSetPort()
@@ -113,7 +113,7 @@ public interface TCPConnectorDef extends ConnectorDef
   /**
    * Unsets the value of the '{@link org.eclipse.net4j.defs.TCPConnectorDef#getPort <em>Port</em>}' attribute. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see #isSetPort()
    * @see #getPort()
    * @see #setPort(int)
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
index 4b8e06ede7..a2fb4921c6 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/TCPSelectorDef.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -16,7 +16,7 @@ import org.eclipse.net4j.util.defs.Def;
 /**
  * <!-- begin-user-doc --> A representation of the model object '<em><b>TCP Selector Def</b></em>'. <!-- end-user-doc
  * -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage#getTCPSelectorDef()
  * @model
  * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
index 3d09dbed9b..ab896ce136 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/AcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *   Andre Dietisheim - initial API and implementation
  *   Eike Stepper - maintenance
@@ -131,8 +131,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
+        }
       }
     }
     return bufferProvider;
@@ -156,8 +158,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     BufferPoolDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
+    }
   }
 
   /**
@@ -173,8 +177,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
+        }
       }
     }
     return executorService;
@@ -198,8 +204,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     ThreadPoolDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
+    }
   }
 
   /**
@@ -215,8 +223,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
+        }
       }
     }
     return negotiator;
@@ -242,8 +252,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
+    }
   }
 
   /**
@@ -257,8 +269,10 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR, oldNegotiator,
           null, oldNegotiatorESet));
+    }
   }
 
   /**
@@ -291,7 +305,9 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
   public void unsetServerProtocolProvider()
   {
     if (serverProtocolProvider != null)
+    {
       ((InternalEList.Unsettable<?>)serverProtocolProvider).unset();
+    }
   }
 
   /**
@@ -314,15 +330,21 @@ public abstract class AcceptorDefImpl extends DefImpl implements AcceptorDef
     {
     case Net4jDefsPackage.ACCEPTOR_DEF__BUFFER_PROVIDER:
       if (resolve)
+      {
         return getBufferProvider();
+      }
       return basicGetBufferProvider();
     case Net4jDefsPackage.ACCEPTOR_DEF__EXECUTOR_SERVICE:
       if (resolve)
+      {
         return getExecutorService();
+      }
       return basicGetExecutorService();
     case Net4jDefsPackage.ACCEPTOR_DEF__NEGOTIATOR:
       if (resolve)
+      {
         return getNegotiator();
+      }
       return basicGetNegotiator();
     case Net4jDefsPackage.ACCEPTOR_DEF__SERVER_PROTOCOL_PROVIDER:
       return getServerProtocolProvider();
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
index 432afc7766..ee64e75e8c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferPoolDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *   Andre Dietisheim - initial API and implementation
  *   Eike Stepper - maintenance
@@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EClass;
  * -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPoolDef
@@ -49,7 +49,7 @@ public class BufferPoolDefImpl extends BufferProviderDefImpl implements BufferPo
 
   /**
    * creates and returns a buffer provider.
-   * 
+   *
    * @generated NOT
    */
   @Override
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
index 009d7846ea..8d6a02baba 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/BufferProviderDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
index a2fe995eb7..d311700a8d 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ClientProtocolFactoryDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
index 8e3673f30b..372dc3c7f9 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -168,8 +168,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldUserIDESet = userIDESet;
     userIDESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID, userID,
           !oldUserIDESet));
+    }
   }
 
   /**
@@ -183,8 +185,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     userID = USER_ID_EDEFAULT;
     userIDESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__USER_ID, oldUserID,
           USER_ID_EDEFAULT, oldUserIDESet));
+    }
   }
 
   /**
@@ -209,8 +213,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (bufferProvider != oldBufferProvider)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
               oldBufferProvider, bufferProvider));
+        }
       }
     }
     return bufferProvider;
@@ -234,8 +240,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     BufferProviderDef oldBufferProvider = bufferProvider;
     bufferProvider = newBufferProvider;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER,
           oldBufferProvider, bufferProvider));
+    }
   }
 
   /**
@@ -251,8 +259,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (executorService != oldExecutorService)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
               oldExecutorService, executorService));
+        }
       }
     }
     return executorService;
@@ -276,8 +286,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     ExecutorServiceDef oldExecutorService = executorService;
     executorService = newExecutorService;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE,
           oldExecutorService, executorService));
+    }
   }
 
   /**
@@ -293,8 +305,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       if (negotiator != oldNegotiator)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
               oldNegotiator, negotiator));
+        }
       }
     }
     return negotiator;
@@ -320,8 +334,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     boolean oldNegotiatorESet = negotiatorESet;
     negotiatorESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
           negotiator, !oldNegotiatorESet));
+    }
   }
 
   /**
@@ -335,8 +351,10 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
     negotiator = null;
     negotiatorESet = false;
     if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR,
-          oldNegotiator, null, oldNegotiatorESet));
+    {
+      eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR, oldNegotiator,
+          null, oldNegotiatorESet));
+    }
   }
 
   /**
@@ -369,7 +387,9 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public void unsetClientProtocolProvider()
   {
     if (clientProtocolProvider != null)
+    {
       ((InternalEList.Unsettable<?>)clientProtocolProvider).unset();
+    }
   }
 
   /**
@@ -394,15 +414,21 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
       return getUserID();
     case Net4jDefsPackage.CONNECTOR_DEF__BUFFER_PROVIDER:
       if (resolve)
+      {
         return getBufferProvider();
+      }
       return basicGetBufferProvider();
     case Net4jDefsPackage.CONNECTOR_DEF__EXECUTOR_SERVICE:
       if (resolve)
+      {
         return getExecutorService();
+      }
       return basicGetExecutorService();
     case Net4jDefsPackage.CONNECTOR_DEF__NEGOTIATOR:
       if (resolve)
+      {
         return getNegotiator();
+      }
       return basicGetNegotiator();
     case Net4jDefsPackage.CONNECTOR_DEF__CLIENT_PROTOCOL_PROVIDER:
       return getClientProtocolProvider();
@@ -499,14 +525,20 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (userID: ");
     if (userIDESet)
+    {
       result.append(userID);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
@@ -519,7 +551,7 @@ public abstract class ConnectorDefImpl extends DefImpl implements ConnectorDef
    * <li>{@link INegotiator}</li>
    * <li>{@link IProtocolProvider}</li>
    * </ul>
-   * 
+   *
    * @param config
    *          the transport config
    * @ADDED
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
index b569697aea..aa56b1141c 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/HTTPConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl#getUrl <em>Url</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnectorDef
@@ -90,7 +90,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
     String oldUrl = url;
     url = newUrl;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.HTTP_CONNECTOR_DEF__URL, oldUrl, url));
+    }
   }
 
   /**
@@ -163,7 +165,9 @@ public class HTTPConnectorDefImpl extends ConnectorDefImpl implements HTTPConnec
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (url: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
index f3abc271b4..2b3db3ba29 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMAcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -28,7 +28,7 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -81,7 +81,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME, oldName, name));
+    }
   }
 
   /**
@@ -154,7 +156,9 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
@@ -186,4 +190,3 @@ public class JVMAcceptorDefImpl extends AcceptorDefImpl implements JVMAcceptorDe
     CheckUtil.checkState(eIsSet(Net4jDefsPackage.JVM_ACCEPTOR_DEF__NAME), "name not set!");
   }
 } // JVMAcceptorDefImpl
-
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
index 24d28cea02..d3021ee0d8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/JVMConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -30,7 +30,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.JVMConnectorDefImpl#getName <em>Name</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnectorDef
@@ -38,7 +38,7 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   /**
    * The default value of the '{@link #getName() <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getName()
    * @generated
    * @ordered
@@ -91,7 +91,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
     String oldName = name;
     name = newName;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.JVM_CONNECTOR_DEF__NAME, oldName, name));
+    }
   }
 
   /**
@@ -164,7 +166,9 @@ public class JVMConnectorDefImpl extends ConnectorDefImpl implements JVMConnecto
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (name: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
index e8e9b0df68..8f32dbefe8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsFactoryImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
index e53985d37e..6ba1382bfe 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/Net4jDefsPackageImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -125,7 +125,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
    * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
    * performs initialization of the package, or returns the registered package, if one already exists. <!--
    * begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @see org.eclipse.emf.ecore.EPackage.Registry
    * @see org.eclipse.net4j.defs.Net4jDefsPackage#eNS_URI
    * @see #init()
@@ -144,7 +144,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
   /**
    * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-   * 
+   *
    * <p>This method is used to initialize {@link Net4jDefsPackage#eINSTANCE} when that field is accessed.
    * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
    * <!-- begin-user-doc
@@ -157,11 +157,14 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public static Net4jDefsPackage init()
   {
     if (isInited)
+    {
       return (Net4jDefsPackage)EPackage.Registry.INSTANCE.getEPackage(Net4jDefsPackage.eNS_URI);
+    }
 
     // Obtain or create and register package
-    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE
-        .get(eNS_URI) : new Net4jDefsPackageImpl());
+    Net4jDefsPackageImpl theNet4jDefsPackage = (Net4jDefsPackageImpl)(EPackage.Registry.INSTANCE
+        .get(eNS_URI) instanceof Net4jDefsPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+            : new Net4jDefsPackageImpl());
 
     isInited = true;
 
@@ -485,7 +488,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void createPackageContents()
   {
     if (isCreated)
+    {
       return;
+    }
     isCreated = true;
 
     // Create classes and their features
@@ -549,7 +554,9 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
   public void initializePackageContents()
   {
     if (isInitialized)
+    {
       return;
+    }
     isInitialized = true;
 
     // Initialize package
@@ -567,17 +574,17 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     // Add supertypes to classes
     connectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    clientProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
-    tcpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    clientProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
+    tcpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
     acceptorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    tcpAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-    jvmAcceptorDefEClass.getESuperTypes().add(this.getAcceptorDef());
-    jvmConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
-    httpConnectorDefEClass.getESuperTypes().add(this.getConnectorDef());
+    tcpAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmAcceptorDefEClass.getESuperTypes().add(getAcceptorDef());
+    jvmConnectorDefEClass.getESuperTypes().add(getConnectorDef());
+    httpConnectorDefEClass.getESuperTypes().add(getConnectorDef());
     tcpSelectorDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    serverProtocolFactoryDefEClass.getESuperTypes().add(this.getProtocolProviderDef());
+    serverProtocolFactoryDefEClass.getESuperTypes().add(getProtocolProviderDef());
     bufferProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
-    bufferPoolDefEClass.getESuperTypes().add(this.getBufferProviderDef());
+    bufferPoolDefEClass.getESuperTypes().add(getBufferProviderDef());
     protocolProviderDefEClass.getESuperTypes().add(theNet4jUtilDefsPackage.getDef());
 
     // Initialize classes and features; add operations and parameters
@@ -585,7 +592,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
         IS_GENERATED_INSTANCE_CLASS);
     initEAttribute(getConnectorDef_UserID(), ecorePackage.getEString(), "userID", null, 0, 1, ConnectorDef.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_BufferProvider(), this.getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
+    initEReference(getConnectorDef_BufferProvider(), getBufferProviderDef(), null, "bufferProvider", null, 1, 1,
         ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getConnectorDef_ExecutorService(), theNet4jUtilDefsPackage.getExecutorServiceDef(), null,
@@ -594,7 +601,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
     initEReference(getConnectorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null,
         0, 1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getConnectorDef_ClientProtocolProvider(), this.getClientProtocolFactoryDef(), null,
+    initEReference(getConnectorDef_ClientProtocolProvider(), getClientProtocolFactoryDef(), null,
         "clientProtocolProvider", null, 1, -1, ConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -603,7 +610,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(tcpConnectorDefEClass, TCPConnectorDef.class, "TCPConnectorDef", !IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getTCPConnectorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
+    initEReference(getTCPConnectorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 0, 1,
         TCPConnectorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTCPConnectorDef_Host(), ecorePackage.getEString(), "host", null, 1, 1, TCPConnectorDef.class,
@@ -613,16 +620,16 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
 
     initEClass(acceptorDefEClass, AcceptorDef.class, "AcceptorDef", IS_ABSTRACT, !IS_INTERFACE,
         IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getAcceptorDef_BufferProvider(), this.getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
+    initEReference(getAcceptorDef_BufferProvider(), getBufferPoolDef(), null, "bufferProvider", null, 0, 1,
         AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getAcceptorDef_ExecutorService(), theNet4jUtilDefsPackage.getThreadPoolDef(), null,
         "executorService", null, 0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
         IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null,
-        0, 1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+    initEReference(getAcceptorDef_Negotiator(), theNet4jUtilDefsPackage.getNegotiatorDef(), null, "negotiator", null, 0,
+        1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
         IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getAcceptorDef_ServerProtocolProvider(), this.getServerProtocolFactoryDef(), null,
+    initEReference(getAcceptorDef_ServerProtocolProvider(), getServerProtocolFactoryDef(), null,
         "serverProtocolProvider", null, 1, -1, AcceptorDef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
         !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -632,7 +639,7 @@ public class Net4jDefsPackageImpl extends EPackageImpl implements Net4jDefsPacka
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEAttribute(getTCPAcceptorDef_Port(), ecorePackage.getEInt(), "port", null, 1, 1, TCPAcceptorDef.class,
         !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getTCPAcceptorDef_TcpSelectorDef(), this.getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
+    initEReference(getTCPAcceptorDef_TcpSelectorDef(), getTCPSelectorDef(), null, "tcpSelectorDef", null, 1, 1,
         TCPAcceptorDef.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.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
index 1855a0c9ec..a16b0f4b43 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ProtocolProviderDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
index 1f311d50dd..3edc7075bb 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/ServerProtocolFactoryDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
index 868afe5743..4d59942853 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPAcceptorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPAcceptorDefImpl#getTcpSelectorDef <em>Tcp Selector Def</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDef
@@ -43,7 +43,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   /**
    * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getHost()
    * @generated
    * @ordered
@@ -62,7 +62,7 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   /**
    * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getPort()
    * @generated
    * @ordered
@@ -125,7 +125,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__HOST, oldHost, host));
+    }
   }
 
   /**
@@ -146,7 +148,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     int oldPort = port;
     port = newPort;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__PORT, oldPort, port));
+    }
   }
 
   /**
@@ -162,8 +166,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
-          eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-              Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        {
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
+              oldTcpSelectorDef, tcpSelectorDef));
+        }
       }
     }
     return tcpSelectorDef;
@@ -187,8 +193,10 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
+    }
   }
 
   /**
@@ -206,7 +214,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
       return getPort();
     case Net4jDefsPackage.TCP_ACCEPTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
+      {
         return getTcpSelectorDef();
+      }
       return basicGetTcpSelectorDef();
     }
     return super.eGet(featureID, resolve, coreType);
@@ -283,7 +293,9 @@ public class TCPAcceptorDefImpl extends AcceptorDefImpl implements TCPAcceptorDe
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (host: ");
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
index b676c04e1b..92c8b07ed8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPConnectorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -35,7 +35,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * <li>{@link org.eclipse.net4j.net4jdefs.impl.TCPConnectorDefImpl#getPort <em>Port</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnectorDef
@@ -53,7 +53,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   /**
    * The default value of the '{@link #getHost() <em>Host</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getHost()
    * @generated
    * @ordered
@@ -72,7 +72,7 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   /**
    * The default value of the '{@link #getPort() <em>Port</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
    * -->
-   * 
+   *
    * @see #getPort()
    * @generated
    * @ordered
@@ -128,8 +128,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
       if (tcpSelectorDef != oldTcpSelectorDef)
       {
         if (eNotificationRequired())
+        {
           eNotify(new ENotificationImpl(this, Notification.RESOLVE,
               Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF, oldTcpSelectorDef, tcpSelectorDef));
+        }
       }
     }
     return tcpSelectorDef;
@@ -153,8 +155,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     TCPSelectorDef oldTcpSelectorDef = tcpSelectorDef;
     tcpSelectorDef = newTcpSelectorDef;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF,
           oldTcpSelectorDef, tcpSelectorDef));
+    }
   }
 
   /**
@@ -175,13 +179,15 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     String oldHost = host;
     host = newHost;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST, oldHost, host));
+    }
   }
 
   /**
    * <!-- begin-user-doc -->gets the <b>port</b> of this connector. If the port was not set, the
    * {@link ITCPConnector#DEFAULT_PORT} is returned<!-- end-user-doc -->
-   * 
+   *
    * @generated NOT
    */
   public int getPort()
@@ -215,8 +221,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     boolean oldPortESet = portESet;
     portESet = true;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.SET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort, port,
           !oldPortESet));
+    }
   }
 
   /**
@@ -230,8 +238,10 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     port = PORT_EDEFAULT;
     portESet = false;
     if (eNotificationRequired())
+    {
       eNotify(new ENotificationImpl(this, Notification.UNSET, Net4jDefsPackage.TCP_CONNECTOR_DEF__PORT, oldPort,
           PORT_EDEFAULT, oldPortESet));
+    }
   }
 
   /**
@@ -254,7 +264,9 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
     {
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__TCP_SELECTOR_DEF:
       if (resolve)
+      {
         return getTcpSelectorDef();
+      }
       return basicGetTcpSelectorDef();
     case Net4jDefsPackage.TCP_CONNECTOR_DEF__HOST:
       return getHost();
@@ -335,16 +347,22 @@ public class TCPConnectorDefImpl extends ConnectorDefImpl implements TCPConnecto
   public String toString()
   {
     if (eIsProxy())
+    {
       return super.toString();
+    }
 
     StringBuffer result = new StringBuffer(super.toString());
     result.append(" (host: ");
     result.append(host);
     result.append(", port: ");
     if (portESet)
+    {
       result.append(port);
+    }
     else
+    {
       result.append("<unset>");
+    }
     result.append(')');
     return result.toString();
   }
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
index e0a70dc3df..e3a37a1e79 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/impl/TCPSelectorDefImpl.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -41,7 +41,7 @@ public class TCPSelectorDefImpl extends DefImpl implements TCPSelectorDef
 
   /**
    * Creates and returns a {@link TCPSelector}.
-   * 
+   *
    * @return a new tcp selector instance
    * @generated NOT
    */
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
index 45c17f6c40..74dc5fff19 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsAdapterFactory.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -373,7 +373,7 @@ public class Net4jDefsAdapterFactory extends AdapterFactoryImpl
    * Creates a new adapter for an object of class '{@link org.eclipse.net4j.util.defs.Def <em>Def</em>}'. <!--
    * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's useful to
    * ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->
-   * 
+   *
    * @return the new adapter.
    * @see org.eclipse.net4j.util.defs.Def
    * @generated
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
index a5753b982c..f2093c82a8 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsSwitch.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -37,7 +37,7 @@ import java.util.List;
  * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the inheritance hierarchy until a non-null result is
  * returned, which is the result of the switch. <!-- end-user-doc -->
- * 
+ *
  * @see org.eclipse.net4j.defs.Net4jDefsPackage
  * @generated
  */
@@ -45,14 +45,14 @@ public class Net4jDefsSwitch<T>
 {
   /**
    * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   protected static Net4jDefsPackage modelPackage;
 
   /**
    * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @generated
    */
   public Net4jDefsSwitch()
@@ -66,7 +66,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -78,7 +78,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -98,7 +98,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
    * <!-- begin-user-doc --> <!-- end-user-doc -->
-   * 
+   *
    * @return the first non-null result returned by a <code>caseXXX</code> call.
    * @generated
    */
@@ -328,7 +328,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Connector Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Connector Def</em>'.
@@ -344,7 +344,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Client Protocol Factory Def</em>'.
@@ -359,7 +359,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Connector Def</em>'.
@@ -374,7 +374,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Acceptor Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Acceptor Def</em>'.
@@ -389,7 +389,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Acceptor Def</em>'.
@@ -404,7 +404,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>JVM Acceptor Def</em>'.
@@ -419,7 +419,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>JVM Connector Def</em>'.
@@ -434,7 +434,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>HTTP Connector Def</em>'.
@@ -449,7 +449,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>TCP Selector Def</em>'.
@@ -465,7 +465,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Server Protocol Factory Def</em>'.
@@ -480,7 +480,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'. <!-- begin-user-doc
    * --> This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Buffer Provider Def</em>'.
@@ -495,7 +495,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'. <!-- begin-user-doc -->
    * This implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Buffer Pool Def</em>'.
@@ -511,7 +511,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'. <!--
    * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the switch. <!--
    * end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Protocol Provider Def</em>'.
@@ -526,7 +526,7 @@ public class Net4jDefsSwitch<T>
   /**
    * Returns the result of interpreting the object as an instance of '<em>Def</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>Def</em>'.
@@ -542,7 +542,7 @@ public class Net4jDefsSwitch<T>
    * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc --> This
    * implementation returns null; returning a non-null result will terminate the switch, but this is the last case
    * anyway. <!-- end-user-doc -->
-   * 
+   *
    * @param object
    *          the target of the switch.
    * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
diff --git a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
index 5df744eeb4..ac1b4683cd 100644
--- a/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
+++ b/plugins/org.eclipse.net4j.defs/src/org/eclipse/net4j/defs/util/Net4jDefsUtil.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
@@ -27,7 +27,7 @@ public class Net4jDefsUtil
 {
   /**
    * Creates the factories protocol provider. The current implementation uses a {@link FactoriesProtocolProvider}.
-   * 
+   *
    * @param clientProtocolFactoryDef
    *          the client protocol factory definition
    * @return the protocol provider